rawhid 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cd8505e05ba9a641cb9add30f6e5a9cde48421a
-  data.tar.gz: 49f8c62b7e333a9bbf9e3246bad8c38362747639
+  metadata.gz: 764040e72e30f56fced1bb0e997f448d2885db63
+  data.tar.gz: 956c32657616d57bf0e8cd8ee1434328f41579ea
 SHA512:
-  metadata.gz: 0563e92f96e93be0dfd1fb9dcf22b1c701c1c26bd1a2d449fdab6116fbf5ffcb59754d4dbed3c84f17dd755dacec4507fe6b6a1c8bce2e451dc86d3fc9bd727d
-  data.tar.gz: c4653cb780fe023bcc02cdaf4cfaf86040cbcae5fdbd6d6a4a6c7feddc26b6a579e8cb5b28f8e4e233ffc2490c2d05bc129e8eec3ac9116441deb27973a9ee6c
+  metadata.gz: 91da84ed6adbef767cac7d9d0fb37e480694da20c71d0bc40b4509f5e46e8389a245f0048946521b8e23a65ebbe5cd6a07ccf21e6ecd99c8b0861bbe88cb9b17
+  data.tar.gz: db084b399cfbc5dc884f651279bf786b2a006f8ec6673b9c3fdc2c12bff8d21c0b4f0f602e9588c4f09b0b3e23ffdad0ae5d3d5dbfa27822a22b11cecd8f2649

data/ext/teensy_rawhid/extconf.rb

@@ -8,12 +8,15 @@ $srcs = ["#{extension_name}.c"]
 case Gem::Platform.local.os
 when "linux"
   have_library "usb", nil, ["usb.h"]
-  $defs.push("-DOS_LINUX")
+  $defs.push "-DOS_LINUX"
   $srcs << "hid_LINUX.c"
+#when "darwin"
+#  raise "can't build for 
+#  have_library "hid", nil, ["hid.h"]
+#  $defs.push "-DOS_MACOSX"
 else
-  exit 1
+  raise "Don't know ho to build rawhid on #{Gem::Platform.local.os} yet."
 end
 
-
 create_header
 create_makefile "#{extension_name}"

data/ext/teensy_rawhid/hid.h

@@ -1,6 +1,9 @@
+#include "hid_LINUX.h"
 
-int rawhid_open(int max, void **devs, int vid, int pid, int usage_page, int usage);
-int rawhid_recv(void *dev, void *buf, int len, int timeout);
-int rawhid_send(void *dev, void *buf, int len, int timeout);
-void rawhid_close(void *dev);
+typedef struct hid_struct hid_t;
+
+int rawhid_open(int max, hid_t **devs, int vid, int pid, int usage_page, int usage);
+int rawhid_recv(hid_t *hid, void *buf, int len, int timeout);
+int rawhid_send(hid_t *hid, void *buf, int len, int timeout);
+int rawhid_close(hid_t *hid);
 

data/ext/teensy_rawhid/hid_LINUX.c

@@ -81,38 +81,23 @@
 
 #define printf(...)  // comment this out for lots of info
 
-
-// a list of all opened HID devices, so the caller can
-// simply refer to them by number
-typedef struct hid_struct hid_t;
-struct hid_struct {
-	usb_dev_handle *usb;
-	int open;
-	int iface;
-	int ep_in;
-	int ep_out;
-	struct hid_struct *prev;
-	struct hid_struct *next;
-};
-
-
 // private functions, not intended to be used from outside this file
 static void hid_close(hid_t *hid);
 static int hid_parse_item(uint32_t *val, uint8_t **data, const uint8_t *end);
 
+static volatile int num_open = 0;
 
 //  rawhid_recv - receive a packet
 //    Inputs:
-//	dev = pointer to device to receive from
+//	rawhid = pointer to device to receive from
 //	buf = buffer to receive packet
 //	len = buffer's size
 //	timeout = time to wait, in milliseconds
 //    Output:
 //	number of bytes received, or -1 on error
 //
-int rawhid_recv(void *dev, void *buf, int len, int timeout)
+int rawhid_recv(hid_t *hid, void *buf, int len, int timeout)
 {
-	hid_t *hid = dev;
 	int r;
 
 	if (!hid || !hid->open) return -1;
@@ -131,10 +116,8 @@ int rawhid_recv(void *dev, void *buf, int len, int timeout)
 //    Output:
 //	number of bytes sent, or -1 on error
 //
-int rawhid_send(void *dev, void *buf, int len, int timeout)
+int rawhid_send(hid_t *hid, void *buf, int len, int timeout)
 {
-	hid_t *hid = dev;
-
 	if (!hid || !hid->open) return -1;
 	if (hid->ep_out) {
 		return usb_interrupt_write(hid->usb, hid->ep_out, buf, len, timeout);
@@ -147,7 +130,7 @@ int rawhid_send(void *dev, void *buf, int len, int timeout)
 //
 //    Inputs:
 //	max = maximum number of devices to open
-//	dev = pointer to array of pointers to devices (at least of size 'max')
+//	rawhids = pointer to array of preallocated rawhid structs
 //	vid = Vendor ID, or -1 if any
 //	pid = Product ID, or -1 if any
 //	usage_page = top level usage page, or -1 if any
@@ -155,8 +138,8 @@ int rawhid_send(void *dev, void *buf, int len, int timeout)
 //    Output:
 //	actual number of devices opened
 //
-int rawhid_open(int max, void **devs, int vid, int pid, int usage_page, int usage)
-{
+int rawhid_open(int max, hid_t **hids, int vid, int pid, int usage_page, int usage)
+{  
 	struct usb_bus *bus;
 	struct usb_device *dev;
 	struct usb_interface *iface;
@@ -166,7 +149,7 @@ int rawhid_open(int max, void **devs, int vid, int pid, int usage_page, int usag
 	uint8_t buf[1024], *p;
 	int i, n, len, tag, ep_in, ep_out, count=0, claimed;
 	uint32_t val=0, parsed_usage, parsed_usage_page;
-	hid_t *hid;
+	hid_t *hid = *hids;
 
 	printf("rawhid_open, max=%d\n", max);
 	if (max < 1) return 0;
@@ -245,7 +228,6 @@ int rawhid_open(int max, void **devs, int vid, int pid, int usage_page, int usag
 					usb_release_interface(u, i);
 					continue;
 				}
-				hid = (struct hid_struct *)malloc(sizeof(struct hid_struct));
 				if (!hid) {
 					usb_release_interface(u, i);
 					continue;
@@ -256,8 +238,7 @@ int rawhid_open(int max, void **devs, int vid, int pid, int usage_page, int usag
 				hid->ep_out = ep_out;
 				hid->open = 1;
                 
-				*devs = hid;
-                devs++;
+                hid++;
                 
 				claimed++;
 				count++;
@@ -273,16 +254,15 @@ int rawhid_open(int max, void **devs, int vid, int pid, int usage_page, int usag
 //  rawhid_close - close a device, free associated memory
 //
 //    Inputs:
-//	dev = pointer to device to close
+//	rawhid = pointer to device to close
 //    Output
-//	(nothing)
+//	1 if device was successfully closed, 0 if it isn't open
 //
-void rawhid_close(void *dev)
+int rawhid_close(hid_t *hid)
 {
-	hid_t *hid = dev;
-
-	if (!hid || !hid->open) return;
-	free(dev);
+    if (!hid || !hid->open) return 0;
+    hid_close(hid);
+    return 1;
 }
 
 // Chuck Robey wrote a real HID report parser
@@ -324,12 +304,10 @@ static int hid_parse_item(uint32_t *val, uint8_t **data, const uint8_t *end)
 
 static void hid_close(hid_t *hid)
 {
-	hid_t *p;
-	int others=0;
-
 	usb_release_interface(hid->usb, hid->iface);
 	usb_close(hid->usb);
 	hid->usb = NULL;
+	hid->open = 0;
 }
 
 

data/ext/teensy_rawhid/hid_LINUX.h

@@ -0,0 +1,10 @@
+#include <usb.h>
+struct hid_struct {
+	usb_dev_handle *usb;
+	int open;
+	int iface;
+	int ep_in;
+	int ep_out;
+	struct hid_struct *prev;
+	struct hid_struct *next;
+};

data/ext/teensy_rawhid/teensy_rawhid.c

@@ -5,28 +5,43 @@
 #include "hid.h"
 
 #define GET_RAWHID(name, val)         \
-  void               *name;           \
+  void              **name;           \
   Data_Get_Struct(val, void, name)
 
 VALUE RawHID;
 VALUE RawHIDError;
 
 VALUE RawHID_new(VALUE class, VALUE vendorId, VALUE productId) {
-  void    *dev = NULL;
+  hid_t   *hid = NULL;
   int      vId = NUM2INT(vendorId);
   int      pId = NUM2INT(productId);
-  int      devices_opened = rawhid_open(1, &dev, vId, pId, -1, -1);
-  if(devices_opened == 0 || dev == NULL) {
-    rb_raise(RawHIDError, "Unable to open device");
+  
+  VALUE self = Data_Make_Struct(class, hid_t, NULL, rawhid_close, hid);
+  if(hid == NULL) {
+    rb_raise(RawHIDError, "Out of memory");
   }
+  rb_iv_set(self, "@vendorId", vendorId);
+  rb_iv_set(self, "@productId", productId);
   
-  VALUE self = Data_Wrap_Struct(class, NULL, rawhid_close, dev);
+  rb_funcall(self, rb_intern("open"), 0);
+
+  return self;
+}
+
+VALUE RawHID_open(VALUE self) {
+  GET_RAWHID(hid, self);
+  int      vId = NUM2INT(rb_iv_get(self, "@vendorId"));
+  int      pId = NUM2INT(rb_iv_get(self, "@productId"));
+  int      devices_opened = rawhid_open(1, &hid, vId, pId, -1, -1);
+  if(devices_opened == 0) {
+    rb_raise(RawHIDError, "Unable to open device");
+  }
   return self;
 }
 
 VALUE RawHID_send(int argc, VALUE *argv, VALUE class) {
   VALUE    data, timeout_val;
-  GET_RAWHID(dev, class);
+  GET_RAWHID(hid, class);
   
   rb_scan_args(argc, argv, "11", &data, &timeout_val);
   
@@ -37,13 +52,18 @@ VALUE RawHID_send(int argc, VALUE *argv, VALUE class) {
   if(len == 0) {
     return INT2NUM(0);
   }
-  int sent = rawhid_send(dev, buf, len, timeout);
+  int sent = rawhid_send(hid, buf, len, timeout);
   return INT2NUM(sent);
 }
 
+VALUE RawHID_close(VALUE class) {
+  GET_RAWHID(hid, class);
+  rawhid_close(hid) ? Qtrue : Qfalse;
+}
+
 VALUE RawHID_recv(int argc, VALUE *argv, VALUE class) {
   VALUE    data, len_val, timeout_val;
-  GET_RAWHID(dev, class);
+  GET_RAWHID(hid, class);
   
   rb_scan_args(argc, argv, "11", &len_val,  &timeout_val);
   
@@ -61,7 +81,7 @@ VALUE RawHID_recv(int argc, VALUE *argv, VALUE class) {
       rb_raise(RawHIDError, "Out of memory");
     }
   }
-  int received = rawhid_recv(dev, buf, len, timeout);
+  int received = rawhid_recv(hid, buf, len, timeout);
   
   if(received < 0) {
     return INT2NUM(received);
@@ -77,6 +97,8 @@ void Init_teensy_rawhid() {
   rb_define_singleton_method(RawHID, "new", RawHID_new, 2);
   rb_define_method(RawHID, "raw_send", RawHID_send, -1);
   rb_define_method(RawHID, "raw_recv", RawHID_recv, -1);
+  rb_define_method(RawHID, "open", RawHID_open, 0);
+  rb_define_method(RawHID, "close", RawHID_close, 0);
   
 }
 

data/lib/rawhid.rb

@@ -11,6 +11,8 @@ class RawHID
   end
   private :raw_send, :raw_recv
   
+  attr_reader :vendorId, :productId
+  
   def write(data, timeout=0)
     if Array === data
       data = data.map(&:chr).join

data/lib/rawhid/version.rb

@@ -1,3 +1,3 @@
 class RawHID
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rawhid
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Leo P.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - ext/teensy_rawhid/extconf.rb
 - ext/teensy_rawhid/hid.h
 - ext/teensy_rawhid/hid_LINUX.c
+- ext/teensy_rawhid/hid_LINUX.h
 - ext/teensy_rawhid/hid_MACOSX.c
 - ext/teensy_rawhid/hid_WINDOWS.c
 - ext/teensy_rawhid/rawhid_test.c