diff --git a/usb/config.go b/usb/config.go index d60a703..b6ab0e1 100644 --- a/usb/config.go +++ b/usb/config.go @@ -15,7 +15,7 @@ package usb -// #include +// #include import "C" import ( diff --git a/usb/constants.go b/usb/constants.go index 88a28b7..67c41ce 100644 --- a/usb/constants.go +++ b/usb/constants.go @@ -15,7 +15,7 @@ package usb -// #include +// #include import "C" type Class uint8 diff --git a/usb/descriptor.go b/usb/descriptor.go index fa6c1a3..79e5036 100644 --- a/usb/descriptor.go +++ b/usb/descriptor.go @@ -15,7 +15,7 @@ package usb -// #include +// #include import "C" type Descriptor struct { diff --git a/usb/device.go b/usb/device.go index e065a46..6100a79 100644 --- a/usb/device.go +++ b/usb/device.go @@ -15,7 +15,7 @@ package usb -// #include +// #include import "C" import ( diff --git a/usb/endpoint.go b/usb/endpoint.go index 9ae4005..095158d 100644 --- a/usb/endpoint.go +++ b/usb/endpoint.go @@ -15,7 +15,7 @@ package usb -// #include +// #include import "C" import ( diff --git a/usb/error.go b/usb/error.go index 73c62ad..73115ee 100644 --- a/usb/error.go +++ b/usb/error.go @@ -19,7 +19,7 @@ import ( "fmt" ) -// #include +// #include import "C" type usbError C.int diff --git a/usb/transfer.c b/usb/transfer.c index 2fa3497..9965019 100644 --- a/usb/transfer.c +++ b/usb/transfer.c @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include #include @@ -25,7 +25,7 @@ void callback(struct libusb_transfer *xfer) { } int submit(struct libusb_transfer *xfer) { - xfer->callback = &callback; + xfer->callback = (libusb_transfer_cb_fn)(&callback); xfer->status = -1; return libusb_submit_transfer(xfer); } diff --git a/usb/transfer.go b/usb/transfer.go index bbb0792..104c193 100644 --- a/usb/transfer.go +++ b/usb/transfer.go @@ -15,7 +15,7 @@ package usb /* -#include +#include int compact_iso_data(struct libusb_transfer *xfer, unsigned char *status); int submit(struct libusb_transfer *xfer); diff --git a/usb/usb.go b/usb/usb.go index df25b5c..47784fb 100644 --- a/usb/usb.go +++ b/usb/usb.go @@ -16,11 +16,8 @@ // Package usb provides a wrapper around libusb-1.0. package usb -// #cgo windows CFLAGS: -ID:/lib/libusb-1.0.19/include -// #cgo windows,amd64 LDFLAGS: D:/lib/libusb-1.0.19/MinGW64/static/libusb-1.0.a -// #cgo windows,386 LDFLAGS: D:/lib/libusb-1.0.19/MinGW32/static/libusb-1.0.a -// #cgo !windows LDFLAGS: -lusb-1.0 -// #include +// #cgo pkg-config: libusb-1.0 +// #include import "C" import (