[Pcsclite-cvs-commit] r3116 - /trunk/PCSC/src/hotplug_libhal.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Sep  9 09:10:40 2008
New Revision: 3116

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3116
Log:
HPAddDevice(): the device serial is "usb.serial" instead of
"usb_device.serial" and it is a C-string instead of an int

Modified:
    trunk/PCSC/src/hotplug_libhal.c

Modified: trunk/PCSC/src/hotplug_libhal.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libhal.c?rev=3116&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Tue Sep  9 09:10:40 2008
@@ -368,16 +368,17 @@
 	readerTracker[i].udi = strdup(udi);
 
 #ifdef ADD_SERIAL_NUMBER
-	if (libhal_device_property_exists(ctx, udi, "usb_device.serial", &error))
+	if (libhal_device_property_exists(ctx, udi, "usb.serial", &error))
 	{
 		char fullname[MAX_READERNAME];
-		int iSerialNumber;
-
-		iSerialNumber = libhal_device_get_property_int(ctx, udi,
-			"usb_device.serial", &error);
-
-		snprintf(fullname, sizeof(fullname), "%s (%d)",
-			driver->readerName, iSerialNumber);
+		char *sSerialNumber;
+
+		sSerialNumber = libhal_device_get_property_string(ctx, udi,
+			"usb.serial", &error);
+
+		printf("SERIAL: %s\n", sSerialNumber);
+		snprintf(fullname, sizeof(fullname), "%s (%s)",
+			driver->readerName, sSerialNumber);
 		readerTracker[i].fullName = strdup(fullname);
 	}
 	else