Tryanks/gousb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into async_transfers_everywhere

Browse Source
This commit is contained in:
Sebastian Zagrodzki
2017-02-14 01:12:35 +01:00
parent e9d2ce49f0 8f68b3d966
commit 16f99ed0b0
9 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usb/config.go
View File

@@ -15,7 +15,7 @@
package usb package usb
// #include <libusb-1.0/libusb.h> // #include <libusb.h>
import "C" import "C"
import ( import (

2
usb/constants.go
View File

@@ -15,7 +15,7 @@
package usb package usb
// #include <libusb-1.0/libusb.h> // #include <libusb.h>
import "C" import "C"
type Class uint8 type Class uint8

2
usb/descriptor.go
View File

@@ -15,7 +15,7 @@
package usb package usb
// #include <libusb-1.0/libusb.h> // #include <libusb.h>
import "C" import "C"
type Descriptor struct { type Descriptor struct {

2
usb/device.go
View File

@@ -15,7 +15,7 @@
package usb package usb
// #include <libusb-1.0/libusb.h> // #include <libusb.h>
import "C" import "C"
import ( import (

2
usb/endpoint.go
View File

@@ -15,7 +15,7 @@
package usb package usb
// #include <libusb-1.0/libusb.h> // #include <libusb.h>
import "C" import "C"
import ( import (

2
usb/error.go
View File

@@ -19,7 +19,7 @@ import (
"fmt" "fmt"
) )
// #include <libusb-1.0/libusb.h> // #include <libusb.h>
import "C" import "C"
type usbError C.int type usbError C.int

4
usb/transfer.c
View File

@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include <libusb-1.0/libusb.h> #include <libusb.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -25,7 +25,7 @@ void callback(struct libusb_transfer *xfer) {
} }
int submit(struct libusb_transfer *xfer) { int submit(struct libusb_transfer *xfer) {
xfer->callback = &callback; xfer->callback = (libusb_transfer_cb_fn)(&callback);
xfer->status = -1; xfer->status = -1;
return libusb_submit_transfer(xfer); return libusb_submit_transfer(xfer);
} }

2
usb/transfer.go
View File

@@ -15,7 +15,7 @@
package usb package usb
/* /*
#include <libusb-1.0/libusb.h> #include <libusb.h>
int compact_iso_data(struct libusb_transfer *xfer, unsigned char *status); int compact_iso_data(struct libusb_transfer *xfer, unsigned char *status);
int submit(struct libusb_transfer *xfer); int submit(struct libusb_transfer *xfer);

7
usb/usb.go
View File

@@ -16,11 +16,8 @@
// Package usb provides a wrapper around libusb-1.0. // Package usb provides a wrapper around libusb-1.0.
package usb package usb
// #cgo windows CFLAGS: -ID:/lib/libusb-1.0.19/include // #cgo pkg-config: libusb-1.0
// #cgo windows,amd64 LDFLAGS: D:/lib/libusb-1.0.19/MinGW64/static/libusb-1.0.a // #include <libusb.h>
// #cgo windows,386 LDFLAGS: D:/lib/libusb-1.0.19/MinGW32/static/libusb-1.0.a
// #cgo !windows LDFLAGS: -lusb-1.0
// #include <libusb-1.0/libusb.h>
import "C" import "C"
import ( import (