Made spList a method of SpPortList

Author: cmaglie

hub.go

@@ -177,7 +177,7 @@ func checkCmd(m []byte) {
 		// will catch send and sendnobuf and sendraw
 		go spWrite(s)
 	} else if strings.HasPrefix(sl, "list") {
-		go spList()
+		go serialPorts.List()
 	} else if strings.HasPrefix(sl, "downloadtool") {
 		go func() {
 			args := strings.Split(s, " ")

serial.go

@@ -120,13 +120,12 @@ func write(wr writeRequest) {
 	// no default since we alredy verified in spWrite()
 }
 
-// spList broadcasts a Json representation of the ports found
-func spList() {
-	var ls []byte
-	var err error
-	serialPorts.Mu.Lock()
-	ls, err = json.MarshalIndent(&serialPorts, "", "\t")
-	serialPorts.Mu.Unlock()
+// List broadcasts a Json representation of the ports found
+func (sp *SpPortList) List() {
+	sp.Mu.Lock()
+	ls, err := json.MarshalIndent(&serialPorts, "", "\t")
+	sp.Mu.Unlock()
+
 	if err != nil {
 		//log.Println(err)
 		h.broadcastSys <- []byte("Error creating json on port list " +

serialport.go

@@ -233,7 +233,7 @@ func (p *serport) writerNoBuf() {
 	h.broadcastSys <- []byte(msgstr)
 	p.portIo.Close()
 	updateSerialPortList()
-	spList()
+	serialPorts.List()
 }
 
 // this method runs as its own thread because it's instantiated
@@ -328,7 +328,7 @@ func spHandlerOpen(portname string, baud int, buftype string) {
 	defer func() { sh.unregister <- p }()
 
 	updateSerialPortList()
-	spList()
+	serialPorts.List()
 
 	// this is internally buffered thread to not send to serial port if blocked
 	go p.writerBuffered()
@@ -340,7 +340,7 @@ func spHandlerOpen(portname string, baud int, buftype string) {
 	p.reader(buftype)
 
 	updateSerialPortList()
-	spList()
+	serialPorts.List()
 }
 
 func spHandlerClose(p *serport) {
@@ -353,5 +353,5 @@ func spCloseReal(p *serport) {
 	p.bufferwatcher.Close()
 	p.portIo.Close()
 	updateSerialPortList()
-	spList()
+	serialPorts.List()
 }