diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-01-04 23:29:24 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-01-04 23:29:24 +0000 |
| commit | fec25de935f2c46d007be467c810b795b828a53f (patch) | |
| tree | c9bcad36a89c73203af6e16f781d2719d94f916e /c/src/lib/libbsp/powerpc/ppcn_60x | |
| parent | 2005-01-04 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-fec25de935f2c46d007be467c810b795b828a53f.tar.bz2 | |
2005-01-04 Joel Sherrill <joel@OARcorp.com>
* console/config.c: Remove warnings.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/ppcn_60x')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index e82138c9bf..544fb72cf8 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -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> * Makefile.am, wrapup/Makefile.am: Remove build-variant support. diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c index 1aace346a9..e4f31995c3 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c @@ -281,7 +281,7 @@ static boolean config_PMX1553_probe(int minor) { uint8_t ucBusNumber, ucSlotNumber, ucChannel; uint8_t ucIntLine; - uint32_t ulPortBase, ulMemBase, ulDeviceID; + uint32_t ulPortBase, ulMemBase, ulDeviceID, ulTemp; uint8_t *pucSIO_cir, *pucUart_int_sr, *pucUartDevIntReg; 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 * 1382400 baud (RS422 only). */ + + ulTemp = (uint32_t)Console_Port_Tbl[minor].pDeviceParams #if 1 /* * Scale requested baud rate for 16 MHz clock */ - (uint32_t)Console_Port_Tbl[minor].pDeviceParams*=7373; - (uint32_t)Console_Port_Tbl[minor].pDeviceParams/=16000; + ulTemp *= 7373; + ulTemp /= 16000; #else /* * Scale requested baud rate for 22.1184 MHz clock */ - (uint32_t)Console_Port_Tbl[minor].pDeviceParams/=3; + ulTemp /= 3; #endif + /* * In order to maintain maximum data rate accuracy, we will * 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); } |