diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-28 21:45:06 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-28 21:45:06 +0000 |
| commit | c4cc81993a324a6416cb92f8c1b78ff501654dbf (patch) | |
| tree | 190fbb3656e871c93f4d4fd5c8ff11a81262c0c5 /c/src/lib/libcpu/powerpc/ppc403/console/console.c | |
| parent | 2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-c4cc81993a324a6416cb92f8c1b78ff501654dbf.tar.bz2 | |
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* 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.
Diffstat (limited to 'c/src/lib/libcpu/powerpc/ppc403/console/console.c')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ppc403/console/console.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console.c b/c/src/lib/libcpu/powerpc/ppc403/console/console.c index 2051a0f764..f94f390ee5 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/console.c +++ b/c/src/lib/libcpu/powerpc/ppc403/console/console.c @@ -209,7 +209,8 @@ void spiBaudSet(uint32_t baudrate) { uint32_t tmp; - tmp = rtems_cpu_configuration_get_serial_per_sec() / baudrate; + extern uint32_t bsp_serial_per_sec; + tmp = bsp_serial_per_sec / baudrate; tmp = ((tmp) >> 4) - 1; port->BRDL = tmp & 0xff; port->BRDH = tmp >> 8; @@ -302,13 +303,14 @@ spiPollWrite(int minor,const char *buf,int len) void spiDeInit(void) { + extern uint32_t bsp_serial_rate; /* * disable interrupts for serial port * set it to state to work with polling boot monitor, if any... */ /* set up baud rate to original state */ - spiBaudSet(rtems_cpu_configuration_get_serial_rate()); + spiBaudSet(bsp_serial_rate); /* clear any receive (error) status */ port->SPLS = (LSRDataReady | LSRFramingError | LSROverrunError | @@ -338,6 +340,8 @@ spiInitialize(void) { register unsigned tmp; rtems_isr_entry previous_isr; /* this is a dummy */ + extern boolean bsp_serial_external_clock; + extern uint32_t bsp_serial_rate; /* * Initialise the serial port @@ -350,7 +354,7 @@ spiInitialize(void) asm volatile ("mfdcr %0, 0xa0" : "=r" (tmp)); /* IOCR */ tmp &= ~3; - tmp |= (rtems_cpu_configuration_get_serial_external_clock() ? 2 : 0) | 1; + tmp |= (bsp_serial_external_clock ? 2 : 0) | 1; asm volatile ("mtdcr 0xa0, %0" : "=r" (tmp) : "0" (tmp)); /* IOCR */ @@ -359,7 +363,7 @@ spiInitialize(void) LSRParityError | LSRBreakInterrupt); /* set up baud rate */ - spiBaudSet(rtems_cpu_configuration_get_serial_rate()); + spiBaudSet(bsp_serial_rate); /* set up port control: DTR/RTS active,8 bit,1 stop,no parity */ port->SPCTL = (CRNormal | |