From 6aff50784444e5e0531a4031897af6662fbdb201 Mon Sep 17 00:00:00 2001 From: Thomas Doerfler Date: Wed, 18 Jul 2007 12:51:30 +0000 Subject: added PPC_e300 to raw_exception.c removed timed abort in ns16550.c transmit code --- c/src/ChangeLog | 4 ++++ c/src/lib/libcpu/powerpc/ChangeLog | 5 +++++ c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c | 3 +++ c/src/libchip/serial/ns16550.c | 5 ----- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/c/src/ChangeLog b/c/src/ChangeLog index fdc8466b5c..135bcf2261 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,7 @@ +2007-07-18 Thomas Doerfler (Thomas.Doerfler@embedded-brains.de>: + * libchip/serial/ns16550.c: removed timed out wait for transmitter + to become ready: This will not work for fast CPUs. + 2007-07-09 Thomas Doerfler (Thomas.Doerfler@embedded-brains.de>: * libchip/ide/ata.c: fixed warning diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 5b86f506ed..4a3e3d4539 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2007-07-18 Thomas Doerfler + + * new-exceptions/raw_exception.c: + added PPC_e300c1/2/3 to vector validation code + 2007-07-09 Thomas Doerfler * configure.ac, Makefile.am, mpc83xx/include/mpc83xx.h, diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c index d19c4da5f2..7f7ee9c9c3 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c +++ b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c @@ -340,6 +340,9 @@ int ppc_vector_is_valid(rtems_vector vector) case PPC_8260: /* case PPC_8240: -- same value as 8260 */ case PPC_8245: + case PPC_e300c1: + case PPC_e300c2: + case PPC_e300c3: if (!mpc603_vector_is_valid(vector)) { return 0; } diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index b988086b68..829b3ef262 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -194,7 +194,6 @@ NS16550_STATIC void ns16550_write_polled( { uint32_t pNS16550; unsigned char ucLineStatus; - int iTimeout; getRegister_f getReg; setRegister_f setReg; @@ -205,7 +204,6 @@ NS16550_STATIC void ns16550_write_polled( /* * wait for transmitter holding register to be empty */ - iTimeout=10000; ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS); while ((ucLineStatus & SP_LSR_THOLD) == 0) { /* @@ -217,9 +215,6 @@ NS16550_STATIC void ns16550_write_polled( } #endif ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS); - if(!--iTimeout) { - break; - } } /* -- cgit v1.2.3