diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2015-07-01 10:15:52 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-01 23:23:35 +0000 |
| commit | 662ed790927f3fd3a837a20a0638283a6beb2a7e (patch) | |
| tree | cb9758384cf99e5cad65164dbc08afa597dcea3b | |
| parent | 1f941e867437b03761f3777bb575cad55c21c811 (diff) | |
| download | chrome-ec-662ed790927f3fd3a837a20a0638283a6beb2a7e.tar.gz | |
cr50: cleanup a few strings & messages
Add a description for the USB HID interface, neaten a bit of
console output. No new functionality.
BUG=none
BRANCH=none
TEST=make buildall
Change-Id: Ie85a0192bc4ab9fa87afb4be41d496545a3b548a
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/283051
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | board/cr50/board.c | 1 | ||||
| -rw-r--r-- | board/cr50/board.h | 1 | ||||
| -rw-r--r-- | chip/g/usb.c | 5 | ||||
| -rw-r--r-- | chip/g/usb_hid.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index c02d7f19f6..f64a75b374 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -88,6 +88,7 @@ const void * const usb_strings[] = { [USB_STR_VERSION] = USB_STRING_DESC(CROS_EC_VERSION32), [USB_STR_CONSOLE_NAME] = USB_STRING_DESC("Shell"), [USB_STR_BLOB_NAME] = USB_STRING_DESC("Blob"), + [USB_STR_HID_NAME] = USB_STRING_DESC("PokeyPokey"), }; BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT); #endif diff --git a/board/cr50/board.h b/board/cr50/board.h index de598b5e7f..a42f6a789f 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -53,6 +53,7 @@ enum usb_strings { USB_STR_VERSION, USB_STR_CONSOLE_NAME, USB_STR_BLOB_NAME, + USB_STR_HID_NAME, USB_STR_COUNT }; diff --git a/chip/g/usb.c b/chip/g/usb.c index babfd20eb5..f892d65fdb 100644 --- a/chip/g/usb.c +++ b/chip/g/usb.c @@ -37,6 +37,7 @@ #endif /* Console output macro */ +#define CPRINTS(format, args...) cprints(CC_USB, format, ## args) #define CPRINTF(format, args...) cprintf(CC_USB, format, ## args) #ifdef CONFIG_USB_BOS @@ -249,7 +250,7 @@ static void ep0_tx(void) if (set_addr) { GR_USB_DCFG = (GR_USB_DCFG & ~DCFG_DEVADDR(0x7f)) | DCFG_DEVADDR(set_addr); - CPRINTF("SETAD %02x\n", set_addr); + CPRINTS("SETAD 0x%02x (%d)", set_addr, set_addr); set_addr = 0; } if (desc_ptr) { @@ -445,7 +446,7 @@ void usb_init(void) usb_connect(); #endif - CPRINTF("USB init done\n"); + CPRINTS("USB init done"); } #ifndef CONFIG_USB_INHIBIT_INIT DECLARE_HOOK(HOOK_INIT, usb_init, HOOK_PRIO_DEFAULT); diff --git a/chip/g/usb_hid.c b/chip/g/usb_hid.c index bca7c03a15..5407aa1540 100644 --- a/chip/g/usb_hid.c +++ b/chip/g/usb_hid.c @@ -33,7 +33,7 @@ const struct usb_interface_descriptor USB_IFACE_DESC(USB_IFACE_HID) = .bInterfaceClass = USB_CLASS_HID, .bInterfaceSubClass = USB_HID_SUBCLASS_BOOT, .bInterfaceProtocol = USB_HID_PROTOCOL_KEYBOARD, - .iInterface = 0, + .iInterface = USB_STR_HID_NAME, }; const struct usb_endpoint_descriptor USB_EP_DESC(USB_IFACE_HID, 81) = { |