summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Staaf <robotboy@chromium.org>2014-11-05 14:44:15 -0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-11-10 19:11:50 +0000
commite35494e4acaaf0d33d237fbfcedfc9ecbb87fd13 (patch)
tree3edf73d153353e25cc8a36d688589bf0a167619b
parent085cd334b62959c9d62f3ee46903ae02c20a10bb (diff)
downloadchrome-ec-e35494e4acaaf0d33d237fbfcedfc9ecbb87fd13.tar.gz
USB: Fix definitions for usb_uint
I managed to mess this up previously, the STM32L and STM32F should use uint32_t and so should the STM32F3 it turns out. Only the STM32F0 uses uint16_t right now. Signed-off-by: Anton Staaf <robotboy@chromium.org> BRANCH=None BUG=None TEST=make buildall -j Change-Id: Ieca4368c4280a0f25c928b6670aeccbaf8eabbef Reviewed-on: https://chromium-review.googlesource.com/227740 Tested-by: Anton Staaf <robotboy@chromium.org> Reviewed-by: Vincent Palatin <vpalatin@google.com> Commit-Queue: Anton Staaf <robotboy@chromium.org>
-rw-r--r--include/usb.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/usb.h b/include/usb.h
index 0b108b19fc..d554396ea4 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -226,10 +226,12 @@ struct usb_endpoint_descriptor {
/* Helpers for managing the USB controller dedicated RAM */
/* primitive to access the words in USB RAM */
-#if defined(CHIP_FAMILY_STM32F0) || defined(CHIP_FAMILY_STM32F3)
-typedef uint16_t usb_uint;
-#elif defined(CHIP_FAMILY_STM32F) || defined(CHIP_FAMILY_STM32L)
+#if defined(CHIP_FAMILY_STM32F0)
typedef uint16_t usb_uint;
+#elif (defined(CHIP_FAMILY_STM32F) || \
+ defined(CHIP_FAMILY_STM32L) || \
+ defined(CHIP_FAMILY_STM32F3))
+typedef uint32_t usb_uint;
#elif defined(CHIP_HOST)
typedef unsigned int usb_uint;
#else