2005-05-06 Jennifer Averett <jennifer.averett@oarcorp.com>

	* 3c509/3c509.c, clock/ckinit.c, console/console.c, console/fb_vga.c,
	console/inch.c, console/ps2_mouse.c, console/serial_mouse.c,
	ne2000/ne2000.c, timer/timer.c, wd8003/wd8003.c: Moved irq.h to bsp
	subdirectory.

11 files changed, 34 insertions, 10 deletions

diff --git a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
index 8bdfa7c746..9b79292c37 100644
--- a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
+++ b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
@@ -58,6 +58,14 @@
  *
  * MODIFICATION/HISTORY:
  * $Log$
+ * Revision 1.7  2005/05/03 14:20:07  jennifer
+ * 2005-05-03	Jennifer Averett <jennifer.averett@oarcorp.com>
+ *
+ * 	* 3c509/3c509.c, ne2000/ne2000.c: Modified parameters to
+ * 	remove warnings.
+ * 	* console/console.c, wd8003/wd8003.c: Added support for
+ * 	addition of parameter in ISRs.
+ *
  * Revision 1.6  2005/04/26 23:03:51  joel
  * 2005-04-26	Joel Sherrill <joel@OARcorp.com>
  *
@@ -102,7 +110,7 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <irq.h>
+#include <bsp/irq.h>
 
 /* Local includes */
 #include "3c509.h"
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 784b054e5a..a954ddb67f 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-06      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * 3c509/3c509.c, clock/ckinit.c, console/console.c, console/fb_vga.c,
+        console/inch.c, console/ps2_mouse.c, console/serial_mouse.c,
+        ne2000/ne2000.c, timer/timer.c, wd8003/wd8003.c: Moved irq.h to bsp
+        subdirectory.
+
 2005-05-03      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * 3c509/3c509.c, ne2000/ne2000.c: Modified parameters to 
diff --git a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c
index e904a125fc..431793cfa7 100644
--- a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c
+++ b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 
 /*-------------------------------------------------------------------------+
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c
index 5fc912386d..f6339b1452 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console.c
@@ -38,7 +38,7 @@
 void __assert (const char *file, int line, const char *msg);
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 #include <termios.h>
 #include <uart.h>
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c b/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
index 57e45097f5..37012b3e21 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
+++ b/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
@@ -11,6 +11,9 @@
 // MODIFICATION/HISTORY:
 //
 // $Log$
+// Revision 1.3  2004/04/21 16:01:33  ralf
+// Remove duplicate white lines.
+//
 // Revision 1.2  2004/04/21 10:42:44  ralf
 // Remove stray white spaces.
 //
@@ -57,7 +60,7 @@
 #include <sys/types.h>
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 
 #include <rtems/mw_fb.h>
diff --git a/c/src/lib/libbsp/i386/pc386/console/inch.c b/c/src/lib/libbsp/i386/pc386/console/inch.c
index e7d7e1c5ec..ead83d26de 100644
--- a/c/src/lib/libbsp/i386/pc386/console/inch.c
+++ b/c/src/lib/libbsp/i386/pc386/console/inch.c
@@ -30,7 +30,7 @@
 +--------------------------------------------------------------------------*/
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 
 /*-------------------------------------------------------------------------+
 | Constants
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
index 697b921e05..a28a89ecfc 100644
--- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
+++ b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 #include <termios.h>
 #include <i386_io.h>
diff --git a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c
index 011c1169c5..bcd861e512 100644
--- a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c
+++ b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c
@@ -18,6 +18,12 @@
  * MODIFICATION/HISTORY:
  *
  * $Log$
+ * Revision 1.8  2005/04/18 17:21:58  jennifer
+ * 2005-04-18	Eric Valette <eric.valette@free.fr>
+ *
+ * 	* clock/ckinit.c, console/console.c, console/ps2_mouse.c,
+ * 	console/serial_mouse.c, timer/timer.c: Added parameter to irq handler
+ *
  * Revision 1.7  2004/04/21 16:01:33  ralf
  * Remove duplicate white lines.
  *
@@ -47,7 +53,7 @@
 #include <assert.h>
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 #include <termios.h>
 #include <uart.h>
diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
index 541f899f84..742b82dd4b 100644
--- a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
+++ b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <irq.h>
+#include <bsp/irq.h>
 
 /* Define this to force byte-wide data transfers with the NIC. This
    is needed for boards like the TS-1325 386EX PC, which support only
diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c
index 88fa4d69b8..87f07abcf3 100644
--- a/c/src/lib/libbsp/i386/pc386/timer/timer.c
+++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 
 /*-------------------------------------------------------------------------+
 | Constants
diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
index aedc70464b..ce9247be81 100644
--- a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
+++ b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
@@ -31,7 +31,7 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <irq.h>
+#include <bsp/irq.h>
 
 #define	ET_MINLEN 60		/* minimum message length */