Diff
Not logged in
Home Timeline Branches Tags Tickets Wiki Login
Annotate Patch Side-by-side Diff

Differences From Artifact [4dece1ea7f]:

To Artifact [96a207ff8f]:

︙
1648
1649
1650
1651
1652
1653
1654
1655

1656
1657

1658
1659
1660
1661
1662
1663
1664

1648
1649
1650
1651
1652
1653
1654

1655
1656

1657
1658
1659
1660
1661
1662
1663
1664








-
+

-
+








	    infoPtr->flags &= ~SERIAL_CLOSE_MASK;
	    infoPtr->flags |= SERIAL_CLOSE_DRAIN;
	} else if (strncasecmp(value, "DISCARD", vlen) == 0) {
	    infoPtr->flags &= ~SERIAL_CLOSE_MASK;
	    infoPtr->flags |= SERIAL_CLOSE_DISCARD;
	} else {
	    if (interp) {
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		TclPrintfResult(interp,
			"bad mode \"%s\" for -closemode: must be"
			" default, discard, or drain", value));
			" default, discard, or drain", value);
		TclSetErrorCode(interp, "TCL", "OPERATION", "FCONFIGURE",
			"VALUE");
	    }
	    return TCL_ERROR;
	}
	return TCL_OK;
    }
︙
1674
1675
1676
1677
1678
1679
1680
1681

1682
1683

1684
1685
1686
1687
1688
1689
1690

1674
1675
1676
1677
1678
1679
1680

1681
1682

1683
1684
1685
1686
1687
1688
1689
1690








-
+

-
+








	Tcl_DStringInit(&ds);
	native = Tcl_UtfToWCharDString(value, TCL_INDEX_NONE, &ds);
	result = BuildCommDCBW(native, &dcb);
	Tcl_DStringFree(&ds);

	if (result == FALSE) {
	    if (interp != NULL) {
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		TclPrintfResult(interp,
			"bad value \"%s\" for -mode: should be baud,parity,data,stop",
			value));
			value);
		TclSetErrorCode(interp, "TCL", "VALUE", "SERIALMODE");
	    }
	    return TCL_ERROR;
	}

	/*
	 * Default settings for serial communications.
︙
1738
1739
1740
1741
1742
1743
1744
1745

1746
1747

1748
1749
1750
1751
1752
1753
1754

1738
1739
1740
1741
1742
1743
1744

1745
1746

1747
1748
1749
1750
1751
1752
1753
1754








-
+

-
+








	    dcb.fOutxCtsFlow = TRUE;
	    dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
	} else if (strncasecmp(value, "DTRDSR", vlen) == 0) {
	    dcb.fOutxDsrFlow = TRUE;
	    dcb.fDtrControl = DTR_CONTROL_HANDSHAKE;
	} else {
	    if (interp != NULL) {
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		TclPrintfResult(interp,
			"bad value \"%s\" for -handshake: must be one of"
			" xonxoff, rtscts, dtrdsr or none", value));
			" xonxoff, rtscts, dtrdsr or none", value);
		TclSetErrorCode(interp, "TCL", "VALUE", "HANDSHAKE");
	    }
	    return TCL_ERROR;
	}

	if (!SetCommState(infoPtr->handle, &dcb)) {
	    goto setStateFailed;
︙
1767
1768
1769
1770
1771
1772
1773
1774

1775
1776

1777
1778
1779
1780
1781
1782
1783
1784

1767
1768
1769
1770
1771
1772
1773

1774
1775

1776

1777
1778
1779
1780
1781
1782
1783








-
+

-
+
-









	if (Tcl_SplitList(interp, value, &argc, &argv) == TCL_ERROR) {
	    return TCL_ERROR;
	}
	if (argc != 2) {
	badXchar:
	    if (interp != NULL) {
		Tcl_SetObjResult(interp, Tcl_NewStringObj(
		TclPrintfResult(interp,
			"bad value for -xchar: should be a list of"
			" two elements with each a single 8-bit character",
			" two elements with each a single 8-bit character");
			TCL_INDEX_NONE));
		TclSetErrorCode(interp, "TCL", "VALUE", "XCHAR");
	    }
	    Tcl_Free((void *)argv);
	    return TCL_ERROR;
	}

	/*
︙
1825
1826
1827
1828
1829
1830
1831
1832

1833
1834

1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851

1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863

1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875

1876
1877
1878
1879
1880
1881
1882
1883
1884

1885
1886

1887
1888
1889
1890
1891
1892
1893

1824
1825
1826
1827
1828
1829
1830

1831
1832

1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848


1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859


1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870


1871
1872
1873
1874
1875
1876
1877
1878
1879

1880
1881

1882
1883
1884
1885
1886
1887
1888
1889








-
+

-
+















-
-
+










-
-
+










-
-
+








-
+

-
+








	int res = TCL_OK;

	if (Tcl_SplitList(interp, value, &argc, &argv) == TCL_ERROR) {
	    return TCL_ERROR;
	}
	if ((argc % 2) == 1) {
	    if (interp != NULL) {
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		TclPrintfResult(interp,
			"bad value \"%s\" for -ttycontrol: should be "
			"a list of signal,value pairs", value));
			"a list of signal,value pairs", value);
		TclSetErrorCode(interp, "TCL", "VALUE", "TTYCONTROL");
	    }
	    Tcl_Free((void *)argv);
	    return TCL_ERROR;
	}

	for (i = 0; i < argc - 1; i += 2) {
	    if (Tcl_GetBoolean(interp, argv[i+1], &flag) == TCL_ERROR) {
		res = TCL_ERROR;
		break;
	    }
	    if (strncasecmp(argv[i], "DTR", strlen(argv[i])) == 0) {
		if (!EscapeCommFunction(infoPtr->handle,
			(DWORD) (flag ? SETDTR : CLRDTR))) {
		    if (interp != NULL) {
			Tcl_SetObjResult(interp, Tcl_NewStringObj(
				"can't set DTR signal", TCL_INDEX_NONE));
			TclPrintfResult(interp, "can't set DTR signal");
			TclSetErrorCode(interp, "TCL", "OPERATION",
				"FCONFIGURE", "TTY_SIGNAL");
		    }
		    res = TCL_ERROR;
		    break;
		}
	    } else if (strncasecmp(argv[i], "RTS", strlen(argv[i])) == 0) {
		if (!EscapeCommFunction(infoPtr->handle,
			(DWORD) (flag ? SETRTS : CLRRTS))) {
		    if (interp != NULL) {
			Tcl_SetObjResult(interp, Tcl_NewStringObj(
				"can't set RTS signal", TCL_INDEX_NONE));
			TclPrintfResult(interp, "can't set RTS signal");
			TclSetErrorCode(interp, "TCL", "OPERATION",
				"FCONFIGURE", "TTY_SIGNAL");
		    }
		    res = TCL_ERROR;
		    break;
		}
	    } else if (strncasecmp(argv[i], "BREAK", strlen(argv[i])) == 0) {
		if (!EscapeCommFunction(infoPtr->handle,
			(DWORD) (flag ? SETBREAK : CLRBREAK))) {
		    if (interp != NULL) {
			Tcl_SetObjResult(interp, Tcl_NewStringObj(
				"can't set BREAK signal", TCL_INDEX_NONE));
			TclPrintfResult(interp, "can't set BREAK signal");
			TclSetErrorCode(interp, "TCL", "OPERATION",
				"FCONFIGURE", "TTY_SIGNAL");
		    }
		    res = TCL_ERROR;
		    break;
		}
	    } else {
		if (interp != NULL) {
		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		    TclPrintfResult(interp,
			    "bad signal name \"%s\" for -ttycontrol: must be"
			    " DTR, RTS or BREAK", argv[i]));
			    " DTR, RTS or BREAK", argv[i]);
		    TclSetErrorCode(interp, "TCL", "VALUE", "TTY_SIGNAL");
		}
		res = TCL_ERROR;
		break;
	    }
	}
︙
1917
1918
1919
1920
1921
1922
1923
1924

1925
1926

1927
1928
1929
1930
1931
1932
1933
1934
1935

1936
1937

1938
1939
1940
1941
1942
1943
1944

1913
1914
1915
1916
1917
1918
1919

1920
1921

1922
1923
1924
1925
1926
1927
1928
1929
1930

1931
1932

1933
1934
1935
1936
1937
1938
1939
1940








-
+

-
+








-
+

-
+








	    inSize  = atoi(argv[0]);
	    outSize = atoi(argv[1]);
	}
	Tcl_Free((void *)argv);

	if ((argc < 1) || (argc > 2) || (inSize <= 0) || (outSize <= 0)) {
	    if (interp != NULL) {
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		TclPrintfResult(interp,
			"bad value \"%s\" for -sysbuffer: should be "
			"a list of one or two integers > 0", value));
			"a list of one or two integers > 0", value);
		TclSetErrorCode(interp, "TCL", "VALUE", "SYS_BUFFER");
	    }
	    return TCL_ERROR;
	}

	if (!SetupComm(infoPtr->handle, inSize, outSize)) {
	    if (interp != NULL) {
		Tcl_WinConvertError(GetLastError());
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		TclPrintfResult(interp,
			"can't setup comm buffers: %s",
			Tcl_PosixError(interp)));
			Tcl_PosixError(interp));
	    }
	    return TCL_ERROR;
	}
	infoPtr->sysBufRead  = inSize;
	infoPtr->sysBufWrite = outSize;

	/*
︙
1979
1980
1981
1982
1983
1984
1985
1986
1987


1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004


2005
2006
2007
2008
2009
2010
2011
2012


2013
2014
2015
2016
2017
2018
2019

1975
1976
1977
1978
1979
1980
1981


1982
1983

1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997


1998
1999
2000
2001
2002
2003
2004
2005


2006
2007
2008
2009
2010
2011
2012
2013
2014








-
-
+
+
-














-
-
+
+






-
-
+
+








	if (Tcl_GetInt(interp, value, &msec) != TCL_OK) {
	    return TCL_ERROR;
	}
	tout.ReadTotalTimeoutConstant = msec;
	if (!SetCommTimeouts(infoPtr->handle, &tout)) {
	    if (interp != NULL) {
		Tcl_WinConvertError(GetLastError());
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
			"can't set comm timeouts: %s",
		TclPrintfResult(interp,
			"can't set comm timeouts: %s", Tcl_PosixError(interp));
			Tcl_PosixError(interp)));
	    }
	    return TCL_ERROR;
	}

	return TCL_OK;
    }

    return Tcl_BadChannelOption(interp, optionName,
	    "closemode mode handshake pollinterval sysbuffer timeout "
	    "ttycontrol xchar");

  getStateFailed:
    if (interp != NULL) {
	Tcl_WinConvertError(GetLastError());
	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		"can't get comm state: %s", Tcl_PosixError(interp)));
	TclPrintfResult(interp,
		"can't get comm state: %s", Tcl_PosixError(interp));
    }
    return TCL_ERROR;

  setStateFailed:
    if (interp != NULL) {
	Tcl_WinConvertError(GetLastError());
	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
		"can't set comm state: %s", Tcl_PosixError(interp)));
	TclPrintfResult(interp,
		"can't set comm state: %s", Tcl_PosixError(interp));
    }
    return TCL_ERROR;
}

/*
 *----------------------------------------------------------------------
 *
︙
2085
2086
2087
2088
2089
2090
2091
2092
2093


2094
2095
2096
2097
2098
2099
2100

2080
2081
2082
2083
2084
2085
2086


2087
2088
2089
2090
2091
2092
2093
2094
2095








-
-
+
+








	char parity;
	const char *stop;
	char buf[2 * TCL_INTEGER_SPACE + 16];

	if (!GetCommState(infoPtr->handle, &dcb)) {
	    if (interp != NULL) {
		Tcl_WinConvertError(GetLastError());
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
			"can't get comm state: %s", Tcl_PosixError(interp)));
		TclPrintfResult(interp,
			"can't get comm state: %s", Tcl_PosixError(interp));
	    }
	    return TCL_ERROR;
	}

	valid = 1;
	parity = 'n';
	if (dcb.Parity <= 4) {
︙
2155
2156
2157
2158
2159
2160
2161
2162
2163


2164
2165
2166
2167
2168
2169
2170

2150
2151
2152
2153
2154
2155
2156


2157
2158
2159
2160
2161
2162
2163
2164
2165








-
-
+
+








    if (len==0 || (len>1 && strncmp(optionName, "-xchar", len) == 0)) {
	char buf[4];
	valid = 1;

	if (!GetCommState(infoPtr->handle, &dcb)) {
	    if (interp != NULL) {
		Tcl_WinConvertError(GetLastError());
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
			"can't get comm state: %s", Tcl_PosixError(interp)));
		TclPrintfResult(interp,
			"can't get comm state: %s", Tcl_PosixError(interp));
	    }
	    return TCL_ERROR;
	}
	buf[Tcl_UniCharToUtf(UCHAR(dcb.XonChar), buf)] = '\0';
	Tcl_DStringAppendElement(dsPtr, buf);
	buf[Tcl_UniCharToUtf(UCHAR(dcb.XoffChar), buf)] = '\0';
	Tcl_DStringAppendElement(dsPtr, buf);
︙
2233
2234
2235
2236
2237
2238
2239
2240
2241


2242
2243
2244
2245
2246
2247
2248

2228
2229
2230
2231
2232
2233
2234


2235
2236
2237
2238
2239
2240
2241
2242
2243








-
-
+
+









    if (len>4 && strncmp(optionName, "-ttystatus", len)==0) {
	DWORD status;

	if (!GetCommModemStatus(infoPtr->handle, &status)) {
	    if (interp != NULL) {
		Tcl_WinConvertError(GetLastError());
		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
			"can't get tty status: %s", Tcl_PosixError(interp)));
		TclPrintfResult(interp,
			"can't get tty status: %s", Tcl_PosixError(interp));
	    }
	    return TCL_ERROR;
	}
	valid = 1;
	SerialModemStatusStr(status, dsPtr);
    }
︙
This page was created in about 0.024s by Fossil version [1205ec86cb] 2025-04-30 16:57:32