diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-04-13 08:57:07 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-04-13 08:57:07 +0200 |
commit | 52cf1358969bf505f14799dc2203c8a35e5e2f46 (patch) | |
tree | 80c76646367f03e5d66962048636c82becd97b92 /c/src/lib/libbsp/arm/stm32f4/console/console-config.c | |
parent | Filesystem: Add select() support for pipes (diff) | |
parent | bsp/stm32f4: Add IO and RCC (diff) | |
download | rtems-52cf1358969bf505f14799dc2203c8a35e5e2f46.tar.bz2 |
Merge branch 'upstream'
Diffstat (limited to 'c/src/lib/libbsp/arm/stm32f4/console/console-config.c')
-rw-r--r-- | c/src/lib/libbsp/arm/stm32f4/console/console-config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/arm/stm32f4/console/console-config.c b/c/src/lib/libbsp/arm/stm32f4/console/console-config.c index fabda7cfd4..cd68032381 100644 --- a/c/src/lib/libbsp/arm/stm32f4/console/console-config.c +++ b/c/src/lib/libbsp/arm/stm32f4/console/console-config.c @@ -27,7 +27,7 @@ console_tbl Console_Configuration_Ports [] = { .sDeviceName = "/dev/ttyS0", .deviceType = SERIAL_CUSTOM, .pDeviceFns = &stm32f4_usart_fns, - .ulCtrlPort1 = (uint32_t) &STM32F4_USART_1, + .ulCtrlPort1 = (uint32_t) STM32F4_USART_1, .ulCtrlPort2 = 0, .ulClock = STM32F4_USART_BAUD, .ulIntVector = STM32F4_IRQ_USART1 @@ -38,7 +38,7 @@ console_tbl Console_Configuration_Ports [] = { .sDeviceName = "/dev/ttyS2", .deviceType = SERIAL_CUSTOM, .pDeviceFns = &stm32f4_usart_fns, - .ulCtrlPort1 = (uint32_t) &STM32F4_USART_2, + .ulCtrlPort1 = (uint32_t) STM32F4_USART_2, .ulCtrlPort2 = 1, .ulClock = STM32F4_USART_BAUD, .ulIntVector = STM32F4_IRQ_USART2 @@ -49,7 +49,7 @@ console_tbl Console_Configuration_Ports [] = { .sDeviceName = "/dev/ttyS2", .deviceType = SERIAL_CUSTOM, .pDeviceFns = &stm32f4_usart_fns, - .ulCtrlPort1 = (uint32_t) &STM32F4_USART_3, + .ulCtrlPort1 = (uint32_t) STM32F4_USART_3, .ulCtrlPort2 = 2, .ulClock = STM32F4_USART_BAUD, .ulIntVector = STM32F4_IRQ_USART3 @@ -60,7 +60,7 @@ console_tbl Console_Configuration_Ports [] = { .sDeviceName = "/dev/ttyS3", .deviceType = SERIAL_CUSTOM, .pDeviceFns = &stm32f4_usart_fns, - .ulCtrlPort1 = (uint32_t) &STM32F4_USART_4, + .ulCtrlPort1 = (uint32_t) STM32F4_USART_4, .ulCtrlPort2 = 3, .ulClock = STM32F4_USART_BAUD, .ulIntVector = STM32F4_IRQ_UART4 @@ -71,7 +71,7 @@ console_tbl Console_Configuration_Ports [] = { .sDeviceName = "/dev/ttyS4", .deviceType = SERIAL_CUSTOM, .pDeviceFns = &stm32f4_usart_fns, - .ulCtrlPort1 = (uint32_t) &STM32F4_USART_5, + .ulCtrlPort1 = (uint32_t) STM32F4_USART_5, .ulCtrlPort2 = 4, .ulClock = STM32F4_USART_BAUD, .ulIntVector = STM32F4_IRQ_UART5 @@ -82,7 +82,7 @@ console_tbl Console_Configuration_Ports [] = { .sDeviceName = "/dev/ttyS5", .deviceType = SERIAL_CUSTOM, .pDeviceFns = &stm32f4_usart_fns, - .ulCtrlPort1 = (uint32_t) &STM32F4_USART_6, + .ulCtrlPort1 = (uint32_t) STM32F4_USART_6, .ulCtrlPort2 = 5, .ulClock = STM32F4_USART_BAUD, .ulIntVector = STM32F4_IRQ_USART6 |