aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-12-16 11:20:23 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-12-16 11:20:23 +0000
commitd2e8ef6bfeb65e57b8fcb589871f5421f5ac36bd (patch)
tree3ef4ad10212a5bce95717561aacc94b43791db17 /os/hal
parentebab92ee4fd1d1fd55dba260006bccef165d4c31 (diff)
downloadChibiOS-d2e8ef6bfeb65e57b8fcb589871f5421f5ac36bd.tar.gz
ChibiOS-d2e8ef6bfeb65e57b8fcb589871f5421f5ac36bd.tar.bz2
ChibiOS-d2e8ef6bfeb65e57b8fcb589871f5421f5ac36bd.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8609 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
-rw-r--r--os/hal/boards/ST_STM3210E_EVAL/board.h10
-rw-r--r--os/hal/ports/STM32/STM32F1xx/stm32_registry.h2
2 files changed, 12 insertions, 0 deletions
diff --git a/os/hal/boards/ST_STM3210E_EVAL/board.h b/os/hal/boards/ST_STM3210E_EVAL/board.h
index 979742b90..43501dd48 100644
--- a/os/hal/boards/ST_STM3210E_EVAL/board.h
+++ b/os/hal/boards/ST_STM3210E_EVAL/board.h
@@ -238,6 +238,16 @@
PIN_INPUT(15)) /* Joy Up. */
#define VAL_GPIOGODR 0xFFFFF7FF
+/*
+ * USB bus activation macro, required by the USB driver.
+ */
+#define usb_lld_connect_bus(usbp) palClearPad(GPIOB, GPIOB_USB_DISC)
+
+/*
+ * USB bus de-activation macro, required by the USB driver.
+ */
+#define usb_lld_disconnect_bus(usbp) palSetPad(GPIOB, GPIOB_USB_DISC)
+
#if !defined(_FROM_ASM_)
#ifdef __cplusplus
extern "C" {
diff --git a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
index cc52dc7e0..2597a8468 100644
--- a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
@@ -725,6 +725,7 @@
/* SDIO attributes.*/
#define STM32_HAS_SDIO TRUE
+#define STM32_SDC_SDIO_DMA_STREAM STM32_DMA_STREAM_ID(2, 4)
/* SPI attributes.*/
#define STM32_HAS_SPI1 TRUE
@@ -967,6 +968,7 @@
/* SDIO attributes.*/
#define STM32_HAS_SDIO TRUE
+#define STM32_SDC_SDIO_DMA_STREAM STM32_DMA_STREAM_ID(2, 4)
/* SPI attributes.*/
#define STM32_HAS_SPI1 TRUE