For Windows if mode.BaudRate < 0 then fill mode from getCommState.

bugst · Jan 30, 2025 · 1c8cda0 · 1c8cda0
1 parent 0996f84
commit 1c8cda0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/serial_unix.go b/serial_unix.go
@@ -146,6 +146,9 @@ func (port *unixPort) SetMode(mode *Mode) error {
 		return err
 	}
 	requireSpecialBaudrate := false
+	if mode.BaudRate < 0 {
+		mode.BaudRate = 0
+	}
 	if err, special := setTermSettingsBaudrate(mode.BaudRate, settings); err != nil {
 		return err
 	} else if special {

diff --git a/serial_windows.go b/serial_windows.go
@@ -171,7 +171,17 @@ func (port *windowsPort) SetMode(mode *Mode) error {
 }
 
 func (port *windowsPort) setModeParams(mode *Mode, params *windows.DCB) {
-	if mode.BaudRate == 0 {
+	if mode.BaudRate < 0 {
+		// from getCommState to mode
+		mode.BaudRate = int(params.BaudRate)
+		mode.DataBits = int(params.ByteSize)
+		mode.StopBits = StopBits(params.StopBits)
+		mode.Parity = Parity(params.Parity)
+	} else {
+		params.StopBits = stopBitsMap[mode.StopBits]
+		params.Parity = parityMap[mode.Parity]
+	}
+	if mode.BaudRate <= 0 {
 		params.BaudRate = windows.CBR_9600 // Default to 9600
 	} else {
 		params.BaudRate = uint32(mode.BaudRate)
@@ -181,8 +191,6 @@ func (port *windowsPort) setModeParams(mode *Mode, params *windows.DCB) {
 	} else {
 		params.ByteSize = byte(mode.DataBits)
 	}
-	params.StopBits = stopBitsMap[mode.StopBits]
-	params.Parity = parityMap[mode.Parity]
 }
 
 func (port *windowsPort) SetDTR(dtr bool) error {