[rtems commit] LPC1768: Fix compilation error

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    1d55e157ca9f4a9ff806f8fa5fcc79b03a7b8178
Changeset: http://git.rtems.org/rtems/commit/?id=1d55e157ca9f4a9ff806f8fa5fcc79b03a7b8178

Author:    Martin Galvan <martin.galvan at tallertechnologies.com>
Date:      Thu Nov  5 11:17:23 2015 -0300

LPC1768: Fix compilation error

The LPC1768 variants have a gpio.h file whose name clashes with the gpio.h from
the new GPIO API. This results on the BSPs failing to compile.

This patch renames the LPC1768 gpio.* files to lpc-gpio.*, as it's done on other
BSPs (e.g. Beaglebone).

Closes #2441.

---

 c/src/lib/libbsp/arm/lpc176x/Makefile.am                    | 4 ++--
 c/src/lib/libbsp/arm/lpc176x/gpio/{gpio.c => lpc-gpio.c}    | 4 ++--
 c/src/lib/libbsp/arm/lpc176x/include/{gpio.h => lpc-gpio.h} | 2 +-
 c/src/lib/libbsp/arm/lpc176x/preinstall.am                  | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 50a7e79..352b2d9 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -41,7 +41,7 @@ include_bsp_HEADERS += include/io-defs.h
 include_bsp_HEADERS += include/io.h
 include_bsp_HEADERS += include/common-types.h
 include_bsp_HEADERS += include/gpio-defs.h
-include_bsp_HEADERS += include/gpio.h
+include_bsp_HEADERS += include/lpc-gpio.h
 include_bsp_HEADERS += include/can.h
 include_bsp_HEADERS += include/can-defs.h
 include_bsp_HEADERS += include/pwmout.h
@@ -131,7 +131,7 @@ libbsp_a_SOURCES += ../../shared/tod.c \
 			rtc/rtc-config.c
 
 # GPIO
-libbsp_a_SOURCES += gpio/gpio.c
+libbsp_a_SOURCES += gpio/lpc-gpio.c
 
 # CAN
 libbsp_a_SOURCES += can/can.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/gpio/gpio.c b/c/src/lib/libbsp/arm/lpc176x/gpio/lpc-gpio.c
similarity index 99%
rename from c/src/lib/libbsp/arm/lpc176x/gpio/gpio.c
rename to c/src/lib/libbsp/arm/lpc176x/gpio/lpc-gpio.c
index e77e07b..e7f07fe 100644
--- a/c/src/lib/libbsp/arm/lpc176x/gpio/gpio.c
+++ b/c/src/lib/libbsp/arm/lpc176x/gpio/lpc-gpio.c
@@ -1,5 +1,5 @@
 /**
- * @file gpio.c
+ * @file lpc-gpio.c
  *
  * @ingroup lpc176x
  *
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <bsp/irq.h>
 #include <bsp/io.h>
-#include <bsp/gpio.h>
+#include <bsp/lpc-gpio.h>
 #include <rtems/status-checks.h>
 
 static uint32_t                              function_vector_size = 0u;
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/gpio.h b/c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h
similarity index 99%
rename from c/src/lib/libbsp/arm/lpc176x/include/gpio.h
rename to c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h
index 35f34be..9cb23df 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/gpio.h
+++ b/c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h
@@ -1,5 +1,5 @@
 /**
- * @file gpio.h
+ * @file lpc-gpio.h
  *
  * @ingroup lpc176x
  *
diff --git a/c/src/lib/libbsp/arm/lpc176x/preinstall.am b/c/src/lib/libbsp/arm/lpc176x/preinstall.am
index 5c86c8b..8d6c4d3 100644
--- a/c/src/lib/libbsp/arm/lpc176x/preinstall.am
+++ b/c/src/lib/libbsp/arm/lpc176x/preinstall.am
@@ -113,9 +113,9 @@ $(PROJECT_INCLUDE)/bsp/gpio-defs.h: include/gpio-defs.h $(PROJECT_INCLUDE)/bsp/$
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio-defs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio-defs.h
 
-$(PROJECT_INCLUDE)/bsp/gpio.h: include/gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio.h
+$(PROJECT_INCLUDE)/bsp/lpc-gpio.h: include/lpc-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-gpio.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-gpio.h
 
 $(PROJECT_INCLUDE)/bsp/can.h: include/can.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/can.h