RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2011-11-07 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
PR 1951/bsps
	* Makefile.am, console/console-config.c: Update due to API changes.
This commit is contained in:
Sebastian Huber
2011-11-07 08:26:12 +00:00
parent d791a399bd
commit 47f56094da
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/arm/lm3s69xx/ChangeLog
View File

@@ -1,3 +1,8 @@
2011-11-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1951/bsps
* Makefile.am, console/console-config.c: Update due to API changes.
2011-09-24 Sebastian Huber <sebastian.huber@embedded-brains.de> 2011-09-24 Sebastian Huber <sebastian.huber@embedded-brains.de>
* 0001-Fixed-interrupt-handling-for-ARMv7M.patch, * 0001-Fixed-interrupt-handling-for-ARMv7M.patch,

10
c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
View File

@@ -88,9 +88,13 @@ libbsp_a_SOURCES += ../../shared/src/irq-generic.c \
irq/irq.c irq/irq.c
# Console # Console
libbsp_a_SOURCES += ../../shared/console.c \ libbsp_a_SOURCES += ../../shared/console.c
console/console-config.c \ libbsp_a_SOURCES += ../../shared/console_control.c
console/uart.c libbsp_a_SOURCES += ../../shared/console_read.c
libbsp_a_SOURCES += ../../shared/console_select.c
libbsp_a_SOURCES += ../../shared/console_write.c
libbsp_a_SOURCES += console/console-config.c
libbsp_a_SOURCES += console/uart.c
# Clock # Clock
libbsp_a_SOURCES += clock/clock-config.c \ libbsp_a_SOURCES += clock/clock-config.c \

15
c/src/lib/libbsp/arm/lm3s69xx/console/console-config.c
View File

@@ -23,7 +23,7 @@
#include <bsp/uart.h> #include <bsp/uart.h>
#include <bsp/lm3s69xx.h> #include <bsp/lm3s69xx.h>
console_tbl Console_Port_Tbl [] = { console_tbl Console_Configuration_Ports [] = {
#ifdef LM3S69XX_ENABLE_UART_0 #ifdef LM3S69XX_ENABLE_UART_0
{ {
.sDeviceName = "/dev/ttyS0", .sDeviceName = "/dev/ttyS0",
@@ -56,17 +56,16 @@ console_tbl Console_Port_Tbl [] = {
#endif #endif
}; };
#define PORT_COUNT (sizeof(Console_Port_Tbl) / sizeof(Console_Port_Tbl [0])) #define PORT_COUNT \
(sizeof(Console_Configuration_Ports) \
/ sizeof(Console_Configuration_Ports [0]))
unsigned long Console_Port_Count = PORT_COUNT; unsigned long Console_Configuration_Count = PORT_COUNT;
rtems_device_minor_number Console_Port_Minor;
console_data Console_Port_Data [PORT_COUNT];
static void output_char(char c) static void output_char(char c)
{ {
const console_fns *con = Console_Port_Tbl [Console_Port_Minor].pDeviceFns; const console_fns *con =
Console_Configuration_Ports [Console_Port_Minor].pDeviceFns;
if (c == '\n') { if (c == '\n') {
con->deviceWritePolled((int) Console_Port_Minor, '\r'); con->deviceWritePolled((int) Console_Port_Minor, '\r');