• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9206 (tree)
Time2021-04-12 23:16:18
Authornmaya

Log Message

シリアルポート接続の1.5ストップビットのサポートを削除

ticket #40299
1.5ストップビットは常に不正な設定となるため

MF4-stable: r9205

Change Summary

Incremental Difference

--- trunk/doc/en/html/about/history.html (revision 9205)
+++ trunk/doc/en/html/about/history.html (revision 9206)
@@ -35,7 +35,11 @@
3535 <ul class="history">
3636 <li>Changes
3737 <ul>
38- <li></li>
38+ <li>Serial port connection
39+ <ul>
40+ <li>remove 1.5 stop bit from the serial port setup.</li>
41+ <li>remote the "1.5" name from the StopBit entry.</li>
42+ </ul></li>
3943 </ul>
4044 </li>
4145
--- trunk/doc/ja/html/about/history.html (revision 9205)
+++ trunk/doc/ja/html/about/history.html (revision 9206)
@@ -35,7 +35,11 @@
3535 <ul class="history">
3636 <li>Changes
3737 <ul>
38- <li></li>
38+ <li>シリアルポート接続
39+ <ul>
40+ <li>シリアルポート設定で、1.5ストップビットのサポートを削除した。</li>
41+ <li>teraterm.ini の StopBit エントリから"1.5"を削除した。</li>
42+ </ul></li>
3943 </ul>
4044 </li>
4145
--- trunk/teraterm/common/tttypes.h (revision 9205)
+++ trunk/teraterm/common/tttypes.h (revision 9206)
@@ -770,9 +770,8 @@
770770 #define IdDataBit7 1
771771 #define IdDataBit8 2
772772 /* Stop bit ID */
773-#define IdStopBit1 1
774-#define IdStopBit15 2
775-#define IdStopBit2 3
773+#define IdStopBit1 1
774+#define IdStopBit2 2
776775 /* Flow control ID */
777776 #define IdFlowX 1
778777 #define IdFlowHard 2 // RTS/CTS(hardware flow)
--- trunk/teraterm/teraterm/commlib.c (revision 9205)
+++ trunk/teraterm/teraterm/commlib.c (revision 9206)
@@ -235,9 +235,6 @@
235235 case IdStopBit1:
236236 dcb.StopBits = ONESTOPBIT;
237237 break;
238- case IdStopBit15:
239- dcb.StopBits = ONE5STOPBITS;
240- break;
241238 case IdStopBit2:
242239 dcb.StopBits = TWOSTOPBITS;
243240 break;
--- trunk/teraterm/ttpdlg/ttdlg.c (revision 9205)
+++ trunk/teraterm/ttpdlg/ttdlg.c (revision 9206)
@@ -1186,7 +1186,7 @@
11861186
11871187 static const char *DataList[] = {"7 bit","8 bit",NULL};
11881188 static const char *ParityList[] = {"none", "odd", "even", "mark", "space", NULL};
1189-static const char *StopList[] = {"1 bit", "1.5 bit", "2 bit", NULL};
1189+static const char *StopList[] = {"1 bit", "2 bit", NULL};
11901190 static const char *FlowList[] = {"Xon/Xoff", "RTS/CTS", "DSR/DTR", "none", NULL};
11911191 static int g_deltaSumSerialDlg = 0; // マウスホイールのDelta累積用
11921192 static WNDPROC g_defSerialDlgEditWndProc; // Edit Controlのサブクラス化用
--- trunk/teraterm/ttpset/ttset.c (revision 9205)
+++ trunk/teraterm/ttpset/ttset.c (revision 9206)
@@ -89,7 +89,6 @@
8989
9090 static id_str_pair_t serial_conf_stopbit[] = {
9191 {IdStopBit1, "1"},
92- {IdStopBit15, "1.5"},
9392 {IdStopBit2, "2"},
9493 {IDENDMARK, NULL},
9594 };
Show on old repository browser