Changeset 1d55e15 in rtems


Ignore:
Timestamp:
Nov 5, 2015, 2:17:23 PM (4 years ago)
Author:
Martin Galvan <martin.galvan@…>
Branches:
master
Children:
f8bdd12
Parents:
c1e98cd
git-author:
Martin Galvan <martin.galvan@…> (11/05/15 14:17:23)
git-committer:
Sebastian Huber <sebastian.huber@…> (11/05/15 14:27:46)
Message:

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.

Location:
c/src/lib/libbsp/arm/lpc176x
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/lpc176x/Makefile.am

    rc1e98cd r1d55e15  
    4242include_bsp_HEADERS += include/common-types.h
    4343include_bsp_HEADERS += include/gpio-defs.h
    44 include_bsp_HEADERS += include/gpio.h
     44include_bsp_HEADERS += include/lpc-gpio.h
    4545include_bsp_HEADERS += include/can.h
    4646include_bsp_HEADERS += include/can-defs.h
     
    132132
    133133# GPIO
    134 libbsp_a_SOURCES += gpio/gpio.c
     134libbsp_a_SOURCES += gpio/lpc-gpio.c
    135135
    136136# CAN
  • c/src/lib/libbsp/arm/lpc176x/gpio/lpc-gpio.c

    rc1e98cd r1d55e15  
    11/**
    2  * @file gpio.c
     2 * @file lpc-gpio.c
    33 *
    44 * @ingroup lpc176x
     
    2323#include <bsp/irq.h>
    2424#include <bsp/io.h>
    25 #include <bsp/gpio.h>
     25#include <bsp/lpc-gpio.h>
    2626#include <rtems/status-checks.h>
    2727
  • c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h

    rc1e98cd r1d55e15  
    11/**
    2  * @file gpio.h
     2 * @file lpc-gpio.h
    33 *
    44 * @ingroup lpc176x
  • c/src/lib/libbsp/arm/lpc176x/preinstall.am

    rc1e98cd r1d55e15  
    114114PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio-defs.h
    115115
    116 $(PROJECT_INCLUDE)/bsp/gpio.h: include/gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    117         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio.h
    118 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio.h
     116$(PROJECT_INCLUDE)/bsp/lpc-gpio.h: include/lpc-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     117        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-gpio.h
     118PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-gpio.h
    119119
    120120$(PROJECT_INCLUDE)/bsp/can.h: include/can.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
Note: See TracChangeset for help on using the changeset viewer.