Merge pull request #4 from mengzhuo/master

make ctrl exportable

hid.go

@@ -1,6 +1,10 @@
 package hid
 
-import "time"
+import (
+	"io/ioutil"
+	"log"
+	"time"
+)
 
 //
 // General information about the HID device
@@ -28,4 +32,8 @@ type Device interface {
 	GetReport(int) ([]byte, error)
 	Read(size int, ms time.Duration) ([]byte, error)
 	Write(data []byte, ms time.Duration) (int, error)
+	Ctrl(rtype, req, val, index int, data []byte, t int) (int, error)
 }
+
+// Default Logger setting
+var Logger = log.NewLogger(ioutil.Discard, log.LstdFlags)

usb_linux.go

@@ -5,7 +5,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"io/ioutil"
-	"log"
 	"os"
 	"path/filepath"
 	"syscall"
@@ -68,7 +67,7 @@ func (hid *usbDevice) claim() error {
 		IoctlCode: USBDEVFS_DISCONNECT,
 		Data:      0,
 	}); r == -1 {
-		log.Println("driver disconnect failed:", r, errno)
+		Logger.Println("driver disconnect failed:", r, errno)
 	}
 
 	if r, errno := hid.ioctl(USBDEVFS_CLAIM, &ifno); r == -1 {
@@ -90,11 +89,15 @@ func (hid *usbDevice) release() error {
 		IoctlCode: USBDEVFS_CONNECT,
 		Data:      0,
 	}); r == -1 {
-		log.Println("driver connect failed:", r, errno)
+		Logger.Println("driver connect failed:", r, errno)
 	}
 	return nil
 }
 
+func (hid *usbDevice) Ctrl(rtype, req, val, index int, data []byte, t int) (int, error) {
+	return hid.ctrl(rtype, req, val, index, data, t)
+}
+
 func (hid *usbDevice) ctrl(rtype, req, val, index int, data []byte, t int) (int, error) {
 	s := usbfsCtrl{
 		ReqType: uint8(rtype),
@@ -288,7 +291,7 @@ func UsbWalk(cb func(Device)) {
 			return nil
 		}
 		if err := walker(f, cb); err != nil {
-			log.Println("UsbWalk: ", err)
+			Logger.Println("UsbWalk: ", err)
 		}
 		return nil
 	})