[Qemu-devel] [0/3] usb: use defines instead of magic numbers for USB serial bus release number

[Qemu-devel] [0/3] usb: use defines instead of magic numbers for USB serial bus release number

[Brad Hards]

There is some commonality between the UHCI and EHCI (and xHCI, future) drivers. So
we can make nice defines instead of magic numbers.
 usb-ehci.c |    2 +-
 usb-uhci.c |    2 +-
 usb.h      |    6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

[Qemu-devel] [PATCH 1/3] usb: Add defines for USB Serial Bus Release Number register

[Brad Hards]

Signed-off-by: Brad Hards <bradh@frogmouth.net>
---
 hw/usb.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/hw/usb.h b/hw/usb.h
index 9882400..2c051b3 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -26,6 +26,12 @@
 #include "qdev.h"
 #include "qemu-queue.h"
 
+/* Constants related to the USB / PCI interaction */
+#define USB_SBRN    0x60 /* Serial Bus Release Number Register */
+#define USB_RELEASE_1  0x10 /* USB 1.0 */
+#define USB_RELEASE_2  0x20 /* USB 2.0 */
+#define USB_RELEASE_3  0x30 /* USB 3.0 */
+
 #define USB_TOKEN_SETUP 0x2d
 #define USB_TOKEN_IN    0x69 /* device -> host */
 #define USB_TOKEN_OUT   0xe1 /* host -> device */
-- 
1.7.4.1

[Qemu-devel] [PATCH 2/3] usb: Use defines for serial bus release number register for UHCI

[Brad Hards]

Signed-off-by: Brad Hards <bradh@frogmouth.net>
---
 hw/usb-uhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index c0de05b..d9c86ad 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -1098,7 +1098,7 @@ static int usb_uhci_common_initfn(UHCIState *s)
     pci_config_set_class(pci_conf, PCI_CLASS_SERIAL_USB);
     /* TODO: reset value should be 0. */
     pci_conf[PCI_INTERRUPT_PIN] = 4; // interrupt pin 3
-    pci_conf[0x60] = 0x10; // release number
+    pci_conf[USB_SBRN] = USB_RELEASE_1; // release number
 
     usb_bus_new(&s->bus, &s->dev.qdev);
     for(i = 0; i < NB_PORTS; i++) {
-- 
1.7.4.1

[Qemu-devel] [PATCH 3/3] usb: Use defines for serial bus release number register for EHCI

[Brad Hards]

Signed-off-by: Brad Hards <bradh@frogmouth.net>
---
 hw/usb-ehci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index f63519e..81b9d0b 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -1970,7 +1970,7 @@ static int usb_ehci_initfn(PCIDevice *dev)
 
     // pci_conf[0x50] = 0x01; // power management caps
 
-    pci_set_byte(&pci_conf[0x60], 0x20);  // spec release number (2.1.4)
+    pci_set_byte(&pci_conf[USB_SBRN], USB_RELEASE_2); // release number (2.1.4)
     pci_set_byte(&pci_conf[0x61], 0x20);  // frame length adjustment (2.1.5)
     pci_set_word(&pci_conf[0x62], 0x00);  // port wake up capability (2.1.6)
 
-- 
1.7.4.1