Made spCloseRead a method of serialport

cmaglie · cmaglie · commit 3bcbd96167a6 · 2024-04-17T11:53:00.000+02:00
diff --git a/serialport.go b/serialport.go
@@ -167,7 +167,7 @@ func (p *serport) reader(buftype string) {
 		}
 	}
 	if p.isClosingDueToError {
-		spCloseReal(p)
+		p.Close()
 	}
 }
 
@@ -348,12 +348,12 @@ func spHandlerOpen(portname string, baud int, buftype string) {
 }
 
 func spHandlerClose(p *serport) {
-	p.isClosing = true
 	h.broadcastSys <- []byte("Closing serial port " + p.portConf.Name)
-	spCloseReal(p)
+	p.Close()
 }
 
-func spCloseReal(p *serport) {
+func (p *serport) Close() {
+	p.isClosing = true
 	p.bufferwatcher.Close()
 	p.portIo.Close()
 	serialPorts.MarkPortAsClosed(p.portName)

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ func (p *serport) reader(buftype string) {`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`if p.isClosingDueToError {`
`170`		`- spCloseReal(p)`
	`170`	`+ p.Close()`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`@@ -348,12 +348,12 @@ func spHandlerOpen(portname string, baud int, buftype string) {`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`func spHandlerClose(p *serport) {`
`351`		`- p.isClosing = true`
`352`	`351`	`h.broadcastSys <- []byte("Closing serial port " + p.portConf.Name)`
`353`		`- spCloseReal(p)`
	`352`	`+ p.Close()`
`354`	`353`	`}`
`355`	`354`
`356`		`-func spCloseReal(p *serport) {`
	`355`	`+func (p *serport) Close() {`
	`356`	`+ p.isClosing = true`
`357`	`357`	`p.bufferwatcher.Close()`
`358`	`358`	`p.portIo.Close()`
`359`	`359`	`serialPorts.MarkPortAsClosed(p.portName)`