diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-02-13 05:38:58 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-02-20 20:34:21 +0300 |
| commit | fe693e32c8136bba792a355617d2b0f5d1914721 (patch) | |
| tree | 15b124d0ac8ceffae69846cea3d1f85a0d55a250 /hw/usb/hcd-uhci.h | |
| parent | 455177ffc457098b0103d2a09cb7ba5e260dfcdd (diff) | |
| download | qemu-fe693e32c8136bba792a355617d2b0f5d1914721.zip qemu-fe693e32c8136bba792a355617d2b0f5d1914721.tar.gz qemu-fe693e32c8136bba792a355617d2b0f5d1914721.tar.bz2 | |
hw/usb/uhci: Rename NB_PORTS -> UHCI_PORTS
Rename NB_PORTS as UHCI_PORTS to avoid definition clash
with EHCI equivalent:
hw/usb/hcd-uhci.h:38:9: error: 'NB_PORTS' macro redefined [-Werror,-Wmacro-redefined]
#define NB_PORTS 2
^
hw/usb/hcd-ehci.h:40:9: note: previous definition is here
#define NB_PORTS 6 /* Max. Number of downstream ports */
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw/usb/hcd-uhci.h')
| -rw-r--r-- | hw/usb/hcd-uhci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/hcd-uhci.h b/hw/usb/hcd-uhci.h index 69f8b40..6d26b94 100644 --- a/hw/usb/hcd-uhci.h +++ b/hw/usb/hcd-uhci.h @@ -35,7 +35,7 @@ typedef struct UHCIQueue UHCIQueue; -#define NB_PORTS 2 +#define UHCI_PORTS 2 typedef struct UHCIPort { USBPort port; @@ -59,7 +59,7 @@ typedef struct UHCIState { uint32_t frame_bytes; uint32_t frame_bandwidth; bool completions_only; - UHCIPort ports[NB_PORTS]; + UHCIPort ports[UHCI_PORTS]; qemu_irq irq; /* Interrupts that should be raised at the end of the current frame. */ uint32_t pending_int_mask; |