So we can easily use them in tests.
Signed-off-by: Gerd Hoffmann kra...@redhat.com
---
hw/usb/hcd-uhci.c | 36 +---
include/hw/usb/uhci-regs.h | 39 +++
2 files changed, 40 insertions(+), 35 deletions(-)
create mode 100644 include/hw/usb/uhci-regs.h
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 9b1166b..c3bf72c 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -27,6 +27,7 @@
*/
#include hw/hw.h
#include hw/usb.h
+#include hw/usb/uhci-regs.h
#include hw/pci/pci.h
#include qemu/timer.h
#include qemu/iov.h
@@ -37,41 +38,6 @@
//#define DEBUG
//#define DEBUG_DUMP_DATA
-#define UHCI_CMD_FGR (1 4)
-#define UHCI_CMD_EGSM (1 3)
-#define UHCI_CMD_GRESET (1 2)
-#define UHCI_CMD_HCRESET (1 1)
-#define UHCI_CMD_RS (1 0)
-
-#define UHCI_STS_HCHALTED (1 5)
-#define UHCI_STS_HCPERR (1 4)
-#define UHCI_STS_HSERR(1 3)
-#define UHCI_STS_RD (1 2)
-#define UHCI_STS_USBERR (1 1)
-#define UHCI_STS_USBINT (1 0)
-
-#define TD_CTRL_SPD (1 29)
-#define TD_CTRL_ERROR_SHIFT 27
-#define TD_CTRL_IOS (1 25)
-#define TD_CTRL_IOC (1 24)
-#define TD_CTRL_ACTIVE (1 23)
-#define TD_CTRL_STALL (1 22)
-#define TD_CTRL_BABBLE (1 20)
-#define TD_CTRL_NAK (1 19)
-#define TD_CTRL_TIMEOUT (1 18)
-
-#define UHCI_PORT_SUSPEND (1 12)
-#define UHCI_PORT_RESET (1 9)
-#define UHCI_PORT_LSDA (1 8)
-#define UHCI_PORT_RD(1 6)
-#define UHCI_PORT_ENC (1 3)
-#define UHCI_PORT_EN(1 2)
-#define UHCI_PORT_CSC (1 1)
-#define UHCI_PORT_CCS (1 0)
-
-#define UHCI_PORT_READ_ONLY(0x1bb)
-#define UHCI_PORT_WRITE_CLEAR (UHCI_PORT_CSC | UHCI_PORT_ENC)
-
#define FRAME_TIMER_FREQ 1000
#define FRAME_MAX_LOOPS 256
diff --git a/include/hw/usb/uhci-regs.h b/include/hw/usb/uhci-regs.h
new file mode 100644
index 000..63c8223
--- /dev/null
+++ b/include/hw/usb/uhci-regs.h
@@ -0,0 +1,39 @@
+#ifndef HW_USB_UHCI_REGS_H
+#define HW_USB_UHCI_REGS_H 1
+
+#define UHCI_CMD_FGR (1 4)
+#define UHCI_CMD_EGSM (1 3)
+#define UHCI_CMD_GRESET (1 2)
+#define UHCI_CMD_HCRESET (1 1)
+#define UHCI_CMD_RS (1 0)
+
+#define UHCI_STS_HCHALTED (1 5)
+#define UHCI_STS_HCPERR (1 4)
+#define UHCI_STS_HSERR(1 3)
+#define UHCI_STS_RD (1 2)
+#define UHCI_STS_USBERR (1 1)
+#define UHCI_STS_USBINT (1 0)
+
+#define TD_CTRL_SPD (1 29)
+#define TD_CTRL_ERROR_SHIFT 27
+#define TD_CTRL_IOS (1 25)
+#define TD_CTRL_IOC (1 24)
+#define TD_CTRL_ACTIVE (1 23)
+#define TD_CTRL_STALL (1 22)
+#define TD_CTRL_BABBLE (1 20)
+#define TD_CTRL_NAK (1 19)
+#define TD_CTRL_TIMEOUT (1 18)
+
+#define UHCI_PORT_SUSPEND (1 12)
+#define UHCI_PORT_RESET (1 9)
+#define UHCI_PORT_LSDA (1 8)
+#define UHCI_PORT_RD(1 6)
+#define UHCI_PORT_ENC (1 3)
+#define UHCI_PORT_EN(1 2)
+#define UHCI_PORT_CSC (1 1)
+#define UHCI_PORT_CCS (1 0)
+
+#define UHCI_PORT_READ_ONLY(0x1bb)
+#define UHCI_PORT_WRITE_CLEAR (UHCI_PORT_CSC | UHCI_PORT_ENC)
+
+#endif /* HW_USB_UHCI_REGS_H */
--
1.8.3.1
