From: Michael Gernoth <michael@gernoth.net>
Date: Fri, 11 Apr 2008 13:38:01 +0000 (+0200)
Subject: move card_type into xpcu_s
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/commitdiff_plain/4f3471859a885ff6a84306d0e7d00e6e2e9a17f8

move card_type into xpcu_s
---

diff --git a/usb-driver.c b/usb-driver.c
index 1a37f54..9ed0c35 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -55,7 +55,6 @@ static FILE *modulesfp = NULL;
 static FILE *baseaddrfp = NULL;
 static int baseaddrnum = 0;
 static int modules_read = 0;
-static unsigned long card_type;
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
@@ -351,7 +350,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 											   /* TODO: check interfaceClass! */
 											   DPRINTF("found device with libusb\n");
 											   xpcu->dev = dev;
-											   card_type = e->dwCardType;
+											   xpcu->card_type = e->dwCardType;
 										   }
 									   }
 								   }
@@ -512,7 +511,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 				if (xpcu->dev) {
 					struct usb_interface *interface = xpcu->dev->config->interface;
 
-					e->dwCardType = card_type;
+					e->dwCardType = xpcu->card_type;
 					e->dwAction = 1;
 					e->dwEventId = 109;
 					e->u.Usb.dwUniqueID = 110;
diff --git a/xpcu.h b/xpcu.h
index eeb25eb..bbf5a9d 100644
--- a/xpcu.h
+++ b/xpcu.h
@@ -7,6 +7,7 @@ struct xpcu_s {
 	struct usb_bus *busses;
 	int interface;
 	int alternate;
+	unsigned long card_type;
 };
 
 int __attribute__ ((visibility ("hidden"))) xpcu_deviceinfo(struct xpcu_s *xpcu, unsigned char *buf);