Remove unneeded pointer indirection Modified: trunk/reactos/drivers/usb/miniport/common/fdo.c Modified: trunk/reactos/drivers/usb/miniport/common/usbcommon.h Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c _____
Modified: trunk/reactos/drivers/usb/miniport/common/fdo.c --- trunk/reactos/drivers/usb/miniport/common/fdo.c 2005-09-10 18:39:34 UTC (rev 17783) +++ trunk/reactos/drivers/usb/miniport/common/fdo.c 2005-09-10 18:45:34 UTC (rev 17784) @@ -118,7 +118,7 @@
DeviceExtension->BaseAddrLength = Descriptor->u.Port.Length; DeviceExtension->Flags = Descriptor->Flags;
- ((struct hc_driver *)(*pci_ids)->driver_data)->flags &= ~HCD_MEMORY; + ((struct hc_driver *)pci_ids->driver_data)->flags &= ~HCD_MEMORY; } else if (Descriptor->Type == CmResourceTypeMemory) { @@ -126,7 +126,7 @@ DeviceExtension->BaseAddrLength = Descriptor->u.Memory.Length; DeviceExtension->Flags = Descriptor->Flags;
- ((struct hc_driver *)(*pci_ids)->driver_data)->flags |= HCD_MEMORY; + ((struct hc_driver *)pci_ids->driver_data)->flags |= HCD_MEMORY; } } } @@ -135,7 +135,7 @@ /* Print assigned resources */ DPRINT("USBMP: Interrupt Vector 0x%lx, %S base 0x%lx, Length 0x%lx\n", DeviceExtension->InterruptVector, - ((struct hc_driver *)(*pci_ids)->driver_data)->flags & HCD_MEMORY ? L"Memory" : L"I/O", + ((struct hc_driver *)pci_ids->driver_data)->flags & HCD_MEMORY ? L"Memory" : L"I/O", DeviceExtension->BaseAddress, DeviceExtension->BaseAddrLength);
_____
Modified: trunk/reactos/drivers/usb/miniport/common/usbcommon.h --- trunk/reactos/drivers/usb/miniport/common/usbcommon.h 2005-09-10 18:39:34 UTC (rev 17783) +++ trunk/reactos/drivers/usb/miniport/common/usbcommon.h 2005-09-10 18:45:34 UTC (rev 17784) @@ -83,6 +83,6 @@
NTSTATUS InitLinuxWrapper(PDEVICE_OBJECT DeviceObject);
-extern struct pci_device_id** pci_ids; +extern struct pci_device_id* pci_ids;
#endif _____
Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c --- trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c 2005-09-10 18:39:34 UTC (rev 17783) +++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c 2005-09-10 18:45:34 UTC (rev 17784) @@ -8,8 +8,8 @@
#include "uhci.h"
extern struct pci_driver uhci_pci_driver; -extern struct pci_device_id* uhci_pci_ids; -struct pci_device_id** pci_ids = &uhci_pci_ids; +extern struct pci_device_id uhci_pci_ids[]; +struct pci_device_id* pci_ids = &uhci_pci_ids[0];
NTSTATUS InitLinuxWrapper(PDEVICE_OBJECT DeviceObject)