Merge branch 'master' into master

Author: whitone

hid_darwin.go

@@ -160,7 +160,7 @@ type osxDevice struct {
 
 func cfstring(s string) C.CFStringRef {
 	n := C.CFIndex(len(s))
-	return C.CFStringCreateWithBytes(nil, *(**C.UInt8)(unsafe.Pointer(&s)), n, C.kCFStringEncodingUTF8, 0)
+	return C.CFStringCreateWithBytes(C.kCFAllocatorDefault, *(**C.UInt8)(unsafe.Pointer(&s)), n, C.kCFStringEncodingUTF8, 0)
 }
 
 func gostring(cfs C.CFStringRef) string {
@@ -215,7 +215,7 @@ func getPath(osDev C.IOHIDDeviceRef) string {
 func iterateDevices(action func(device C.IOHIDDeviceRef) bool) cleanupDeviceManagerFn {
 	var mgr C.IOHIDManagerRef
 	mgr = C.IOHIDManagerCreate(C.kCFAllocatorDefault, C.kIOHIDOptionsTypeNone)
-	C.IOHIDManagerSetDeviceMatching(mgr, nil)
+	C.IOHIDManagerSetDeviceMatching(mgr, nilCfDictionaryRef)
 	C.IOHIDManagerOpen(mgr, C.kIOHIDOptionsTypeNone)
 
 	var allDevicesSet C.CFSetRef
@@ -410,4 +410,4 @@ func reportCallback(context unsafe.Pointer, result C.IOReturn, sender unsafe.Poi
 	case dev.readCh <- data:
 	default:
 	}
-}
+}

hid_darwin_go110.go

@@ -12,3 +12,4 @@ var nilCfStringRef C.CFStringRef= 0
 var nilCfTypeRef C.CFTypeRef = 0
 var nilCfSetRef C.CFSetRef = 0
 var nilIOHIDDeviceRef C.IOHIDDeviceRef = 0
+var nilCfDictionaryRef C.CFDictionaryRef = 0

hid_darwin_go19.go

@@ -12,3 +12,4 @@ var nilCfStringRef C.CFStringRef= nil
 var nilCfTypeRef C.CFTypeRef = nil
 var nilCfSetRef C.CFSetRef = nil
 var nilIOHIDDeviceRef C.IOHIDDeviceRef = nil
+var nilCfDictionaryRef C.CFDictionaryRef = nil

hid_windows.go

@@ -1,7 +1,7 @@
 package hid
 
 /*
-#cgo LDFLAGS: -lSetupapi -lhid
+#cgo LDFLAGS: -lsetupapi -lhid
 
 #ifdef __MINGW32__
 #include <ntdef.h>