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

2005-01-04 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* console/config.c: Remove warnings.
This commit is contained in:
Joel Sherrill
2005-01-04 23:29:24 +00:00
parent a4d3eb0dcc
commit fec25de935
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog
View File

@@ -1,3 +1,7 @@
2005-01-04 Joel Sherrill <joel@OARcorp.com>
* console/config.c: Remove warnings.
2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org> 2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am, wrapup/Makefile.am: Remove build-variant support. * Makefile.am, wrapup/Makefile.am: Remove build-variant support.

15
c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c
View File

@@ -281,7 +281,7 @@ static boolean config_PMX1553_probe(int minor)
{ {
uint8_t ucBusNumber, ucSlotNumber, ucChannel; uint8_t ucBusNumber, ucSlotNumber, ucChannel;
uint8_t ucIntLine; uint8_t ucIntLine;
uint32_t ulPortBase, ulMemBase, ulDeviceID; uint32_t ulPortBase, ulMemBase, ulDeviceID, ulTemp;
uint8_t *pucSIO_cir, *pucUart_int_sr, *pucUartDevIntReg; uint8_t *pucSIO_cir, *pucUart_int_sr, *pucUartDevIntReg;
PSP_WRITE_REGISTERS pNS16550Write; PSP_WRITE_REGISTERS pNS16550Write;
@@ -436,23 +436,28 @@ static boolean config_PMX1553_probe(int minor)
* available, 22.1184 MHz will be used allowing rates up to * available, 22.1184 MHz will be used allowing rates up to
* 1382400 baud (RS422 only). * 1382400 baud (RS422 only).
*/ */
ulTemp = (uint32_t)Console_Port_Tbl[minor].pDeviceParams
#if 1 #if 1
/* /*
* Scale requested baud rate for 16 MHz clock * Scale requested baud rate for 16 MHz clock
*/ */
(uint32_t)Console_Port_Tbl[minor].pDeviceParams*=7373; ulTemp *= 7373;
(uint32_t)Console_Port_Tbl[minor].pDeviceParams/=16000; ulTemp /= 16000;
#else #else
/* /*
* Scale requested baud rate for 22.1184 MHz clock * Scale requested baud rate for 22.1184 MHz clock
*/ */
(uint32_t)Console_Port_Tbl[minor].pDeviceParams/=3; ulTemp /= 3;
#endif #endif
/* /*
* In order to maintain maximum data rate accuracy, we will * In order to maintain maximum data rate accuracy, we will
* apply a div 4 here rather than in hardware (using MCR bit 7). * apply a div 4 here rather than in hardware (using MCR bit 7).
*/ */
(uint32_t)Console_Port_Tbl[minor].pDeviceParams/=4; ultemp /= 4;
Console_Port_Tbl[minor].pDeviceParams = (void *)ulTemp;
return(TRUE); return(TRUE);
} }