https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6d6b329bee3ef27ba338…
commit d6d6b329bee3ef27ba3380547e85a1da2a7763ea
Author: Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sun Sep 2 19:39:46 2018 +0200
Commit: Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sat Sep 8 08:45:18 2018 +0200
[USBOHCI_NEW][USBUHCI_NEW] Avoid unnecessary/incorrect status defines.
---
drivers/usb/usbohci_new/hardware.h | 2 --
drivers/usb/usbohci_new/roothub.c | 2 +-
drivers/usb/usbuhci_new/roothub.c | 2 +-
drivers/usb/usbuhci_new/usbuhci.h | 1 -
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/usbohci_new/hardware.h b/drivers/usb/usbohci_new/hardware.h
index 43fe27a199..f4e5d3367c 100644
--- 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_RH_STATUS_GOOD 1
-
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 bbd4e7e5f3..832203627a 100644
--- 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");
- *Status = OHCI_RH_STATUS_GOOD;
+ *Status = USB_GETSTATUS_SELF_POWERED;
return MP_STATUS_SUCCESS;
}
diff --git a/drivers/usb/usbuhci_new/roothub.c b/drivers/usb/usbuhci_new/roothub.c
index 9ec3612a0d..6fa0e34eec 100644
--- 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");
- *Status = UHCI_RH_STATUS_SUCCESS;
+ *Status = USB_GETSTATUS_SELF_POWERED;
return MP_STATUS_SUCCESS;
}
diff --git a/drivers/usb/usbuhci_new/usbuhci.h b/drivers/usb/usbuhci_new/usbuhci.h
index f9db2d7d6a..55408f9bc9 100644
--- 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
-#define UHCI_RH_STATUS_SUCCESS 1
#define UHCI_MAX_ISO_TRANSFER_SIZE 0x10000
#define UHCI_MAX_BULK_TRANSFER_SIZE 0x1000