diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-10-02 16:34:45 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-10-02 16:34:45 +0000 |
commit | 62556f44e90cb83039dc0c8eae49c60a25e05a21 (patch) | |
tree | b78d247b3122cae0933ef7d9e8c9bf48c0b55294 /os/hal/ports/STM32/STM32F3xx | |
parent | 455943c0984deb7f389a28f72ffab58c8b3a5d85 (diff) | |
download | ChibiOS-62556f44e90cb83039dc0c8eae49c60a25e05a21.tar.gz ChibiOS-62556f44e90cb83039dc0c8eae49c60a25e05a21.tar.bz2 ChibiOS-62556f44e90cb83039dc0c8eae49c60a25e05a21.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7351 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32/STM32F3xx')
-rw-r--r-- | os/hal/ports/STM32/STM32F3xx/hal_lld.c | 2 | ||||
-rw-r--r-- | os/hal/ports/STM32/STM32F3xx/stm32_registry.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/os/hal/ports/STM32/STM32F3xx/hal_lld.c b/os/hal/ports/STM32/STM32F3xx/hal_lld.c index cfa538e2e..9c02300dc 100644 --- a/os/hal/ports/STM32/STM32F3xx/hal_lld.c +++ b/os/hal/ports/STM32/STM32F3xx/hal_lld.c @@ -122,8 +122,10 @@ void hal_lld_init(void) { among multiple drivers.*/
rccEnableAPB2(RCC_APB2ENR_SYSCFGEN, TRUE);
+#if STM32_HAS_USB
/* USB IRQ relocated to not conflict with CAN.*/
SYSCFG->CFGR1 |= SYSCFG_CFGR1_USB_IT_RMP;
+#endif
}
/**
diff --git a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h index 1a576e5dd..1336a6ed8 100644 --- a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h @@ -1287,11 +1287,10 @@ #define STM32_HAS_OTG2 FALSE
#endif /* defined(STM32F358xC) */
-
/*===========================================================================*/
/* STM32F334xC. */
/*===========================================================================*/
-#if defined(STM32F334xC) || defined(__DOXYGEN__)
+#if defined(STM32F334x8) || defined(__DOXYGEN__)
/* ADC attributes.*/
#define STM32_HAS_ADC1 TRUE
#define STM32_HAS_ADC2 TRUE
@@ -1435,7 +1434,7 @@ #define STM32_HAS_USB FALSE
#define STM32_HAS_OTG1 FALSE
#define STM32_HAS_OTG2 FALSE
-#endif /* defined(STM32F334xC) */
+#endif /* defined(STM32F334x8) */
/** @} */
|