From 6600424de454f5af2d60294c0ed91c7228031828 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 11 Mar 2003 11:00:20 +0000 Subject: Merger from rtems-4-6-branch. --- c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme162/tools/configure.ac | 1 - c/src/lib/libbsp/powerpc/dmv177/ChangeLog | 4 + c/src/lib/libbsp/powerpc/dmv177/configure.ac | 1 - .../lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 4 + .../libbsp/powerpc/motorola_powerpc/configure.ac | 1 - c/src/lib/libbsp/powerpc/shared/ChangeLog | 21 ++++ c/src/lib/libbsp/shared/ChangeLog | 12 +- c/src/lib/libbsp/shared/vmeUniverse/README.porting | 2 +- c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c | 130 --------------------- 10 files changed, 43 insertions(+), 137 deletions(-) diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog index 5f4c24263e..2817c5a531 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/configure.ac b/c/src/lib/libbsp/m68k/mvme162/tools/configure.ac index 5206cad35f..ff84fc9082 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme162/tools/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme162-tools],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([sload.c]) RTEMS_TOP(../../../../../../..) -AC_CONFIG_AUX_DIR(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog index 2a93659c57..a24a4ae1fd 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog +++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.ac b/c/src/lib/libbsp/powerpc/dmv177/configure.ac index 846beeec24..766e455bd2 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/configure.ac +++ b/c/src/lib/libbsp/powerpc/dmv177/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-c-src-lib-libbsp-powerpc-dmv177],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([bsp_specs]) RTEMS_TOP(../../../../../..) -AC_CONFIG_AUX_DIR(../../../../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 5776dee3ce..7364b16ebf 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-20 Till Straumann PR 349/bsps diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac index 674453ddd4..3cf3ef151c 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-c-src-lib-libbsp-powerpc-motorola_powerpc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([bsp_specs]) RTEMS_TOP(../../../../../..) -AC_CONFIG_AUX_DIR(../../../../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog index f53ee7820c..e91d328de9 100644 --- a/c/src/lib/libbsp/powerpc/shared/ChangeLog +++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog @@ -1,3 +1,24 @@ +2003-02-20 Till Straumann + + PR 349/bsps + * console/polled_io.c, console/reboot.c, irq/irq.c, irq/irq_asm.S, + irq/irq_init.c, openpic/Makefile.am, startup/linkcmds, + vectors/vectors.S, vectors/vectors_init.c: + - install the 'openpic.h' and 'pci.h' headers + - avoid a name clash by renaming 'vsprintf' & friends + to 'k_vsprintf' etc. + - let 'rtemsReboot' print a stack trace (in case an 'assert' failed) + - irq.c: + * fix: remove implicit assumption that ISA interrupt vectors start + at 0 + * add BSP hook to let a VME interrupt acknowledge the PCI/openpic + IRQ. (SEE ALSO THE ppc-sharedbsp-vme.diff patch) + - fix: EABI compliance; isr/exception lowlevel handlers must not + clobber R2 or R13 + - fix: openpic_init was called with the polarity/senses tables + swapped (fixed wrong order of arguments) + - cosmetics: use new _read_SPRXX() _write_SPRXX() macros + 2003-02-20 Till Straumann PR 349/bsps diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index d29d1e7c19..2d21753c5c 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,9 +1,15 @@ +2003-03-11 Ralf Corsepius + + * vmeUniverse/vmeUniverse.c: Remove CVS-Log (skrews up on + CVS-mergers). + 2003-02-20 Till Straumann PR 349/bsps - * shared/README.universe, shared/vmeUniverse/README.porting - shared/vmeUniverse/README.universe, shared/vmeUniverse/vmeUniverse.c, - shared/vmeUniverse/vmeUniverse.h: Update of the VME universe driver. + * README.universe, vmeUniverse/README.porting + vmeUniverse/README.universe, vmeUniverse/vmeUniverse.c, + vmeUniverse/vmeUniverse.h: Update of the VME universe driver. + * vmeUniverse/README.porting: New file. 2002-10-28 Eugeny S. Mints diff --git a/c/src/lib/libbsp/shared/vmeUniverse/README.porting b/c/src/lib/libbsp/shared/vmeUniverse/README.porting index b72a673356..f3dd2d5511 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/README.porting +++ b/c/src/lib/libbsp/shared/vmeUniverse/README.porting @@ -1,5 +1,5 @@ # -# $Id$ +# $Id$ # The vmeUniverse driver needs some support from the BSP for diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c index 0762f9ad01..55b8256789 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c +++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c @@ -5,136 +5,6 @@ * Nov 2000, Oct 2001, Jan 2002 */ -#if 0 -/* - * $Log$ - * Revision 1.34 2003/02/10 23:20:05 till - * - added some macro magic to make porting easier (ppcn_60x BSP in mind) - * - made mgrInstalled public (vmeUniverseIrqMgrInstalled) so BSPs can - * supply their own versions of the mgrInstall() routine. - * - added READMEs to CVS - * - * Revision 1.33.2.1 2003/02/10 23:01:40 till - * - added some macro magic to make porting easier (ppcn_60x BSP in mind) - * - made mgrInstalled public (vmeUniverseIrqMgrInstalled) so BSPs can - * supply their own versions of the mgrInstall() routine. - * - * Revision 1.32 2002/09/05 02:50:41 till - * - use k_vsprintf(), not vsprintf() during early boot (RTEMS) - * - * Revision 1.31 2002/08/16 23:35:15 strauman - * - fixed typos - * - * Revision 1.30 2002/08/16 22:53:37 till - * - made address translation more generic; allow to look for reverse mappings - * also. - * - removed vmeUniverseLocalToBus() and vmeUniverseBusToLocal() and made - * vmeUniverseXlateAddr() public instead. - * - * Revision 1.29 2002/08/16 22:16:25 till - * - tweak U2SPEC (fix Joerger vtr10012_8 problem) the same - * way the synergy BSP does (rev 2 chips only) - * - * Revision 1.28 2002/08/15 23:16:01 till - * - bugfix: vmeUniverseISRGet() dereferenced a possibly NULL pointer - * - * Revision 1.25 2002/07/19 05:18:40 till - * - CVS log: again a problem. Cannot embed /_* *_/ comments in the log - * because the log has to be commented as a whole. I had tried - * #if 0 #endif - doesn't work because cpp expands char constants??? - * WHAT A NUISANCE - * - * Revision 1.24 2002/07/19 02:44:14 till - * - added a new parameter to the IRQ manager install routine: - * the main interrupt's line can now also be specified (reading - * from PCI config does not always work - some boards don't - * have correct information there - PMC's will have a similar - * problem, though!) - * - * Revision 1.21 2002/04/11 06:54:48 till - * - silenced message about 'successfully configured a port' - * - * Revision 1.20 2002/03/27 21:14:50 till - * - fix: handler table holds pointers, so hdlrTbl[vector]->usrData etc. - * not hdlrTbl[vector].usrData... - * - * Revision 1.19 2002/03/09 00:14:36 till - * - added vmeUniverseISRGet() to retrieve the currently installed - * ISR for a given vector - * - swapped the argument order for ISRs to (usrarg, vector) - * - * Revision 1.18 2002/02/07 19:53:48 till - * - reverted back to publish base_addr/irq_line as variables rather than - * through functions: the irq_line is read by the interrupt dispatcher... - * - * Revision 1.17 2002/01/24 08:28:10 till - * - initialize driver when reading base address or irq line. - * however, this requires the pci driver to be working already. - * - * Revision 1.16 2002/01/24 08:21:48 till - * - replaced public global vars for base address/irq line by routines. - * - * Revision 1.15 2002/01/23 06:15:30 till - * - changed master port data width to 64 bit. - * NOTE: reading the CY961 (Echotek ECDR814) with VDW32 - * generated bus errors when reading 32-bit words - * - very weird, because the registers are 16-bit - * AFAIK. - * - 32-bit accesses worked fine on vxWorks which - * has the port set to 64-bit. - * ???????? - * - * Revision 1.14 2002/01/11 19:30:54 till - * - added more register defines to header - * - completed vmeUniverseReset - * - * Revision 1.13 2002/01/11 05:06:18 till - * - fixed VMEISR failing to check (lint_stat & msk) when determining - * the highes level... - * - tested interrupt handling & nesting. Seems to work. - * - * Revision 1.12 2002/01/11 02:25:55 till - * - added interrupt manager - * - * Revision 1.11 2002/01/08 03:59:52 till - * - vxworks always defines _LITTLE_ENDIAN, fixed the conditionals - * so it should work on __vxworks and on __rtems__ now. - * - rtems uprintf wrapper reverts to printk if stdio is not yet - * initialized (uses _impure_ptr->__sdidinit) - * - tested bus address translation utility routines - * - * Revision 1.9 2002/01/05 02:36:32 till - * - added vmeUniverseBusToLocalAdrs / vmeUniverseLocalToBusAdrs for address - * space translations. - * - include bsp.h under rtems to hack around the libcpu/powerpc/shared/io.h - * #define _IO_BASE & friends problem. - * - * Revision 1.8 2002/01/04 04:12:51 till - * - changed some rtems/pci related names - * - * Revision 1.7 2002/01/04 03:06:30 till - * - added further register definitions - * - * Revision 1.6 2001/12/20 04:42:44 till - * - fixed endianness stuff; theoretically, PPC could be LITTLE_ENDIAN... - * - * Revision 1.4 2001/12/19 01:59:02 till - * - started adding interrupt stuff - * - private implementation of PCI scanning if necessary - * - * Revision 1.3 2001/07/27 22:22:51 till - * - added more DMA support routines and defines to include file - * - xxxPortsShow can now print to a given file descriptor argument - * - * Revision 1.2 2001/07/26 18:06:13 till - * - ported to RTEMS - * - fixed a couple of wrong pointer calculations. - * - * Revision 1.1.1.1 2001/07/12 23:15:19 till - * - cvs import - */ -#endif - #include #include #include "vmeUniverse.h" -- cgit v1.2.3