lechu/go-serial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #174 from bugst/windows-multi-set-rtscts

Browse Source 
windows: Avoid double-set of communication parameters on Open
This commit is contained in:
Cristian Maglie
2024-02-16 14:29:21 +01:00
committed by GitHub
parent 8b563a8428 c414e4f55c
commit 9a2045a5ff
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
serial_windows.go
View File

@@ -254,6 +254,15 @@ func (port *windowsPort) SetMode(mode *Mode) error {
port.Close() port.Close()
return &PortError{code: InvalidSerialPort} return &PortError{code: InvalidSerialPort}
} }
port.setModeParams(mode, &params)
if setCommState(port.handle, &params) != nil {
port.Close()
return &PortError{code: InvalidSerialPort}
}
return nil
}
func (port *windowsPort) setModeParams(mode *Mode, params *dcb) {
if mode.BaudRate == 0 { if mode.BaudRate == 0 {
params.BaudRate = 9600 // Default to 9600 params.BaudRate = 9600 // Default to 9600
} else { } else {
@@ -266,11 +275,6 @@ func (port *windowsPort) SetMode(mode *Mode) error {
} }
params.StopBits = stopBitsMap[mode.StopBits] params.StopBits = stopBitsMap[mode.StopBits]
params.Parity = parityMap[mode.Parity] params.Parity = parityMap[mode.Parity]
if setCommState(port.handle, &params) != nil {
port.Close()
return &PortError{code: InvalidSerialPort}
}
return nil
} }
func (port *windowsPort) SetDTR(dtr bool) error { func (port *windowsPort) SetDTR(dtr bool) error {
@@ -432,16 +436,12 @@ func nativeOpen(portName string, mode *Mode) (*windowsPort, error) {
} }
// Set port parameters // Set port parameters
if port.SetMode(mode) != nil {
port.Close()
return nil, &PortError{code: InvalidSerialPort}
}
params := &dcb{} params := &dcb{}
if getCommState(port.handle, params) != nil { if getCommState(port.handle, params) != nil {
port.Close() port.Close()
return nil, &PortError{code: InvalidSerialPort} return nil, &PortError{code: InvalidSerialPort}
} }
port.setModeParams(mode, params)
params.Flags &= dcbDTRControlDisableMask params.Flags &= dcbDTRControlDisableMask
params.Flags &= dcbRTSControlDisbaleMask params.Flags &= dcbRTSControlDisbaleMask
if mode.InitialStatusBits == nil { if mode.InitialStatusBits == nil {