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

2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>

Browse Source 
PR 1917/bsps
	* Makefile.am, console/uarts.c: Modifications to add dynamic tables for
	libchip serial drivers.
This commit is contained in:
Jennifer Averett
2011-10-18 18:26:55 +00:00
parent bdd3b6375b
commit 93b8c70a47
6 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/arm/csb337/ChangeLog
View File

@@ -1,3 +1,9 @@
2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>
PR 1917/bsps
* Makefile.am, console/uarts.c: Modifications to add dynamic tables for
libchip serial drivers.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

4
c/src/lib/libbsp/arm/csb337/Makefile.am
View File

@@ -61,7 +61,9 @@ libbsp_a_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
../../shared/gnatinstallhandler.c
# console
libbsp_a_SOURCES += ../../shared/console.c console/uarts.c
libbsp_a_SOURCES += ../../shared/console.c console/uarts.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
# IRQ
include_bsp_HEADERS += ../../shared/include/irq-generic.h \
../../shared/include/irq-info.h

11
c/src/lib/libbsp/arm/csb337/console/uarts.c
View File

@@ -18,7 +18,7 @@
* Joel Sherrill, 2009.
*
* $Id$
*/
*/
#include <bsp.h>
#include <rtems/libio.h>
@@ -31,8 +31,6 @@
#include <libchip/sersupp.h>
#include <bspopts.h>
/* rtems console uses the following minor number */
rtems_device_minor_number Console_Port_Minor = 0;
extern console_fns dbgu_fns;
#if ENABLE_LCD
@@ -82,8 +80,7 @@ extern console_fns dbgu_fns;
USART0_DEV + USART1_DEV + USART2_DEV + USART3_DEV)
/* These are used by code in console.c */
unsigned long Console_Port_Count = NUM_DEVS;
console_data Console_Port_Data[NUM_DEVS];
unsigned long Console_Configuration_Count = NUM_DEVS;
/*
* There's one item in array for each UART.
@@ -94,7 +91,7 @@ console_data Console_Port_Data[NUM_DEVS];
* when we add other types of UARTS we will need to move this
* structure to a generic uart.c file with only this in it
*/
console_tbl Console_Port_Tbl[] = {
console_tbl Console_Configuration_Ports[] = {
{
"/dev/console", /* sDeviceName */
SERIAL_CUSTOM, /* deviceType */
@@ -244,5 +241,5 @@ console_tbl Console_Port_Tbl[] = {
console_tbl *BSP_get_uart_from_minor(int minor)
{
return &Console_Port_Tbl[minor];
return Console_Port_Tbl[minor];
}

6
c/src/lib/libbsp/arm/gumstix/ChangeLog
View File

@@ -1,3 +1,9 @@
2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com>
PR 1917/bsps
* Makefile.am, console/uarts.c: Modifications to add dynamic tables for
libchip serial drivers.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.

4
c/src/lib/libbsp/arm/gumstix/Makefile.am
View File

@@ -39,7 +39,9 @@ libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
../../shared/bspclean.c startup/bspstart.c startup/memmap.c
#console
libbsp_a_SOURCES += console/uarts.c ../../shared/console.c
libbsp_a_SOURCES += console/uarts.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
../../shared/console_read.c ../../shared/console_write.c
# IRQ
include_bsp_HEADERS += ../../shared/include/irq-generic.h \
../../shared/include/irq-info.h

9
c/src/lib/libbsp/arm/gumstix/console/uarts.c
View File

@@ -27,11 +27,8 @@
#define NUM_DEVS 1
/* These are used by code in console.c */
unsigned long Console_Port_Count = NUM_DEVS;
console_data Console_Port_Data[NUM_DEVS];
unsigned long Console_Configuration_Count = NUM_DEVS;
/* rtems console uses the following minor number */
rtems_device_minor_number Console_Port_Minor = 0;
extern console_fns ffuart_fns;
/*
@@ -43,7 +40,7 @@ extern console_fns ffuart_fns;
* when we add other types of UARTS we will need to move this
* structure to a generic uart.c file with only this in it
*/
console_tbl Console_Port_Tbl[] = {
console_tbl Console_Configuration_Ports[] = {
{
"/dev/console", /* sDeviceName */
SERIAL_CUSTOM, /* deviceType */
@@ -67,5 +64,5 @@ console_tbl Console_Port_Tbl[] = {
console_tbl *BSP_get_uart_from_minor(int minor)
{
return &Console_Port_Tbl[minor];
return Console_Port_Tbl[minor];
}