diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-15 07:45:03 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-15 07:45:03 +0000 |
commit | e7c1313af865a8f73cc5ad0bcfe0268a2cc8f8ac (patch) | |
tree | aae55266cc247a8ca932b6944ae1dd449a5562c3 /c | |
parent | 2005-02-15 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-e7c1313af865a8f73cc5ad0bcfe0268a2cc8f8ac.tar.bz2 |
2005-02-15 Ralf Corsepius <ralf.corsepius@rtems.org>
* ppc403/console/console405.c: Rename round to spiBaudRound
(Conflict with C99). Make spiBaudRound static.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libcpu/powerpc/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/ppc403/console/console405.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index e3a9f0ac12..7ee7423ef1 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,5 +1,10 @@ 2005-02-15 Ralf Corsepius <ralf.corsepius@rtems.org> + * ppc403/console/console405.c: Rename round to spiBaudRound + (Conflict with C99). Make spiBaudRound static. + +2005-02-15 Ralf Corsepius <ralf.corsepius@rtems.org> + * mpc8260/mmu/mmu.c: Use _CPU_MSR_GET instead of _CPU_MSR_Value. (Unify old/new-exception processing API). diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console405.c b/c/src/lib/libcpu/powerpc/ppc403/console/console405.c index fe58538b19..2f76809eb5 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/console405.c +++ b/c/src/lib/libcpu/powerpc/ppc403/console/console405.c @@ -185,7 +185,7 @@ static void *spittyp; /* handle for termios */ int ppc403_spi_interrupt = 0; /* do not use interrupts... */ -int round(double x) +static int spiBaudRound(double x) { return (int)((int)((x-(int)x)*1000)>500 ? x+1 : x); } @@ -195,7 +195,7 @@ spiBaudSet(uint32_t baudrate) { uint32_t tmp; - tmp = round( (double)rtems_cpu_configuration_get_serial_per_sec() / (baudrate * 16) ); + tmp = spiBaudRound( (double)rtems_cpu_configuration_get_serial_per_sec() / (baudrate * 16) ); port->LCR = port->LCR | LCR_DL; |