Sort entries in usbport.def Define some functions only if DEBUG_MODE is defined Modified: trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c Modified: trunk/reactos/drivers/usb/usbhub/fdo.c Modified: trunk/reactos/drivers/usb/usbport/hcd.c Modified: trunk/reactos/drivers/usb/usbport/usbport.def _____
Modified: trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2005-11-24 13:22:13 UTC (rev 19524) @@ -656,7 +656,7 @@
#define dev_warn(x,f,arg...) do {} while (0) #define dev_err(x,f,arg...) do {} while (0) #define pr_debug(x,f,arg...) do {} while (0) -#define usbprintk +#define usbprintk(arg...) dev_printk(0,0,0,## arg) #endif
_____
Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c --- trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c 2005-11-24 13:22:13 UTC (rev 19524) @@ -625,6 +625,7 @@
/*---------------------------------------------------------------------- ---*/
+#ifdef DEBUG_MODE // HCFS itself static char *hcfs2string (int state) { @@ -636,6 +637,7 @@ } return "?"; } +#endif
static void ohci_stop (struct usb_hcd *hcd) { _____
Modified: trunk/reactos/drivers/usb/usbhub/fdo.c --- trunk/reactos/drivers/usb/usbhub/fdo.c 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/usbhub/fdo.c 2005-11-24 13:22:13 UTC (rev 19524) @@ -103,7 +103,7 @@
PdoExtension->IsFDO = FALSE; PdoExtension->dev = dev->children[i]; - sprintf(Buffer[0], "%lu", i + 1); + sprintf(Buffer[0], "%lu", i); Status = UsbhubInitMultiSzString( &PdoExtension->InstanceId, Buffer[0], NULL); _____
Modified: trunk/reactos/drivers/usb/usbport/hcd.c --- trunk/reactos/drivers/usb/usbport/hcd.c 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/usbport/hcd.c 2005-11-24 13:22:13 UTC (rev 19524) @@ -822,6 +822,7 @@
new_alloc = old_alloc + (int) bustime; if (new_alloc > FRAME_TIME_MAX_USECS_ALLOC) { +#ifdef DEBUG_MODE #ifdef DEBUG char *mode = #ifdef CONFIG_USB_BANDWIDTH @@ -832,6 +833,7 @@ dev_dbg (&dev->dev, "usb_check_bandwidth %sFAILED: %d + %ld = %d usec\n", mode, old_alloc, bustime, new_alloc); #endif +#endif #ifdef CONFIG_USB_BANDWIDTH bustime = -ENOSPC; /* report error */ #endif _____
Modified: trunk/reactos/drivers/usb/usbport/usbport.def --- trunk/reactos/drivers/usb/usbport/usbport.def 2005-11-24 12:34:08 UTC (rev 19523) +++ trunk/reactos/drivers/usb/usbport/usbport.def 2005-11-24 13:22:13 UTC (rev 19524) @@ -2,33 +2,33 @@
; Exports definition file for usbcore.sys ; EXPORTS -usb_init@0 -usb_exit@0 -usb_init_urb@4 +RegisterPortDriver@8 +usb_alloc_bus@4 +usb_alloc_dev@8 usb_alloc_urb@8 -usb_free_urb@4 -usb_get_string -usb_get_urb@4 -usb_get_dev@4 -usb_submit_urb@8 -usb_unlink_urb@4 usb_bus_init@4 -usb_alloc_bus@4 -usb_free_bus@4 -usb_register_bus@4 -usb_deregister_bus@4 -usb_register_root_hub@8 usb_calc_bus_time@16 usb_check_bandwidth@8 usb_claim_bandwidth@16 -usb_release_bandwidth@12 +usb_connect@4 +usb_deregister_bus@4 +usb_disabled@0 +usb_exit@0 +usb_free_bus@4 +usb_free_urb@4 +usb_get_dev@4 +usb_get_string +usb_get_urb@4 usb_hcd_giveback_urb@12 ;usb_hcd_irq@12 +usb_hcd_pci_probe@8 +usb_hcd_pci_remove@4 usb_hc_died@4 -usb_alloc_dev@8 -usb_connect@4 +usb_init@0 +usb_init_urb@4 usb_put_dev@4 -usb_disabled@0 -usb_hcd_pci_probe@8 -usb_hcd_pci_remove@4 -RegisterPortDriver@8 \ No newline at end of file +usb_release_bandwidth@12 +usb_register_bus@4 +usb_register_root_hub@8 +usb_submit_urb@8 +usb_unlink_urb@4 \ No newline at end of file
-
hpoussin＠svn.reactos.com