Apple-2-HW/Apple2-IO-RPi
2
0
Fork 1
mirror of https://github.com/tjboldt/Apple2-IO-RPi.git synced 2024-06-10 16:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Adapt to the different error signatures on Linux.

Browse Source 
So far the code was only tested on Windows.
This commit is contained in:
Oliver Schmidt 2022-08-19 14:48:03 +02:00 committed by Terence Boldt
parent 0aa485762a
commit 7dd7fb3281
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
RaspberryPi/apple2driver/a2io/cdcio.go
View File

@ -11,6 +11,7 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"strings"
"time" "time"
"go.bug.st/serial" "go.bug.st/serial"
@ -28,19 +29,20 @@ func (a2 CDCio) Init() {
name := "" name := ""
for { for {
portInfos, err := enumerator.GetDetailedPortsList() portInfos, err := enumerator.GetDetailedPortsList()
if err != nil { if err == nil {
panic(err) for _, portInfo := range portInfos {
} if portInfo.IsUSB &&
for _, portInfo := range portInfos { strings.ToUpper(portInfo.VID) == "2E8A" &&
if portInfo.IsUSB && portInfo.VID == "2E8A" && portInfo.PID == "000A" { strings.ToUpper(portInfo.PID) == "000A" {
name = portInfo.Name name = portInfo.Name
fmt.Printf("Found CDC port %s\n", name) fmt.Printf("Found CDC port %s\n", name)
break
}
}
if name != "" {
break break
} }
} }
if name != "" {
break
}
time.Sleep(time.Millisecond) time.Sleep(time.Millisecond)
} }
@ -51,7 +53,9 @@ func (a2 CDCio) Init() {
break; break;
} }
var portErr *serial.PortError var portErr *serial.PortError
if !errors.As(err, &portErr) || portErr.Code() != serial.PortNotFound { if !errors.As(err, &portErr) ||
portErr.Code() != serial.PortNotFound &&
portErr.Code() != serial.PermissionDenied {
panic(err) panic(err)
} }
time.Sleep(time.Millisecond) time.Sleep(time.Millisecond)