usb: move vendor/trezor/usbhid -> usb/lowlevel

There is less and less sense for keeping usbhid and trezord-go as two github projects.

Gopkg.toml

@@ -28,10 +28,6 @@
   name = "github.com/gorilla/mux"
   version = "1.6.1"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/trezor/usbhid"
-
 [[constraint]]
   name = "gopkg.in/natefinch/lumberjack.v2"
   version = "2.1.0"

README.md

@@ -80,4 +80,6 @@ Server supports following API calls:
 
 * (C) 2018 Karel Bilek, Jan Pochyla
 * CORS Copyright (c) 2013 The Gorilla Handlers Authors, [BSD license](https://github.com/gorilla/handlers/blob/master/LICENSE)
+* (c) 2017 Jason T. Harris (also see https://github.com/deadsy/libusb for comprehensive list)
+* (C) 2017 Péter Szilágyi (also see https://github.com/karalabe/hid for comprehensive list)
 * Licensed under LGPLv3

core/core.go

@@ -20,8 +20,8 @@ import (
 // and dealing with sessions, mutexes, ...
 //
 // USB package is not imported for efficiency
-// reasons - USB package uses imports trezor/usbhid and
-// usbhid uses cgo, so it takes about 25 seconds to build;
+// reasons - USB package uses imports /usb/lowlevel and
+// /usb/lowlevel uses cgo, so it takes about 25 seconds to build;
 // so building just this package  on its own
 // takes less seconds when we dont import USB
 // package and use abstract interfaces instead

usb/hidapi.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/trezor/usbhid"
+	"github.com/trezor/trezord-go/usb/lowlevel"
 
 	"github.com/trezor/trezord-go/core"
 	"github.com/trezor/trezord-go/memorywriter"
@@ -36,7 +36,7 @@ func (b *HIDAPI) Enumerate() ([]Info, error) {
 	var infos []Info
 
 	b.mw.Println("hidapi - enumerate - low level")
-	devs := usbhid.HidEnumerate(0, 0)
+	devs := lowlevel.HidEnumerate(0, 0)
 
 	b.mw.Println("hidapi - enumerate - low level done")
 
@@ -58,7 +58,7 @@ func (b *HIDAPI) Has(path string) bool {
 
 func (b *HIDAPI) Connect(path string) (Device, error) {
 	b.mw.Println("hidapi - connect - enumerate to find")
-	devs := usbhid.HidEnumerate(0, 0)
+	devs := lowlevel.HidEnumerate(0, 0)
 	b.mw.Println("hidapi - connect - enumerate done")
 
 	for _, dev := range devs { // enumerate all devices
@@ -84,22 +84,22 @@ func (b *HIDAPI) Connect(path string) (Device, error) {
 	return nil, ErrNotFound
 }
 
-func (b *HIDAPI) match(d *usbhid.HidDeviceInfo) bool {
+func (b *HIDAPI) match(d *lowlevel.HidDeviceInfo) bool {
 	vid := d.VendorID
 	pid := d.ProductID
 	trezor1 := vid == core.VendorT1 && (pid == core.ProductT1Firmware)
 	trezor2 := vid == core.VendorT2 && (pid == core.ProductT2Firmware || pid == core.ProductT2Bootloader)
 	return (trezor1 || trezor2) && (d.Interface == hidIfaceNum || d.UsagePage == hidUsagePage)
 }
 
-func (b *HIDAPI) identify(dev *usbhid.HidDeviceInfo) string {
+func (b *HIDAPI) identify(dev *lowlevel.HidDeviceInfo) string {
 	path := []byte(dev.Path)
 	digest := sha256.Sum256(path)
 	return hidapiPrefix + hex.EncodeToString(digest[:])
 }
 
 type HID struct {
-	dev     *usbhid.HidDevice
+	dev     *lowlevel.HidDevice
 	prepend bool // on windows, see detectPrepend
 
 	closed        int32 // atomic
@@ -133,7 +133,7 @@ var unknownErrorMessage = "hidapi: unknown failure"
 // or a newer one that is on id 0.
 // The older one does not need prepending, the newer one does
 // This makes difference only on windows
-func detectPrepend(dev *usbhid.HidDevice) (bool, error) {
+func detectPrepend(dev *lowlevel.HidDevice) (bool, error) {
 	buf := []byte{63}
 	for i := 0; i < 63; i++ {
 		buf = append(buf, 0xff)

vendor/github.com/trezor/usbhid/c/libusb/core.c → usb/lowlevel/c/libusb/core.c

@@ -2308,7 +2308,7 @@ static void usbi_log_str(struct libusb_context *ctx,
 {
 	UNUSED(ctx);
 	UNUSED(level);
-	goUsbHidLog(str);
+	goLog(str);
 }
 
 void usbi_log_v(struct libusb_context *ctx, enum libusb_log_level level,

vendor/github.com/trezor/usbhid/hid.go → usb/lowlevel/hid.go

@@ -8,10 +8,10 @@
 
 // +build linux,cgo darwin,!ios,cgo windows,cgo
 
-package usbhid
+package lowlevel
 
 /*
-extern void goUsbHidLog(const char *s);
+extern void goLog(const char *s);
 
 #define ENABLE_LOGGING 1
 #define ENABLE_DEBUG_LOGGING 1

vendor/github.com/trezor/usbhid/libusb.go → usb/lowlevel/libusb.go

@@ -9,7 +9,7 @@ Copyright (c) 2017 Jason T. Harris
 //-----------------------------------------------------------------------------
 
 // Package libusb provides go wrappers for libusb-1.0
-package usbhid
+package lowlevel
 
 /*
 // +build linux,cgo darwin,!ios,cgo windows,cgo

vendor/github.com/trezor/usbhid/log.go → usb/lowlevel/log.go

@@ -1,4 +1,4 @@
-package usbhid
+package lowlevel
 
 import (
 	"io"
@@ -12,8 +12,8 @@ func SetLogWriter(l io.Writer) {
 	writer = l
 }
 
-//export goUsbHidLog
-func goUsbHidLog(s *C.char) {
+//export goLog
+func goLog(s *C.char) {
 	if writer != nil {
 		writer.Write([]byte(C.GoString(s)))
 	}

vendor/github.com/trezor/usbhid/wchar.go → usb/lowlevel/wchar.go

@@ -9,7 +9,7 @@
 // +build !ios
 // +build linux darwin windows
 
-package usbhid
+package lowlevel
 
 /*
 #include <wchar.h>