From: michael <michael>
Date: Sat, 10 Mar 2007 10:51:06 +0000 (+0000)
Subject: fix 64bit and add DEBUG shared object
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/commitdiff_plain/7216ce6cb7163f83893a7dd01315a139a3993dba

fix 64bit and add DEBUG shared object
---

diff --git a/Makefile b/Makefile
index 250e2f6..4ef6aba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,14 @@
 CFLAGS=-Wall
 
+all: libusb-driver.so libusb-driver-DEBUG.so
+
 libusb-driver.so: usb-driver.c usb-driver.h
-	gcc $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
+	gcc -fPIC $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
+
+libusb-driver-DEBUG.so: usb-driver.c usb-driver.h
+	gcc -fPIC -DDEBUG $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
 
 clean:
-	rm -f libusb-driver.so
+	rm -f libusb-driver.so libusb-driver-DEBUG.so
 
-.PHONY: clean
+.PHONY: clean all
diff --git a/usb-driver.c b/usb-driver.c
index a3a2efb..5a5a147 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -52,7 +52,6 @@ static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
-/* #define DEBUG 1 */
 
 #ifdef DEBUG
 #define DPRINTF(format, args...) fprintf(stderr, format, ##args)
diff --git a/usb-driver.h b/usb-driver.h
index e67194e..cabc48e 100644
--- a/usb-driver.h
+++ b/usb-driver.h
@@ -1,3 +1,4 @@
+#if __WORDSIZE == 32
 #define VERSION			0x910
 #define LICENSE			0x952
 #define TRANSFER		0x98c
@@ -12,6 +13,22 @@
 #define INT_ENABLE		0x98e
 #define EVENT_PULL		0x988
 #define USB_SET_INTERFACE	0x981
+#else
+#define VERSION			0xc0000910
+#define LICENSE			0xc0000952
+#define TRANSFER		0xc000098c
+#define USB_TRANSFER		0xc0000983
+#define EVENT_UNREGISTER	0xc0000987
+#define INT_DISABLE		0xc000091f
+#define INT_WAIT		0xc000094b
+#define CARD_REGISTER		0xc00009a4
+#define EVENT_REGISTER		0xc00009a5
+#define CARD_UNREGISTER		0xc000092b
+#define USB_GET_DEVICE_DATA	0xc00009a7
+#define INT_ENABLE		0xc000098e
+#define EVENT_PULL		0xc0000988
+#define USB_SET_INTERFACE	0xc0000981
+#endif
 
 #define MAGIC 0xa410b413UL