Misc include file fixes.

20 files changed, 98 insertions, 42 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c
index 05205e7b13..13cb6b9024 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c
@@ -27,6 +27,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:25  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.10  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -41,7 +45,7 @@
 \*===============================================================*/
 #include <rtems.h>
 #include <rtems/error.h>
-#include "../include/bsp.h"
+#include <bsp.h>
 #include "../irq/irq.h"
 #include "../include/mpc5200.h"
 #include "../bestcomm/include/ppctypes.h"			/* uint32, et. al.		   */
diff --git a/c/src/lib/libbsp/powerpc/gen5200/clock/clock.c b/c/src/lib/libbsp/powerpc/gen5200/clock/clock.c
index 2ef30514a8..5455bcc2c5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/clock/clock.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/clock/clock.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:25  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.9  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -122,10 +126,8 @@
 /*                                                                     */
 /***********************************************************************/
 
-/*#include "../include/bsp.h"*/
-#include "../include/bsp.h"
+#include <bsp.h>
 #include <rtems/bspIo.h>
-/*#include "../irq/irq.h"*/
 #include "../irq/irq.h"
 
 #include <rtems.h>
@@ -133,8 +135,6 @@
 #include <rtems/libio.h>
 
 #include <stdlib.h>                     /* for atexit() */
-#include "../include/bsp.h"
-#include "../irq/irq.h"
 #include "../include/mpc5200.h"
 
 volatile uint32_t Clock_driver_ticks;
diff --git a/c/src/lib/libbsp/powerpc/gen5200/console/console.c b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
index 7fc4e3b1a2..270c6bbb8c 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:25  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.11  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -114,7 +118,7 @@
 
 #include <rtems.h>
 #include "../include/mpc5200.h"
-#include "../include/bsp.h"
+#include <bsp.h>
 #include "../irq/irq.h"
 
 #include <rtems/bspIo.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c b/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c
index f5ddb56703..638e9cb1cd 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c
@@ -11,7 +11,7 @@
  * @(#) i2c.c,v 1.5 2004/04/21 16:01:34 ralf Exp
  */
 
-#include "../include/bsp.h"
+#include <bsp.h>
 #include "../include/i2c.h"
 
 /* i2c_transfer_sema_done_func --
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2cdrv.c b/c/src/lib/libbsp/powerpc/gen5200/i2c/i2cdrv.c
index 023b37fd78..3ce14c2f85 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2cdrv.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/i2c/i2cdrv.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:25  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.8  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -57,7 +61,7 @@
  * @(#) i2cdrv.c,v 1.6 2004/04/21 16:01:34 ralf Exp
  */
 
-#include "../include/bsp.h"
+#include <bsp.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c b/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c
index f4cdc5aeaa..be1917ac1f 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c
@@ -27,6 +27,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:25  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.5  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -40,7 +44,7 @@
 |*****************************************************************|
 \*===============================================================*/
 #include <rtems.h>
-#include "../include/bsp.h"
+#include <bsp.h>
 #include "../irq/irq.h"
 #include "../include/mpc5200.h"
 #include "./pcmcia_ide.h"
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
index 04fd6e62d0..b89b07e481 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.10  2005/12/09 09:05:16  thomas
 |* changed names of board variations
 |*
@@ -103,7 +107,7 @@
 
 #include <rtems.h>
 #include <rtems/error.h>
-#include "../include/bsp.h"
+#include <bsp.h>
 #include "../irq/irq.h"
 #include "../include/mpc5200.h"
 #include "./pcmcia_ide.h"
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.h b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.h
index 82bba33614..b0f9968de2 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.h
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.5  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -85,8 +89,7 @@
 #ifndef __PCMCIA_IDE_h
 #define __PCMCIA_IDE_h
 
-/*#include "../include/bsp.h"*/
-#include "../include/bsp.h"
+#include <bsp.h>
 
 #define GPIOPCR_ATA_CS_4_5                           (1 << 24)
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h b/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h
index ec9e9a85a3..06def340ee 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h
@@ -16,7 +16,7 @@
 #define __RTEMS__I2C_H__
 
 #include <rtems.h>
-#include "../include/bsp.h"
+#include <bsp.h>
 /* This header file define the generic interface to i2c buses available in
  * system. This interface may be used by user applications or i2c-device
  * drivers (like RTC, NVRAM, etc).
diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c b/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
index 2cde1fe025..193a0eb08c 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.6  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -96,12 +100,9 @@
 /*                                                                     */
 /***********************************************************************/
 
-/*#include "../include/bsp.h"*/
-#include "../include/bsp.h"
+#include <bsp.h>
 #include <rtems.h>
-/*#include "../irq/irq.h"*/
 #include "../irq/irq.h"
-/*#include <rtems/score/thread.h>*/
 #include <rtems/score/apiext.h>
 #include <rtems/bspIo.h>
 #include "../include/raw_exception.h"
diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c b/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
index 87f57626ac..d1b9b36276 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.6  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -92,8 +96,8 @@
 /*                                                                     */
 /***********************************************************************/
 
-/*#include "../include/bsp.h"*/
-#include "../include/bsp.h"
+/*#include <bsp.h>*/
+#include <bsp.h>
 #include <rtems.h>
 /*#include "../irq/irq.h"*/
 #include "../irq/irq.h"
diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
index bc9eeb529f..f30dc657b4 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
@@ -27,6 +27,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.31  2005/12/11 23:00:27  peter
 |* initialization according to bitrate and max. no of tq per can bit
 |*
@@ -49,10 +53,10 @@
 #include <rtems/error.h>
 #include <rtems/libio.h>
 #include <string.h>
-#include "../include/bsp.h"
+#include <bsp.h>
 #include "../irq/irq.h"
 #include "../include/mpc5200.h"
-#include "../mscan/mscan.h"
+#include "mscan.h"
 
 /* #define MSCAN_LOOPBACK */
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c b/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c
index 3fa52f7b72..f82f68b8f1 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.10  2005/12/06 14:30:42  thomas
 |* updated name for peripheral register block
 |*
@@ -86,7 +90,7 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include "../include/bsp.h"
+#include <bsp.h>
 #include "../irq/irq.h"
 #include "../include/mpc5200.h"
 #include <net/if_var.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c b/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c
index 85b2c4a13e..3596b0ca9f 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.4  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -98,13 +102,11 @@
 #include <rtems/libio.h>
 #include <errno.h>
 #include <string.h>
-/*#include "../include/bsp.h"*/
-#include "../include/bsp.h"
-#include "../include/mpc5200.h"
-/*#include "../nvram/nvram.h"*/
-#include "../nvram/nvram.h"
-#include "../nvram/m93cxx.h"
 #include <stdio.h>
+#include <bsp.h>
+#include "../include/mpc5200.h"
+#include "nvram.h"
+#include "m93cxx.h"
 
 /*
  * Simple usec delay function using lower half of HARPO Time Base Register
diff --git a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h b/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h
index 80c47aea25..f03a13ecd6 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.3  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -101,8 +105,8 @@
 extern "C" {
 #endif
 
-/* include "../include/bsp.h" */
-#include "../include/bsp.h"
+/* include <bsp.h> */
+#include <bsp.h>
 
 /* Macros for TBL read access */
 #define TBL_READ(count)    __asm__ volatile ("mftb %0\n" : "=r" (count) : "0" (count))
diff --git a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
index 173e4c3891..2a312a9e33 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.7  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -114,17 +118,14 @@
 /*                                                                     */
 /***********************************************************************/
 
-/*#include "../include/bsp.h"*/
-#include "../include/bsp.h"
+#include <bsp.h>
 #include <rtems/bspIo.h>
-/*#include "../irq/irq.h"*/
 #include "../irq/irq.h"
 
 #include <rtems.h>
 #include <rtems/clockdrv.h>
 #include <rtems/libio.h>
 
-#include "../include/bsp.h"
 #include "../irq/irq.h"
 #include "../include/mpc5200.h"
 #include "../slicetimer/slicetimer.h"
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
index f7a8ad2b59..ba8d288f3e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.8  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -114,8 +118,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/*#include "../include/bsp.h"*/
-#include "../include/bsp.h"
+#include <bsp.h>
 
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c b/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c
index 6542123c44..84bc1348ac 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.8  2005/12/09 09:05:16  thomas
 |* changed names of board variations
 |*
@@ -88,7 +92,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-#include "../include/bsp.h"
+#include <bsp.h>
 #include <rtems/powerpc/registers.h>
 #include "../include/mpc5200.h"
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/tod/todcfg.c b/c/src/lib/libbsp/powerpc/gen5200/tod/todcfg.c
index 381c91b70b..c457b95bef 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/tod/todcfg.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/tod/todcfg.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.4  2005/12/06 14:11:12  thomas
 |* added EB file headers
 |*
@@ -51,7 +55,7 @@
  * @(#) todcfg.c,v 1.4 2005/01/22 04:12:39 ralf Exp
  */
 
-#include "../include/bsp.h"
+#include <bsp.h>
 #include "../include/i2c.h"
 #include <libchip/rtc.h>
 #include "../tod/pcf8563.h"
diff --git a/c/src/lib/libbsp/powerpc/gen5200/vectors/vectors_init.c b/c/src/lib/libbsp/powerpc/gen5200/vectors/vectors_init.c
index a04d0b1a86..cdaf5c4202 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/vectors/vectors_init.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/vectors/vectors_init.c
@@ -30,6 +30,10 @@
 |*do not edit here)                                               |
 |*****************************************************************|
 |* $Log$
+|* Revision 1.1  2005/12/31 05:09:26  ralf
+|* New (CVS import Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>'s
+|* submission).
+|*
 |* Revision 1.2  2005/12/09 08:57:03  thomas
 |* added/modifed file headers
 |*
@@ -88,11 +92,9 @@
 /*                                                                     */
 /***********************************************************************/
 
-/*#include "../vectors/vectors.h"*/
 #include "../vectors/vectors.h"
 #include "../include/raw_exception.h"
-/*#include "../include/bsp.h"*/
-#include "../include/bsp.h"
+#include <bsp.h>
 #include <rtems/bspIo.h>
 
 extern int mpc60x_vector_is_valid(rtems_vector);