From e35494e4acaaf0d33d237fbfcedfc9ecbb87fd13 Mon Sep 17 00:00:00 2001 From: Anton Staaf Date: Wed, 5 Nov 2014 14:44:15 -0800 Subject: [PATCH] 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 BRANCH=None BUG=None TEST=make buildall -j Change-Id: Ieca4368c4280a0f25c928b6670aeccbaf8eabbef Reviewed-on: https://chromium-review.googlesource.com/227740 Tested-by: Anton Staaf Reviewed-by: Vincent Palatin Commit-Queue: Anton Staaf --- include/usb.h | 8 +++++--- 1 file 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