vendor: pull fixed usb library for nocgo builds

This commit is contained in:
Péter Szilágyi 2019-06-06 10:32:51 +03:00
parent 30c2b1b06d
commit c52390d078
No known key found for this signature in database
GPG Key ID: E9AE538CEDF8293D
6 changed files with 31 additions and 28 deletions

View File

@ -1,6 +1,7 @@
Felix Lange <fjl@twurst.com>
Guillaume Ballet <gballet@gmail.com>
Jakob Weisblat <jakobw@yubico.com>
Martin Holst Swende <martin@swende.se>
Mateusz Mikołajczyk <mikolajczyk.mateusz@gmail.com>
Péter Szilágyi <peterke@gmail.com>
Rosen Penev <rosenp@gmail.com>

View File

@ -30,3 +30,6 @@ install:
build_script:
- go install ./...
- go test -v ./...
- set CGO_ENABLED=0
- go install ./...
- go test -v ./...

View File

@ -388,4 +388,3 @@ extern "C" {
#endif
#endif

View File

@ -428,7 +428,7 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
if (str) {
len = strlen(str);
cur_dev->path = (char*) calloc(len+1, sizeof(char));
strncpy(cur_dev->path, str, len+1);
strncpy(cur_dev->path, str, sizeof(cur_dev->path));
cur_dev->path[len] = '\0';
}
else

View File

@ -27,20 +27,20 @@ func Supported() bool {
// Enumerate returns a list of all the USB devices attached to the system which
// match the vendor and product id. On platforms that this file implements the
// function is a noop and returns an empty list always.
func Enumerate(vendorID uint16, productID uint16) []DeviceInfo {
return nil
func Enumerate(vendorID uint16, productID uint16) ([]DeviceInfo, error) {
return nil, nil
}
// EnumerateRaw returns a list of all the USB devices attached to the system which
// match the vendor and product id. On platforms that this file implements the
// function is a noop and returns an empty list always.
func EnumerateRaw(vendorID uint16, productID uint16) ([]DeviceInfo, error) {
return nil
return nil, nil
}
// EnumerateHid returns a list of all the HID devices attached to the system which
// match the vendor and product id. On platforms that this file implements the
// function is a noop and returns an empty list always.
func EnumerateHid(vendorID uint16, productID uint16) ([]DeviceInfo, error) {
return nil
return nil, nil
}

6
vendor/vendor.json vendored
View File

@ -267,10 +267,10 @@
"revisionTime": "2017-04-30T22:20:11Z"
},
{
"checksumSHA1": "3v8Z4/daUVp9PCcFzEGYVkPadG8=",
"checksumSHA1": "0ixnoiChdbeva2xNe3z/vYzqcL4=",
"path": "github.com/karalabe/usb",
"revision": "c012609e094b8a96375fee53cc11f1bcd5cf3aa2",
"revisionTime": "2019-06-04T10:57:36Z",
"revision": "0efdeddd92369dc00d4fb1b9cd56a442bdb61f82",
"revisionTime": "2019-06-06T09:23:27Z",
"tree": true
},
{