summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-02-24 13:26:04 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-02-26 17:06:40 +0000
commit44f558ec262c671d4db76ae25eb1b8e24204d002 (patch)
treef66b2fe59486b6bcdb094822f9b57b4d09537b90 /payloads
parentdfd3f211740be4cf0d234bf4621ac384758a24ce (diff)
treewide: capitalize 'USB'
Change-Id: I7650786ea50465a4c2d11de948fdb81f4e509772 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39100 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/libpayload/drivers/udc/chipidea.c4
-rw-r--r--payloads/libpayload/drivers/udc/chipidea_priv.h2
-rw-r--r--payloads/libpayload/drivers/usb/ehci.c2
-rw-r--r--payloads/libpayload/drivers/usb/usb.c4
-rwxr-xr-xpayloads/libpayload/drivers/usb/usbmsc.c8
-rw-r--r--payloads/libpayload/include/usb/usb.h4
6 files changed, 12 insertions, 12 deletions
diff --git a/payloads/libpayload/drivers/udc/chipidea.c b/payloads/libpayload/drivers/udc/chipidea.c
index 702cd6e4d2..d8d02f22c8 100644
--- a/payloads/libpayload/drivers/udc/chipidea.c
+++ b/payloads/libpayload/drivers/udc/chipidea.c
@@ -81,7 +81,7 @@ static int chipidea_hw_init(struct usbdev_ctrl *this, void *_opreg,
memcpy(&this->device_descriptor, dd, sizeof(*dd));
if (p->qhlist == NULL)
- die("failed to allocate memory for usb device mode");
+ die("failed to allocate memory for USB device mode");
memset(p->qhlist, 0, sizeof(struct qh) * CI_QHELEMENTS);
@@ -102,7 +102,7 @@ static int chipidea_hw_init(struct usbdev_ctrl *this, void *_opreg,
p->qhlist[1].config = QH_MPS(64) | QH_NO_AUTO_ZLT | QH_IOS;
do {
- debug("waiting for usb phy clk valid: %x\n",
+ debug("waiting for USB phy clk valid: %x\n",
readl(&p->opreg->susp_ctrl));
mdelay(1);
} while ((readl(&p->opreg->susp_ctrl) & (1 << 7)) == 0);
diff --git a/payloads/libpayload/drivers/udc/chipidea_priv.h b/payloads/libpayload/drivers/udc/chipidea_priv.h
index ede97ab264..82870c3579 100644
--- a/payloads/libpayload/drivers/udc/chipidea_priv.h
+++ b/payloads/libpayload/drivers/udc/chipidea_priv.h
@@ -47,7 +47,7 @@ struct chipidea_opreg {
uint32_t portsc; // 0x174
uint32_t pad178[15];
uint32_t devlc; // 0x1b4
- /* 25:26: host-desired usb version
+ /* 25:26: host-desired USB version
* 23: force full speed */
uint32_t pad1b8[16];
uint32_t usbmode; // 0x1f8
diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c
index 1cfa8bb6d6..bf8a5eaa81 100644
--- a/payloads/libpayload/drivers/usb/ehci.c
+++ b/payloads/libpayload/drivers/usb/ehci.c
@@ -291,7 +291,7 @@ static int ehci_set_async_schedule(ehci_t *ehcic, int enable)
/* Memory barrier to ensure that all memory accesses before we set the
* async schedule are complete. It was observed especially in the case of
- * arm64, that netboot and usb stuff resulted in lots of errors possibly
+ * arm64, that netboot and USB stuff resulted in lots of errors possibly
* due to CPU reordering. Hence, enforcing strict CPU ordering.
*/
mb();
diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c
index d98fd9e2bc..942e1b1f6b 100644
--- a/payloads/libpayload/drivers/usb/usb.c
+++ b/payloads/libpayload/drivers/usb/usb.c
@@ -634,14 +634,14 @@ set_address (hci_t *controller, usb_speed speed, int hubport, int hubaddr)
/*
* Should be called by the hub drivers whenever a physical detach occurs
- * and can be called by usb class drivers if they are unsatisfied with a
+ * and can be called by USB class drivers if they are unsatisfied with a
* malfunctioning device.
*/
void
usb_detach_device(hci_t *controller, int devno)
{
/* check if device exists, as we may have
- been called yet by the usb class driver */
+ been called yet by the USB class driver */
if (controller->devices[devno]) {
controller->devices[devno]->destroy (controller->devices[devno]);
diff --git a/payloads/libpayload/drivers/usb/usbmsc.c b/payloads/libpayload/drivers/usb/usbmsc.c
index 50fd24b1f8..ed7ad1acd4 100755
--- a/payloads/libpayload/drivers/usb/usbmsc.c
+++ b/payloads/libpayload/drivers/usb/usbmsc.c
@@ -126,7 +126,7 @@ enum {
* MSC commands can be
* successful,
* fail with proper response or
- * fail totally, which results in detaching of the usb device
+ * fail totally, which results in detaching of the USB device
* and immediate cleanup of the usbdev_t structure.
* In the latter case the caller has to make sure, that he won't
* use the device any more.
@@ -703,14 +703,14 @@ usb_msc_poll (usbdev_t *dev)
return;
if (!prev_ready && msc->ready) {
- usb_debug ("usb msc: not ready -> ready (lun %d)\n", msc->lun);
+ usb_debug ("USB msc: not ready -> ready (lun %d)\n", msc->lun);
usb_msc_create_disk (dev);
} else if (prev_ready && !msc->ready) {
- usb_debug ("usb msc: ready -> not ready (lun %d)\n", msc->lun);
+ usb_debug ("USB msc: ready -> not ready (lun %d)\n", msc->lun);
usb_msc_remove_disk (dev);
} else if (!prev_ready && !msc->ready) {
u8 new_lun = (msc->lun + 1) % msc->num_luns;
- usb_debug("usb msc: not ready (lun %d) -> lun %d\n", msc->lun,
+ usb_debug("USB msc: not ready (lun %d) -> lun %d\n", msc->lun,
new_lun);
msc->lun = new_lun;
}
diff --git a/payloads/libpayload/include/usb/usb.h b/payloads/libpayload/include/usb/usb.h
index 8505c4f60b..5d27f7cbc6 100644
--- a/payloads/libpayload/include/usb/usb.h
+++ b/payloads/libpayload/include/usb/usb.h
@@ -217,7 +217,7 @@ struct usbdev {
hci_t *controller;
endpoint_t endpoints[32];
int num_endp;
- int address; // usb address
+ int address; // USB address
int hub; // hub, device is attached to
int port; // port where device is attached
usb_speed speed;
@@ -263,7 +263,7 @@ struct usbdev_hc {
u8* (*poll_intr_queue) (void *queue);
void *instance;
- /* set_address(): Tell the usb device its address (xHCI
+ /* set_address(): Tell the USB device its address (xHCI
controllers want to do this by
themselves). Also, allocate the usbdev
structure, initialize enpoint 0