Changeset 11529

Timestamp:

18 Mar 2014, 23:39:47 (11 years ago)

Author:

uli

Message:

Make at least test pass again.

File:

• main/pyfprint/trunk/src/fprint.py (modified) (4 diffs)

main/pyfprint/trunk/src/fprint.py

@@ -2 +2 @@
 import ctypes
 
-lib = ctypes.cdll.LoadLibrary("libfprint.so")
+lib = ctypes.cdll.LoadLibrary("libfprint.so.0")
 
 #
@@ -28 +28 @@
         ]
 
+class libusb_device_descriptor(ctypes.Structure):
+    # from libusb.h
+    _fields_ = [
+        ('bLength', ctypes.c_uint8),
+        ('bDescriptorType', ctypes.c_uint8),
+        ('bcdUSB', ctypes.c_uint16),
+        ('bDeviceClass', ctypes.c_uint8),
+        ('bDeviceSubClass', ctypes.c_uint8),
+        ('bDeviceProtocol', ctypes.c_uint8),
+        ('bMaxPacketSize0', ctypes.c_uint8),
+        ('idVendor', ctypes.c_uint16),
+        ('idProduct', ctypes.c_uint16),
+        ('bcdDevice', ctypes.c_uint16),
+        ('iManufacturer', ctypes.c_uint8),
+        ('iProduct', ctypes.c_uint8),
+        ('iSerialNumber', ctypes.c_uint8),
+        ('bNumConfigurations', ctypes.c_uint8),
+        ]
 
 
@@ -48 +66 @@
         #  Device operations
         ('discover', ctypes.CFUNCTYPE(
-            c_int,  # Returntype?
-            POINTER(libusb_device_descriptor), ctypes.c_uint32_p),
+            ctypes.c_int,  # Returntype?
+            ctypes.POINTER(libusb_device_descriptor),
+            ctypes.POINTER(ctypes.c_uint32)),
+         ),
         # int (*discover)(struct libusb_device_descriptor *dsc, uint32_t *devtype);
         # int (*open)(struct fp_dev *dev, unsigned long driver_data);
@@ -59 +79 @@
         # int (*identify_start)(struct fp_dev *dev);
         # int (*identify_stop)(struct fp_dev *dev, gboolean iterating);
-};
+# };
       
         ]