Fix an error in struct initialization, remove some debug things. Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c _____
Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h --- branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2006-01-08 11:48:49 UTC (rev 20710) +++ branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2006-01-08 12:55:06 UTC (rev 20711) @@ -399,7 +399,7 @@
#define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L) static __inline long IS_ERR(const void *ptr) { - return IS_ERR_VALUE((unsigned long)ptr); + return (long)IS_ERR_VALUE((unsigned long)ptr); }
_____
Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c --- branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c 2006-01-08 11:48:49 UTC (rev 20710) +++ branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c 2006-01-08 12:55:06 UTC (rev 20711) @@ -421,7 +421,6 @@
if (status & USBSTS_RD) { - DbgBreakPoint(); usb_hcd_poll_rh_status(hcd); } else { @@ -938,7 +937,7 @@ MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
struct pci_driver uhci_pci_driver = { - 0, + /* list_head*/ 0, 0, /*.name =*/ (char *)hcd_name, /*.id_table =*/ uhci_pci_ids,
_____
Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c --- branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c 2006-01-08 11:48:49 UTC (rev 20710) +++ branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c 2006-01-08 12:55:06 UTC (rev 20711) @@ -36,7 +36,7 @@
strcpy(dev->dev.name, "UnivHCI PCI-USB Controller"); strcpy(dev->slot_name, "UHCD PCI Slot"); -DbgBreakPoint(); + /* Init the HCD. Probe will be called automatically, but will fail because id=NULL */ Status = uhci_hcd_init(); if (!NT_SUCCESS(Status))