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

	* Makefile.am, comm/i386-stub-glue.c, comm/tty_drv.c, comm/uart.c,
	irq/idt.c, irq/irq.c, irq/irq.h, irq/irq_asm.S, irq/irq_init.c: Moved
	irq.h and irq_asm.h to bsp subdirectory.

10 files changed, 33 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/i386/shared/ChangeLog b/c/src/lib/libbsp/i386/shared/ChangeLog
index 3194355568..7d9b6e711f 100644
--- a/c/src/lib/libbsp/i386/shared/ChangeLog
+++ b/c/src/lib/libbsp/i386/shared/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-06      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * Makefile.am, comm/i386-stub-glue.c, comm/tty_drv.c, comm/uart.c,
+        irq/idt.c, irq/irq.c, irq/irq.h, irq/irq_asm.S, irq/irq_init.c: Moved
+        irq.h and irq_asm.h to bsp subdirectory.
+
 2005-05-04      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * pci/pcibios.c, pci/pcibios.h: Corrected spacing
diff --git a/c/src/lib/libbsp/i386/shared/Makefile.am b/c/src/lib/libbsp/i386/shared/Makefile.am
index 46df58e625..67455b65cb 100644
--- a/c/src/lib/libbsp/i386/shared/Makefile.am
+++ b/c/src/lib/libbsp/i386/shared/Makefile.am
@@ -13,8 +13,10 @@ EXTRA_DIST += comm/i386-stub-glue.c comm/i386-stub.c comm/uart.c \
 
 EXTRA_DIST += comm/GDB.HOWTO
 
+include_bspdir = $(includedir)/bsp
+
 # irq
-include_HEADERS += irq/irq.h irq/irq_asm.h
+include_bsp_HEADERS = irq/irq.h irq/irq_asm.h
 
 EXTRA_DIST += irq/idt.c irq/irq.c irq/irq_init.c
 EXTRA_DIST += irq/irq_asm.S
@@ -47,18 +49,23 @@ $(PROJECT_INCLUDE)/i386_io.h: comm/i386_io.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i386_io.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/i386_io.h
 
-$(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
+$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
 
-$(PROJECT_INCLUDE)/irq_asm.h: irq/irq_asm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq_asm.h
+$(PROJECT_INCLUDE)/bsp/irq_asm.h: irq/irq_asm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_asm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_asm.h
 
 $(PROJECT_INCLUDE)/pcibios.h: pci/pcibios.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pcibios.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/pcibios.h
 
+$(PROJECT_INCLUDE)/bsp/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/bsp
+	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+
 CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
diff --git a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c b/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
index d5b7ace66c..0f5bec0b89 100644
--- a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
+++ b/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
@@ -10,7 +10,7 @@
 #include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <uart.h>
 #include <assert.h>
 
diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c b/c/src/lib/libbsp/i386/shared/comm/tty_drv.c
index b565ace7d8..a3f6e4ff69 100644
--- a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c
+++ b/c/src/lib/libbsp/i386/shared/comm/tty_drv.c
@@ -18,6 +18,11 @@
  * MODIFICATION/HISTORY:
  *
  * $Log$
+ * Revision 1.8  2005/05/03 14:45:12  jennifer
+ * 2005-05-03	Jennifer Averett <jennifer.averett@oarcorp.com>
+ *
+ * 	* comm/tty_drv.c: Modified to support addition of parameter to ISRs.
+ *
  * Revision 1.7  2004/04/21 16:01:33  ralf
  * Remove duplicate white lines.
  *
@@ -74,7 +79,7 @@
 #include <assert.h>
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 #include <rtems/termiostypes.h>
 #include <termios.h>
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/c/src/lib/libbsp/i386/shared/comm/uart.c
index a2a619ec94..8e4bb6cf58 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.c
+++ b/c/src/lib/libbsp/i386/shared/comm/uart.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <uart.h>
 #include <rtems/libio.h>
 #include <rtems/termiostypes.h>
diff --git a/c/src/lib/libbsp/i386/shared/irq/idt.c b/c/src/lib/libbsp/i386/shared/irq/idt.c
index 465cbd4e27..228ae0656d 100644
--- a/c/src/lib/libbsp/i386/shared/irq/idt.c
+++ b/c/src/lib/libbsp/i386/shared/irq/idt.c
@@ -19,7 +19,7 @@
  */
 
 #include <libcpu/cpu.h>
-#include <irq.h>
+#include <bsp/irq.h>
 
 static rtems_raw_irq_connect_data* 	raw_irq_table;
 static rtems_raw_irq_connect_data  	default_raw_irq_entry;
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.c b/c/src/lib/libbsp/i386/shared/irq/irq.c
index b71e1f64ff..93eb7b0927 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq.c
+++ b/c/src/lib/libbsp/i386/shared/irq/irq.c
@@ -12,7 +12,7 @@
  */
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/apiext.h>
 
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.h b/c/src/lib/libbsp/i386/shared/irq/irq.h
index 8aa0053f64..833e3157c4 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq.h
+++ b/c/src/lib/libbsp/i386/shared/irq/irq.h
@@ -29,7 +29,7 @@ extern "C" {
  * Include some preprocessor value also used by assember code
  */
 
-#include <irq_asm.h>
+#include <bsp/irq_asm.h>
 #include <rtems.h>
 /*-------------------------------------------------------------------------+
 | Constants
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_asm.S b/c/src/lib/libbsp/i386/shared/irq/irq_asm.S
index b99de3740b..81faa17584 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq_asm.S
+++ b/c/src/lib/libbsp/i386/shared/irq/irq_asm.S
@@ -12,7 +12,7 @@
  */
 
 #include <rtems/asm.h>
-#include <irq_asm.h>
+#include <bsp/irq_asm.h>
 
 	       BEGIN_CODE
 
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_init.c b/c/src/lib/libbsp/i386/shared/irq/irq_init.c
index cd420d6b8b..67aae142f7 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq_init.c
+++ b/c/src/lib/libbsp/i386/shared/irq/irq_init.c
@@ -13,7 +13,7 @@
  */
 
 #include <libcpu/cpu.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <bsp.h>
 #include <rtems/bspIo.h>