From a3a6fae8378cf1ad689d067dfd0af38bcd53ce5a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 21 Aug 2009 17:59:31 +0000 Subject: 2009-08-21 Joel Sherrill * include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS. Should be automatically handled by confdefs.h or the application. --- c/src/lib/libbsp/powerpc/haleakala/ChangeLog | 5 ++ c/src/lib/libbsp/powerpc/haleakala/include/bsp.h | 74 ++++++++++++------------ 2 files changed, 41 insertions(+), 38 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/haleakala') diff --git a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog index 7afa6ee60d..8832456fff 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog +++ b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog @@ -1,3 +1,8 @@ +2009-08-21 Joel Sherrill + + * include/bsp.h: Eliminate BSPs defining NUMBER_OF_TERMIOS_PORTS. + Should be automatically handled by confdefs.h or the application. + 2009-07-16 Joel Sherrill * configure.ac: Rename BSP_BOOTCARD_OPTIONS to diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h b/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h index 784e21c696..558abc55e5 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h @@ -6,7 +6,7 @@ * * derived from helas403/include/bsp.h: * Id: bsp.h,v 1.4 2001/06/18 17:01:48 joel Exp - * Author: Thomas Doerfler + * Author: Thomas Doerfler * IMD Ingenieurbuero fuer Microcomputertechnik * * COPYRIGHT (c) 1998 by IMD @@ -14,7 +14,7 @@ * Changes from IMD are covered by the original distributions terms. * This file has been derived from the papyrus BSP. * - * Author: Andrew Bray + * Author: Andrew Bray * * COPYRIGHT (c) 1995 by i-cubed ltd. * @@ -55,45 +55,43 @@ extern "C" { #ifdef ASM - /* Definition of where to store registers in alignment handler */ - #define ALIGN_REGS 0x0140 -#else - - #include - #include - #include - #include - #include - #include - #include - #include - - /* Network Defines */ - #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0" - - struct rtems_bsdnet_ifconfig; - int rtems_emac_driver_attach(struct rtems_bsdnet_ifconfig* config, int attaching); - #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_emac_driver_attach - - /* Definitions for the shared console/UART driver */ - #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 + /* Definition of where to store registers in alignment handler */ + #define ALIGN_REGS 0x0140 - #define BSP_UART_IOBASE_COM1 0xEF600200 /* PPC405EX */ - #define BSP_UART_IOBASE_COM2 0xEF600300 - - #define BSP_CONSOLE_PORT BSP_UART_COM1 /* console */ - - #define BSP_UART_BAUD_BASE (11059200 / 16) /* Kilauea ext clock, max speed */ - - /* functions */ +#else - rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ - ); - + #include + #include + #include + #include + #include + #include + #include + #include + + /* Network Defines */ + #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0" + + struct rtems_bsdnet_ifconfig; + int rtems_emac_driver_attach(struct rtems_bsdnet_ifconfig* config, int attaching); + #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_emac_driver_attach + + #define BSP_UART_IOBASE_COM1 0xEF600200 /* PPC405EX */ + #define BSP_UART_IOBASE_COM2 0xEF600300 + + #define BSP_CONSOLE_PORT BSP_UART_COM1 /* console */ + + #define BSP_UART_BAUD_BASE (11059200 / 16) /* Kilauea ext clock, max speed */ + + /* functions */ + + rtems_isr_entry set_vector( /* returns old vector */ + rtems_isr_entry handler, /* isr routine */ + rtems_vector_number vector, /* vector number */ + int type /* RTEMS or RAW intr */ + ); + #endif /* ASM */ #ifdef __cplusplus -- cgit v1.2.3