From 8c4970175dc855549ddd43d410c0adb1a8efc00f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 18 Oct 2000 15:46:07 +0000 Subject: 2000-10-18 Joel Sherrill * mpc8xx/console-generic/console-generic.c: Removed include of by adding BSP dependent routine mbx8xx_console_use_maximum_buffer_size() which can be hard coded or check non-volatile memory for configuration. --- c/src/lib/libcpu/powerpc/ChangeLog | 7 +++++++ .../powerpc/mpc8xx/console-generic/console-generic.c | 14 ++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'c') diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 7f64334b8d..3129b1d063 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,10 @@ +2000-10-18 Joel Sherrill + + * mpc8xx/console-generic/console-generic.c: Removed include of + by adding BSP dependent routine + mbx8xx_console_use_maximum_buffer_size() which can be hard coded + or check non-volatile memory for configuration. + 2000-10-18 Joel Sherrill * mpc8xx/console-generic/console-generic.c: Removed warnings. diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c index 1eaacb91c4..fccbc65b31 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c @@ -53,10 +53,12 @@ #include #include #include -#include /* for nvram interface to board */ extern rtems_cpu_table Cpu_table; +/* BSP supplied routine */ +extern int mbx8xx_console_use_maximum_buffer_size(void); + #ifdef EPPCBUG_SMC1 extern unsigned32 simask_copy; #endif @@ -703,18 +705,10 @@ m8xx_uart_scc_initialize (int minor) sccparms->rfcr = M8xx_RFCR_MOT | M8xx_RFCR_DMA_SPACE(0); sccparms->tfcr = M8xx_TFCR_MOT | M8xx_TFCR_DMA_SPACE(0); -#if NVRAM_CONFIGURE == 1 - if ( (nvram->console_mode & 0x06) == 0x02 ) + if ( mbx8xx_console_use_maximum_buffer_size() ) sccparms->mrblr = RXBUFSIZE; /* Maximum Rx buffer size */ else sccparms->mrblr = 1; /* Maximum Rx buffer size */ -#else -#if UARTS_IO_MODE == 1 - sccparms->mrblr = RXBUFSIZE; /* Maximum Rx buffer size */ -#else - sccparms->mrblr = 1; /* Maximum Rx buffer size */ -#endif -#endif sccparms->un.uart.max_idl = 10; /* Set nb of idle chars to close buffer */ sccparms->un.uart.brkcr = 0; /* Set nb of breaks to send for STOP Tx */ -- cgit v1.2.3