From c4cc81993a324a6416cb92f8c1b78ff501654dbf Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 28 Nov 2007 21:45:06 +0000 Subject: 2007-11-28 Joel Sherrill * mpc5xx/clock/clock.c, mpc5xx/timer/timer.c, mpc8260/clock/clock.c, mpc8260/cpm/brg.c, mpc8260/timer/timer.c, mpc8xx/clock/clock.c, mpc8xx/console-generic/console-generic.c, mpc8xx/timer/timer.c, new-exceptions/raw_exception.c, old-exceptions/cpu.c, ppc403/clock/clock.c, ppc403/console/console.c, ppc403/console/console.c.polled, ppc403/console/console405.c, ppc403/ictrl/ictrl.c, ppc403/irq/ictrl.c, ppc403/timer/timer.c, ppc403/tty_drv/tty_drv.c: Eliminate PowerPC specific elements from the CPU Table. They have been replaced with variables named bsp_XXX as needed. --- c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c') diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c index 10f0483916..0f2c7d88ac 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c +++ b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c @@ -18,6 +18,11 @@ #include "../ictrl/ictrl.h" #include /* for atexit() */ +extern uint32_t bsp_serial_per_sec; +extern boolean bsp_serial_external_clock; +extern boolean bsp_serial_cts_rts; +extern boolean bsp_serial_xon_xoff; +extern uint32_t bsp_serial_rate; struct ttyasync { /*---------------------------------------------------------------------------+ @@ -154,7 +159,7 @@ tty0BaudSet(uint32_t baudrate) { uint32_t tmp; - tmp = tty0_round( (double)rtems_cpu_configuration_get_serial_per_sec() / (baudrate * 16) ); + tmp = tty0_round( (double)bsp_serial_per_sec / (baudrate * 16) ); tty0port->LCR = tty0port->LCR | LCR_DL; @@ -327,7 +332,7 @@ tty0DeInit(void) */ /* set up baud rate to original state */ - tty0BaudSet(rtems_cpu_configuration_get_serial_rate()); + tty0BaudSet(bsp_serial_rate); tty0port->IER = 0; @@ -345,6 +350,8 @@ tty0Initialize(void) rtems_isr_entry previous_isr; /* this is a dummy */ unsigned char _ier; unsigned char _tmp; + extern uint32_t bsp_serial_rate; + extern boolean bsp_serial_external_clock; /* * Initialise the serial tty0port @@ -357,9 +364,9 @@ tty0Initialize(void) asm volatile ("mfdcr %0, 0x0b1" : "=r" (tmp)); /* CPC_CR0 0x0b1 */ /* UART0 bit 24 0x80, UART1 bit 25 0x40 */ - tmp |= (rtems_cpu_configuration_get_serial_external_clock() ? (TTY0_USE_UART ? 0x40 : 0x80) : 0); + tmp |= (bsp_serial_external_clock ? (TTY0_USE_UART ? 0x40 : 0x80) : 0); - tmp |= (rtems_cpu_configuration_get_serial_external_clock() ? 0: ((TTY0_UART_INTERNAL_CLOCK_DIVISOR -1) << 1)); + tmp |= (bsp_serial_external_clock ? 0: ((TTY0_UART_INTERNAL_CLOCK_DIVISOR -1) << 1)); asm volatile ("mtdcr 0x0b1, %0" : "=r" (tmp) : "0" (tmp)); /* CPC_CR0 0x0b1*/ @@ -371,7 +378,7 @@ tty0Initialize(void) tty0port->LCR = LCR_WL8 | LCR_SB1 | LCR_PN; /* set up baud rate */ - tty0BaudSet(rtems_cpu_configuration_get_serial_rate()); + tty0BaudSet(bsp_serial_rate); #ifdef TTY0_USE_INTERRUPT -- cgit v1.2.3