summaryrefslogtreecommitdiff
path: root/board/discovery-stm32f072
diff options
context:
space:
mode:
authorAnton Staaf <robotboy@chromium.org>2014-10-28 11:27:24 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-29 18:37:53 +0000
commit450b882dee25ed1f5035531f898a9e75748e72c1 (patch)
tree4a8e56997a9f2b9eab39d75ec4b21db66aae5e4e /board/discovery-stm32f072
parent4626fd37dfe05e45593bf717b71d1b99df70d75e (diff)
downloadchrome-ec-450b882dee25ed1f5035531f898a9e75748e72c1.tar.gz
USB-console: Add string names for console interfaces
These names can be used to uniquely identify an interface as being a console forwarded from the AP, or the EC's console or some other console. This makes it possible to connect to the correct console from servo without knowing what board is attached. These strings could also be used by udev rules to create appropriate symlinks. Signed-off-by: Anton Staaf <robotboy@chromium.org> BRANCH=None BUG=None TEST=make buildall -j Change-Id: I1abd36f952782a03606b09485917be8e154534ce Reviewed-on: https://chromium-review.googlesource.com/225950 Tested-by: Anton Staaf <robotboy@chromium.org> Reviewed-by: Vincent Palatin <vpalatin@chromium.org> Commit-Queue: Anton Staaf <robotboy@chromium.org>
Diffstat (limited to 'board/discovery-stm32f072')
-rw-r--r--board/discovery-stm32f072/board.c9
-rw-r--r--board/discovery-stm32f072/board.h1
-rw-r--r--board/discovery-stm32f072/echo.c1
3 files changed, 7 insertions, 4 deletions
diff --git a/board/discovery-stm32f072/board.c b/board/discovery-stm32f072/board.c
index b5637612aa..f6eea229b8 100644
--- a/board/discovery-stm32f072/board.c
+++ b/board/discovery-stm32f072/board.c
@@ -42,10 +42,11 @@ USB_GPIO_CONFIG(usb_gpio,
USB_EP_GPIO)
const void *const usb_strings[] = {
- [USB_STR_DESC] = usb_string_desc,
- [USB_STR_VENDOR] = USB_STRING_DESC("Google Inc."),
- [USB_STR_PRODUCT] = USB_STRING_DESC("discovery-stm32f072"),
- [USB_STR_VERSION] = NULL /* filled at runtime */,
+ [USB_STR_DESC] = usb_string_desc,
+ [USB_STR_VENDOR] = USB_STRING_DESC("Google Inc."),
+ [USB_STR_PRODUCT] = USB_STRING_DESC("discovery-stm32f072"),
+ [USB_STR_VERSION] = NULL /* filled at runtime */,
+ [USB_STR_STREAM_NAME] = USB_STRING_DESC("Echo"),
};
BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT);
diff --git a/board/discovery-stm32f072/board.h b/board/discovery-stm32f072/board.h
index bb3fdee002..531a52e9b9 100644
--- a/board/discovery-stm32f072/board.h
+++ b/board/discovery-stm32f072/board.h
@@ -75,6 +75,7 @@ enum usb_strings {
USB_STR_VENDOR,
USB_STR_PRODUCT,
USB_STR_VERSION,
+ USB_STR_STREAM_NAME,
USB_STR_COUNT
};
diff --git a/board/discovery-stm32f072/echo.c b/board/discovery-stm32f072/echo.c
index 8fa6435458..f8396ba3a6 100644
--- a/board/discovery-stm32f072/echo.c
+++ b/board/discovery-stm32f072/echo.c
@@ -33,6 +33,7 @@ USART_CONFIG(usart3, usart3_hw, 115200, 64, 64, in_ready, NULL)
USART_CONFIG(usart4, usart4_hw, 115200, 64, 64, in_ready, NULL)
USB_STREAM_CONFIG(usb_stream1,
USB_IFACE_STREAM,
+ USB_STR_STREAM_NAME,
USB_EP_STREAM,
256,
256,