diff options
| author | Gabe Black <gabeblack@google.com> | 2012-11-01 15:44:10 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-11-07 18:38:37 +0100 |
| commit | 93ded5905c36d34c4e4f132623c854bbd895b8c9 (patch) | |
| tree | 242d35c611db91e2351a4e942ff518a66110ca38 /payloads/libpayload/drivers/usb/ehci_rh.c | |
| parent | 8670b9b81aba6bf51510e337d4f7208d2b4ea320 (diff) | |
libpayload: Turn the "debug" #define into the usb_debug static inline function.
The "debug" macro used internally in the libpayload USB subsystem was very
generically named and would leak into consumers of the library that included
usb.h directly or indirectly. This change turns that #define from a macro into
a static inline function to move away from the preprocessor, and also renames
it to usb_debug so it's less likely to collide with something unrelated.
Change-Id: I18717df111aa9671495f8a2a5bdb2c6311fa7acf
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://review.coreboot.org/1738
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'payloads/libpayload/drivers/usb/ehci_rh.c')
| -rw-r--r-- | payloads/libpayload/drivers/usb/ehci_rh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c index 5f92bd7894..f58e1cf36c 100644 --- a/payloads/libpayload/drivers/usb/ehci_rh.c +++ b/payloads/libpayload/drivers/usb/ehci_rh.c @@ -53,7 +53,7 @@ ehci_rh_destroy (usbdev_t *dev) static void ehci_rh_hand_over_port (usbdev_t *dev, int port) { - debug("giving up port %x, it's USB1\n", port+1); + usb_debug("giving up port %x, it's USB1\n", port+1); /* Clear ConnectStatusChange before evaluation */ /* RW/C register, so clear it by writing 1 */ @@ -67,7 +67,7 @@ ehci_rh_hand_over_port (usbdev_t *dev, int port) while (!(RH_INST(dev)->ports[port] & P_CONN_STATUS_CHANGE) && timeout--) mdelay(10); if (!(RH_INST(dev)->ports[port] & P_CONN_STATUS_CHANGE)) { - debug("Warning: Handing port over to companion timed out.\n"); + usb_debug("Warning: Handing port over to companion timed out.\n"); } /* RW/C register, so clear it by writing 1 */ @@ -79,7 +79,7 @@ static void ehci_rh_scanport (usbdev_t *dev, int port) { if (RH_INST(dev)->devices[port]!=-1) { - debug("Unregister device at port %x\n", port+1); + usb_debug("Unregister device at port %x\n", port+1); usb_detach_device(dev->controller, RH_INST(dev)->devices[port]); RH_INST(dev)->devices[port]=-1; } @@ -118,7 +118,7 @@ ehci_rh_scanport (usbdev_t *dev, int port) ehci_rh_hand_over_port(dev, port); return; } - debug("port %x hosts a USB2 device\n", port+1); + usb_debug("port %x hosts a USB2 device\n", port+1); RH_INST(dev)->devices[port] = usb_attach_device(dev->controller, dev->address, port, 2); } /* RW/C register, so clear it by writing 1 */ @@ -157,14 +157,14 @@ ehci_rh_init (usbdev_t *dev) RH_INST(dev)->n_ports = EHCI_INST(dev->controller)->capabilities->hcsparams & HCS_NPORTS_MASK; RH_INST(dev)->ports = EHCI_INST(dev->controller)->operation->portsc; - debug("root hub has %x ports\n", RH_INST(dev)->n_ports); + usb_debug("root hub has %x ports\n", RH_INST(dev)->n_ports); /* If the host controller has port power control, enable power on * all ports and wait 20ms. */ if (EHCI_INST(dev->controller)->capabilities->hcsparams & HCS_PORT_POWER_CONTROL) { - debug("host controller has port power control, " + usb_debug("host controller has port power control, " "giving power to all ports.\n"); for (i=0; i < RH_INST(dev)->n_ports; i++) RH_INST(dev)->ports[i] |= P_PP; |