2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org>

	* vmeUniverse/vmeUniverse.c: Eliminate obsolete types.
	Remove CVS log.

2 files changed, 6 insertions, 223 deletions

diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog
index 680725b03f..aa180047a4 100644
--- a/c/src/lib/libbsp/shared/ChangeLog
+++ b/c/src/lib/libbsp/shared/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* vmeUniverse/vmeUniverse.c: Eliminate obsolete types.
+	Remove CVS log.
+
 2005-10-20  Eric Norum <norume@aps.anl.gov>
 
 	* vmeUniverse/vmeUniverse.c: Support MVME2100.
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
index 6612bcef11..b4f178805d 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
@@ -5,228 +5,6 @@
  *         Nov 2000, Oct 2001, Jan 2002
  */
 
-#if 0
-/*
- * $Log$
- * Revision 1.55  2005/10/25 20:07:18  till
- *  - check #if BSP_SHARED_HANDLER_SUPPORT > 0 before using the shared irq API.
- *    Bail to use non-shared interrupts if the BSP doesn't support the shared API
- *    (giving a warning).
- *
- * Revision 1.54  2005/10/25 19:52:26  till
- *  - Loopback test: ISR check return status of message_queue_send and assumes
- *    there's a IRQ storm on error (queue full). The interrupt level is disabled
- *    if this occurs.
- *
- * Revision 1.53  2005/10/21 17:52:08  till
- *  - reverted default definition of PCI_MEM_BASE and introduced a short explanation
- *
- * Revision 1.52  2005/10/21 17:46:37  till
- *  - use 0 if PCI_MEM_BASE is undefined
- *
- * Revision 1.51  2005/10/14 19:04:51  till
- *  - removed shared irq handler kludge for mvme5500 bsp -- this *really* doesn't belong here...
- *
- * Revision 1.50  2005/10/10 21:57:59  till
- *  - xxIrqMgrInstalled must be set prior to calling xxIntRoute() because
- *    xxIntRoute() now checks the 'installed' flag.
- *
- * Revision 1.49  2005/10/10 19:45:08  till
- *  - enable PCI busmaster and memory access from the 'find' routine
- *
- * Revision 1.48  2005/10/10 19:35:47  till
- *  - added 'Va' version of IrqMgrInstall
- *
- * Revision 1.47  2005/10/10 18:04:50  till
- *  - maintain copy of vme_am_defs.h in driver headers (backwards compat, sigh...)
- *
- * Revision 1.46  2005/10/10 17:52:58  strauman
- *  - separated basic AM definitions into separate file
- *
- * Revision 1.45  2005/10/10 17:45:58  strauman
- *  - added check for initialized 'base' to tsi driver
- *
- * Revision 1.44  2005/10/10 06:24:15  till
- *  - if vector is unknown, the message number (and not the vector number) needs to
- *    be printed (IntLoopbackTest()).
- *
- * Revision 1.43  2005/10/09 00:28:20  till
- *  - added vmeUniverseIntRaise() and vmeUniverseIntLoopbackTest() routines
- *
- * Revision 1.42  2005/10/08 23:48:03  till
- *  - 'special' level numbers are now (almost - except for VOWN) aligned
- *    with bitmask; removed extra shift for levels >= SW_IACK.
- *  - use helper function to convert level -> bitmask. Also used by new feature
- *    to let vmeUniverseIntEnable/Disable handle 'special/internal' interrupts
- *    as well.
- *  - undid bad change. The level sensitive VME interrupts must really be cleared only
- *    *after* calling the user handler to prevent the chip to ACK another IRQ at the level
- *    currently processed.
- *  - added printk() statements in error-branches of ISR (no handler installed or bus error
- *    during IACK.
- *  - added kludgy weak alias that maps  BSP_install_rtems_shared_irq_handler
- *    to BSP_install_rtems_irq_handler -- the mvme5500 bsp doesn't implement the shared handlers...
- *  - bugfix: vmeUniverseIntRoute 'pin' argument is actually the slot # in the wire table,
- *    so the 'special' pin has to be 1 not universe_wire[1].
- *  - added vmeUniverseIntIsEnabled() to check current setting.
- *
- * Revision 1.41  2005/10/06 21:41:57  till
- *  - FIX: protect handler table by switching interrupt off
- *  - FIX: skip vector # for nonexistent special IRQ
- *  - upgrade: new InstallMgr API allows for requesting shared irqs and more pin/line pairs
- *  - only do EOI if BSP defines macro
- *  - dont add PCI_LOWEST_OFFSET anymore to irq line info
- *
- * Revision 1.40  2005/06/04 05:47:00  till
- *  - added comment about STAT_ID pecularity
- *
- * Revision 1.39  2005/05/06 00:03:14  till
- *  - added interface to secondary devices (pass base addr of universe)
- *  - made the 'ResetBus' routine public
- *
- * Revision 1.38  2005/04/26 00:02:47  till
- *  - fix in inline assembly
- *
- * Revision 1.37  2004/11/08 22:43:09  till
- *  - fix: zero value of specialIrqUnivOut is legal.
- *
- * Revision 1.36  2003/03/21 20:54:18  till
- *  - modified 'printf()' formats to be compliant with the
- *    cpukit 'printk()' implementation and use the latter
- *    prior to stdio/libc being initialized.
- *
- * Revision 1.35  2003/03/06 20:52:44  till
- *  - fix lazy init bug reported by Kate Feng
- *  - rename misspelled dccp/DCCP to dcpp/DCPP ( :-( )
- *  - added 'packed' attribute (probably not really necessary)
- *
- * 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 <stdio.h>
 #include <stdarg.h>
 #include "vmeUniverse.h"
@@ -1813,7 +1591,7 @@ rtems_id			q = 0;
 int					installed = 0;
 int					i, err = 0;
 int					doDisable = 0;
-unsigned32			size;
+uint32_t		size;
 unsigned long		msg;
 char *				irqfmt  = "VME IRQ @vector %3i %s";
 char *				iackfmt = "VME IACK            %s";