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

Temporarily remove USB manufacturer/product info

Browse Source 
I need to find a better way to obtain those infos.
This commit is contained in:
Cristian Maglie
2016-12-11 23:46:15 +01:00
parent 3d6dd00ccb
commit 5769f96804
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
serial.go
View File

@@ -63,8 +63,9 @@ type PortDetails struct {
VID string VID string
PID string PID string
SerialNumber string SerialNumber string
Manufacturer string
Product string // Manufacturer string
// Product string
} }
// GetDetailedPortsList retrieve ports details like USB VID/PID. // GetDetailedPortsList retrieve ports details like USB VID/PID.

20
usb_linux.go
View File

@@ -74,21 +74,21 @@ func parseUSBSysFS(usbDevicePath string, details *PortDetails) error {
if err != nil { if err != nil {
return err return err
} }
manufacturer, err := readLine(filepath.Join(usbDevicePath, "manufacturer")) //manufacturer, err := readLine(filepath.Join(usbDevicePath, "manufacturer"))
if err != nil { //if err != nil {
return err // return err
} //}
product, err := readLine(filepath.Join(usbDevicePath, "product")) //product, err := readLine(filepath.Join(usbDevicePath, "product"))
if err != nil { //if err != nil {
return err // return err
} //}
details.IsUSB = true details.IsUSB = true
details.VID = vid details.VID = vid
details.PID = pid details.PID = pid
details.SerialNumber = serial details.SerialNumber = serial
details.Manufacturer = manufacturer //details.Manufacturer = manufacturer
details.Product = product //details.Product = product
return nil return nil
} }

2
usb_windows.go
View File

@@ -295,7 +295,7 @@ func retrievePortDetailsFromDevInfo(device *deviceInfo, details *PortDetails) er
friendlyNameP := (*byte)(unsafe.Pointer(&friendlyName[0])) friendlyNameP := (*byte)(unsafe.Pointer(&friendlyName[0]))
friendlyNameSize := uint32(len(friendlyName) * 2) friendlyNameSize := uint32(len(friendlyName) * 2)
if setupDiGetDeviceRegistryProperty(device.set, &device.data, spdrpDeviceDesc /* spdrpFriendlyName */, nil, friendlyNameP, &friendlyNameSize, nil) { if setupDiGetDeviceRegistryProperty(device.set, &device.data, spdrpDeviceDesc /* spdrpFriendlyName */, nil, friendlyNameP, &friendlyNameSize, nil) {
details.Product = syscall.UTF16ToString(friendlyName[:]) //details.Product = syscall.UTF16ToString(friendlyName[:])
} }
return nil return nil