[Pcsclite-cvs-commit] PCSC/src hotplug_libusb.c,1.12,1.13 hotplug_linux.c,1.16,1.17
aet-guest@quantz.debian.org
aet-guest@quantz.debian.org
Sat, 18 Oct 2003 16:29:42 +0200
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv5203
Modified Files:
hotplug_libusb.c hotplug_linux.c
Log Message:
- Remove USB bundle platform (Linux) hardcoding and replace
it with PCSC_ARCH.
Index: hotplug_libusb.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_libusb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- hotplug_libusb.c 16 Sep 2003 13:49:20 -0000 1.12
+++ hotplug_libusb.c 18 Oct 2003 14:29:40 -0000 1.13
@@ -154,8 +154,8 @@
if (rv == 0)
{
snprintf(fullLibPath, sizeof(fullLibPath),
- "%s/%s/Contents/Linux/%s",
- PCSCLITE_HP_DROPDIR, currFP->d_name, keyValue);
+ "%s/%s/Contents/%s/%s",
+ PCSCLITE_HP_DROPDIR, currFP->d_name, PCSC_ARCH, keyValue);
fullLibPath[sizeof(fullLibPath) - 1] = '\0';
driverTracker[listCount].libraryPath = strdup(fullLibPath);
}
@@ -389,8 +389,7 @@
} /* End of function */
/*
- * Sets up callbacks for device hotplug events. Not currently implemented
- * for Linux.
+ * Sets up callbacks for device hotplug events.
*/
ULONG HPRegisterForHotplugEvents(void)
{
Index: hotplug_linux.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/hotplug_linux.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- hotplug_linux.c 8 Sep 2003 11:23:57 -0000 1.16
+++ hotplug_linux.c 18 Oct 2003 14:29:40 -0000 1.17
@@ -159,9 +159,10 @@
keyValue, 0);
if (rv == 0)
{
- snprintf(fullLibPath, FILENAME_MAX, "%s%s%s%s", PCSCLITE_HP_DROPDIR,
- currFP->d_name, "/Contents/Linux/", keyValue);
- fullLibPath[FILENAME_MAX - 1] = '\0';
+ snprintf(fullLibPath, sizeof(fullLibPath),
+ "%s/%s/Contents/%s/%s",
+ PCSCLITE_HP_DROPDIR, currFP->d_name, PCSC_ARCH, keyValue);
+ fullLibPath[sizeof(fullLibPath) - 1] = '\0';
bundleTracker[listCount].libraryPath = strdup(fullLibPath);
}
@@ -393,8 +394,7 @@
} /* End of function */
/*
- * Sets up callbacks for device hotplug events. Not currently implemented
- * for Linux.
+ * Sets up callbacks for device hotplug events.
*/
ULONG HPRegisterForHotplugEvents(void)
{