[USBOHCI_NEW][USBUHCI_NEW] Avoid unnecessary/incorrect status defines.

diff --git a/drivers/usb/usbohci_new/hardware.h b/drivers/usb/usbohci_new/hardware.h
index 43fe27a..f4e5d33 100644 (file)
--- a/drivers/usb/usbohci_new/hardware.h
+++ b/drivers/usb/usbohci_new/hardware.h
@@ -49,8 +49,6 @@
 #define OHCI_TD_CONDITION_BUFFER_UNDERRUN   0x0D
 #define OHCI_TD_CONDITION_NOT_ACCESSED      0x0E
 
 #define OHCI_TD_CONDITION_BUFFER_UNDERRUN   0x0D
 #define OHCI_TD_CONDITION_NOT_ACCESSED      0x0E
 

-#define OHCI_RH_STATUS_GOOD  1
-

 typedef union _OHCI_TRANSFER_CONTROL {
   struct {
     ULONG Reserved       : 18;
 typedef union _OHCI_TRANSFER_CONTROL {
   struct {
     ULONG Reserved       : 18;

diff --git a/drivers/usb/usbohci_new/roothub.c b/drivers/usb/usbohci_new/roothub.c
index bbd4e7e..8322036 100644 (file)
--- a/drivers/usb/usbohci_new/roothub.c
+++ b/drivers/usb/usbohci_new/roothub.c
@@ -97,7 +97,7 @@ OHCI_RH_GetStatus(IN PVOID ohciExtension,
                   IN PUSHORT Status)
 {
     DPRINT("OHCI_RH_GetStatus: \n");
                   IN PUSHORT Status)
 {
     DPRINT("OHCI_RH_GetStatus: \n");

-    *Status = OHCI_RH_STATUS_GOOD;
+    *Status = USB_GETSTATUS_SELF_POWERED;

     return MP_STATUS_SUCCESS;
 }
 
     return MP_STATUS_SUCCESS;
 }
 

diff --git a/drivers/usb/usbuhci_new/roothub.c b/drivers/usb/usbuhci_new/roothub.c
index 9ec3612..6fa0e34 100644 (file)
--- a/drivers/usb/usbuhci_new/roothub.c
+++ b/drivers/usb/usbuhci_new/roothub.c
@@ -34,7 +34,7 @@ UhciRHGetStatus(IN PVOID uhciExtension,
                 IN PUSHORT Status)
 {
     DPRINT("UhciRHGetStatus: ...\n");
                 IN PUSHORT Status)
 {
     DPRINT("UhciRHGetStatus: ...\n");

-    *Status = UHCI_RH_STATUS_SUCCESS;
+    *Status = USB_GETSTATUS_SELF_POWERED;

     return MP_STATUS_SUCCESS;
 }
 
     return MP_STATUS_SUCCESS;
 }
 

diff --git a/drivers/usb/usbuhci_new/usbuhci.h b/drivers/usb/usbuhci_new/usbuhci.h
index f9db2d7..55408f9 100644 (file)
--- a/drivers/usb/usbuhci_new/usbuhci.h
+++ b/drivers/usb/usbuhci_new/usbuhci.h
@@ -13,7 +13,6 @@
 extern USBPORT_REGISTRATION_PACKET RegPacket;
 
 #define UHCI_MAX_HC_SCHEDULE_ERRORS        16
 extern USBPORT_REGISTRATION_PACKET RegPacket;
 
 #define UHCI_MAX_HC_SCHEDULE_ERRORS        16

-#define UHCI_RH_STATUS_SUCCESS             1

 
 #define UHCI_MAX_ISO_TRANSFER_SIZE         0x10000
 #define UHCI_MAX_BULK_TRANSFER_SIZE        0x1000
 
 #define UHCI_MAX_ISO_TRANSFER_SIZE         0x10000
 #define UHCI_MAX_BULK_TRANSFER_SIZE        0x1000