closes #2677.
---
c/src/lib/libbsp/powerpc/score603e/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h | 42 ----------------------
c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c | 4 +--
.../lib/libbsp/powerpc/score603e/PCI_bus/pciimpl.h | 42 ++++++++++++++++++++++
.../libbsp/powerpc/score603e/PCI_bus/universe.c | 2 +-
c/src/lib/libbsp/powerpc/score603e/preinstall.am | 6 ++--
6 files changed, 49 insertions(+), 49 deletions(-)
delete mode 100644 c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h
create mode 100644 c/src/lib/libbsp/powerpc/score603e/PCI_bus/pciimpl.h
diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am
b/c/src/lib/libbsp/powerpc/score603e/Makefile.am
index 2e9eebb..07daafe 100644
--- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am
@@ -32,7 +32,7 @@ console_SOURCES = console/85c30.c console/85c30.h
console/console.c \
console/tbl85c30.c console/consolebsp.h
include_bsp_HEADERS = ../../powerpc/shared/pci/pci.h \
- PCI_bus/PCI.h \
+ PCI_bus/pciimpl.h \
../../powerpc/shared/residual/residual.h \
../../powerpc/shared/residual/pnp.h \
../../powerpc/shared/console/consoleIo.h
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h
b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h
deleted file mode 100644
index 7b1526f..0000000
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @file
- *
- * This include file contains prototypes for chips attached to the
- * PCI bus.
- */
-
-/*
- * COPYRIGHT (c) 1989-2009.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef __PCI_h
-#define __PCI_h
-
-/*
- * PCI.c
- */
-
-void PCI_bus_write(
- volatile uint32_t * _addr,
- uint32_t _data
-);
-
-uint32_t PCI_bus_read(
- volatile uint32_t * _addr
-);
-
-uint32_t Read_pci_device_register(
- uint32_t address
-);
-
-void Write_pci_device_register(
- uint32_t address,
- uint32_t data
-);
-
-#endif
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
index a2e084a..a5f697b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 1989-2009.
+ * COPYRIGHT (c) 1989-2009,2016.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -14,7 +14,7 @@
#include <bsp.h>
#include <bsp/irq.h>
-#include "PCI.h"
+#include <bsp/pciimpl.h>
/*
* SCORE603e_FLASH_Disable
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/pciimpl.h
b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/pciimpl.h
new file mode 100644
index 0000000..c0b21b4
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/pciimpl.h
@@ -0,0 +1,42 @@
+/**
+ * @file
+ *
+ * This include file contains prototypes for chips attached to the
+ * PCI bus.
+ */
+
+/*
+ * COPYRIGHT (c) 1989-2009, 2016.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#ifndef __BSP_PCIimpl_h
+#define __BSP_PCIimpl_h
+
+/*
+ * PCI.c
+ */
+
+void PCI_bus_write(
+ volatile uint32_t * _addr,
+ uint32_t _data
+);
+
+uint32_t PCI_bus_read(
+ volatile uint32_t * _addr
+);
+
+uint32_t Read_pci_device_register(
+ uint32_t address
+);
+
+void Write_pci_device_register(
+ uint32_t address,
+ uint32_t data
+);
+
+#endif
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
index c373aa6..8565236 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
@@ -14,7 +14,7 @@
#include <rtems/bspIo.h>
#include <bsp.h>
-#include "PCI.h"
+#include <bsp/pciimpl.h>
typedef struct {
uint32_t PCI_ID; /* 0x80030000 */
diff --git a/c/src/lib/libbsp/powerpc/score603e/preinstall.am
b/c/src/lib/libbsp/powerpc/score603e/preinstall.am
index da25a43..042bb47 100644
--- a/c/src/lib/libbsp/powerpc/score603e/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/score603e/preinstall.am
@@ -69,9 +69,9 @@ $(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h
$(PROJECT_INCLUDE)/
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-$(PROJECT_INCLUDE)/bsp/PCI.h: PCI_bus/PCI.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/PCI.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/PCI.h
+$(PROJECT_INCLUDE)/bsp/pciimpl.h: PCI_bus/pciimpl.h
$(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pciimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pciimpl.h
$(PROJECT_INCLUDE)/bsp/residual.h: ../../powerpc/shared/residual/residual.h
$(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/residual.h
--
1.8.3.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
