Ticket #8833: usb_hid.patch

build/jam/Haiku64Image

@@ -21 +21 @@
 
 SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr chgrp chmod
     chown chroot cksum clear clockconfig cmp collectcatkeys comm compress
-    copyattr cp csplit cut date dd diff diff3 dircolors dirname du
+    copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
     dumpcatalog echo eject env error expand expr factor false find finddir
     fmt fold fortune gawk gzip gzexe getlimits groups head hostname id
     <bin>install isvolume join kernel_debugger kill less lessecho lesskey link
@@ -83 +83 @@
 AddDriversToHaikuImage              : console dprintf null
                                       random <driver>tty zero ;
 AddDriversToHaikuImage disk usb         : usb_disk ;
-AddDriversToHaikuImage input        : ps2_hid ;
+AddDriversToHaikuImage input        : ps2_hid usb_hid ;
 # kernel
 AddFilesToHaikuImage system : kernel_$(TARGET_ARCH) ;
 

src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp

@@ -62 +62 @@
     // ensure default configuration is set
     status_t result = gUSBModule->set_configuration(device, config);
     if (result != B_OK) {
-        TRACE_ALWAYS("set_configuration() failed 0x%08lx\n", result);
+        TRACE_ALWAYS("set_configuration() failed 0x%08" B_PRIx32 "\n", result);
         return result;
     }
 
@@ -78 +78 @@
     for (size_t i = 0; i < config->interface_count; i++) {
         const usb_interface_info *interface = config->interface[i].active;
         uint8 interfaceClass = interface->descr->interface_class;
-        TRACE("interface %lu: class: %u; subclass: %u; protocol: %u\n",
-            i, interfaceClass, interface->descr->interface_subclass,
+        TRACE("interface %" B_PRIuSIZE ": class: %u; subclass: %u; protocol: "
+            "%u\n", i, interfaceClass, interface->descr->interface_subclass,
             interface->descr->interface_protocol);
 
         // check for quirky devices first
@@ -128 +128 @@
                     char pathBuffer[128];
                     const char *basePath = handler->BasePath();
                     while (true) {
-                        sprintf(pathBuffer, "%s%ld", basePath, index++);
+                        sprintf(pathBuffer, "%s%" B_PRId32, basePath, index++);
                         if (gDeviceList->FindDevice(pathBuffer) == NULL) {
                             // this name is still free, use it
                             handler->SetPublishPath(strdup(pathBuffer));
@@ -149 +149 @@
     if (!devicesFound)
         return B_ERROR;
 
-    *cookie = (void *)parentCookie;
+    *cookie = (void *)(addr_t)parentCookie;
     return B_OK;
 }
 
@@ -158 +158 @@
 usb_hid_device_removed(void *cookie)
 {
     mutex_lock(&sDriverLock);
-    int32 parentCookie = (int32)cookie;
-    TRACE("device_removed(%ld)\n", parentCookie);
+    int32 parentCookie = (int32)(addr_t)cookie;
+    TRACE("device_removed(%" B_PRId32 ")\n", parentCookie);
 
     for (int32 i = 0; i < gDeviceList->CountDevices(); i++) {
         ProtocolHandler *handler = (ProtocolHandler *)gDeviceList->DeviceAt(i);