From 3e0a59623e3d9e42f4d635a5e840113298aeecba Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 10:29:46 -0600 Subject: [PATCH] LPCXpresso LPC1768: Rename files for better conformance to naming conventions --- configs/lpcxpresso-lpc1768/src/Makefile | 30 +++++++++---------- .../src/{up_adc.c => lpc17_adc.c} | 7 ++--- .../src/{up_boot.c => lpc17_boot.c} | 2 +- .../src/{up_dac.c => lpc17_dac.c} | 5 ++-- .../src/{up_leds.c => lpc17_leds.c} | 4 +-- .../src/{up_nsh.c => lpc17_nsh.c} | 5 ++-- .../src/{up_oled.c => lpc17_oled.c} | 5 ++-- .../src/{up_pwm.c => lpc17_pwm.c} | 4 +-- .../src/{up_ssp.c => lpc17_ssp.c} | 5 ++-- .../src/{up_usbmsc.c => lpc17_usbmsc.c} | 4 +-- .../src/lpcxpresso_internal.h | 3 +- 11 files changed, 34 insertions(+), 40 deletions(-) rename configs/lpcxpresso-lpc1768/src/{up_adc.c => lpc17_adc.c} (96%) rename configs/lpcxpresso-lpc1768/src/{up_boot.c => lpc17_boot.c} (98%) rename configs/lpcxpresso-lpc1768/src/{up_dac.c => lpc17_dac.c} (96%) rename configs/lpcxpresso-lpc1768/src/{up_leds.c => lpc17_leds.c} (98%) rename configs/lpcxpresso-lpc1768/src/{up_nsh.c => lpc17_nsh.c} (98%) rename configs/lpcxpresso-lpc1768/src/{up_oled.c => lpc17_oled.c} (98%) rename configs/lpcxpresso-lpc1768/src/{up_pwm.c => lpc17_pwm.c} (98%) rename configs/lpcxpresso-lpc1768/src/{up_ssp.c => lpc17_ssp.c} (98%) rename configs/lpcxpresso-lpc1768/src/{up_usbmsc.c => lpc17_usbmsc.c} (98%) diff --git a/configs/lpcxpresso-lpc1768/src/Makefile b/configs/lpcxpresso-lpc1768/src/Makefile index 5bdf9459e59..8b4e04684f2 100644 --- a/configs/lpcxpresso-lpc1768/src/Makefile +++ b/configs/lpcxpresso-lpc1768/src/Makefile @@ -35,36 +35,36 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched -ASRCS = -CSRCS = up_boot.c up_leds.c up_ssp.c up_adc.c up_dac.c up_pwm.c +ASRCS = +CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c ifeq ($(CONFIG_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += lpc17_nsh.c endif ifeq ($(CONFIG_NX_LCDDRIVER),y) -CSRCS += up_oled.c +CSRCS += lpc17_oled.c endif ifeq ($(CONFIG_USBMSC),y) -CSRCS += up_usbmsc.c +CSRCS += lpc17_usbmsc.c endif -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) -ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ifeq ($(WINTOOL),y) - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ - -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ - -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}" else - CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m + CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m endif all: libboard$(LIBEXT) diff --git a/configs/lpcxpresso-lpc1768/src/up_adc.c b/configs/lpcxpresso-lpc1768/src/lpc17_adc.c similarity index 96% rename from configs/lpcxpresso-lpc1768/src/up_adc.c rename to configs/lpcxpresso-lpc1768/src/lpc17_adc.c index cb5b296b9d4..3b361d644bd 100644 --- a/configs/lpcxpresso-lpc1768/src/up_adc.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_adc.c @@ -1,11 +1,10 @@ /************************************************************************************ - * configs/lpcexpresso-1768/src/up_adc.c - * arch/arm/src/board/up_adc.c + * configs/lpcexpresso-1768/src/lpc17_adc.c * * Copyright (C) 2013 Zilogic Systems. All rights reserved. * Author: Kannan * - * Based on configs/stm3220g-eval/src/up_adc.c + * Based on configs/stm3220g-eval/src/lpc17_adc.c * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -60,7 +59,7 @@ #ifdef CONFIG_ADC /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/lpcxpresso-lpc1768/src/up_boot.c b/configs/lpcxpresso-lpc1768/src/lpc17_boot.c similarity index 98% rename from configs/lpcxpresso-lpc1768/src/up_boot.c rename to configs/lpcxpresso-lpc1768/src/lpc17_boot.c index beed75f80dc..2fedae933b5 100644 --- a/configs/lpcxpresso-lpc1768/src/up_boot.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/lpcxpresso-lpc1768/src/up_boot.c + * configs/lpcxpresso-lpc1768/src/lpc17_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/lpcxpresso-lpc1768/src/up_dac.c b/configs/lpcxpresso-lpc1768/src/lpc17_dac.c similarity index 96% rename from configs/lpcxpresso-lpc1768/src/up_dac.c rename to configs/lpcxpresso-lpc1768/src/lpc17_dac.c index 9b54bea185f..f27c4edf61b 100644 --- a/configs/lpcxpresso-lpc1768/src/up_dac.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_dac.c @@ -1,11 +1,10 @@ /************************************************************************************ - * configs/zkit-arm-1769/src/up_dac.c - * arch/arm/src/board/up_dac.c + * configs/zkit-arm-1769/src/lpc17_dac.c * * Copyright (C) 2013 Zilogic Systems. All rights reserved. * Author: Kannan * - * Based on configs/stm3220g-eval/src/up_dac.c + * Based on configs/stm3220g-eval/src/lpc17_dac.c * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/lpcxpresso-lpc1768/src/up_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c similarity index 98% rename from configs/lpcxpresso-lpc1768/src/up_leds.c rename to configs/lpcxpresso-lpc1768/src/lpc17_leds.c index dd5e9de97da..d8ef712d53b 100644 --- a/configs/lpcxpresso-lpc1768/src/up_leds.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/lpcxpresso-lpc1768/src/up_leds.c + * configs/lpcxpresso-lpc1768/src/lpc17_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -53,7 +53,7 @@ #ifdef CONFIG_ARCH_LEDS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG diff --git a/configs/lpcxpresso-lpc1768/src/up_nsh.c b/configs/lpcxpresso-lpc1768/src/lpc17_nsh.c similarity index 98% rename from configs/lpcxpresso-lpc1768/src/up_nsh.c rename to configs/lpcxpresso-lpc1768/src/lpc17_nsh.c index 93cb3c0b2c1..3ebc486ad0f 100644 --- a/configs/lpcxpresso-lpc1768/src/up_nsh.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/lpcxpresso-lpc1768/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/lpcxpresso-lpc1768/src/lpc17_nsh.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +47,7 @@ #include /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/lpcxpresso-lpc1768/src/up_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c similarity index 98% rename from configs/lpcxpresso-lpc1768/src/up_oled.c rename to configs/lpcxpresso-lpc1768/src/lpc17_oled.c index a91473983c1..01692b65bf6 100644 --- a/configs/lpcxpresso-lpc1768/src/up_oled.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/lpcxpresso-lpc1768/src/up_oled.c - * arch/arm/src/board/up_oled.c + * config/lpcxpresso-lpc1768/src/lpc17_oled.c * * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -53,7 +52,7 @@ #include "lpcxpresso_internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ /* This module is only built if CONFIG_NX_LCDDRIVER is selected. In this diff --git a/configs/lpcxpresso-lpc1768/src/up_pwm.c b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c similarity index 98% rename from configs/lpcxpresso-lpc1768/src/up_pwm.c rename to configs/lpcxpresso-lpc1768/src/lpc17_pwm.c index 88741fd0d7c..f7235f69b51 100644 --- a/configs/lpcxpresso-lpc1768/src/up_pwm.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/lpcexpresso-lpc1768/up_pwm.c + * configs/lpcexpresso-lpc1768/lpc17_pwm.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -53,7 +53,7 @@ #include "lpcxpresso_internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ #ifdef CONFIG_PWM diff --git a/configs/lpcxpresso-lpc1768/src/up_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c similarity index 98% rename from configs/lpcxpresso-lpc1768/src/up_ssp.c rename to configs/lpcxpresso-lpc1768/src/lpc17_ssp.c index f16bc396c69..8f4762a4af5 100644 --- a/configs/lpcxpresso-lpc1768/src/up_ssp.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/lpcxpresso-lpc1768/src/up_ssp.c - * arch/arm/src/board/up_ssp.c + * configs/lpcxpresso-lpc1768/src/lpc17_ssp.c * * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +55,7 @@ #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/lpcxpresso-lpc1768/src/up_usbmsc.c b/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c similarity index 98% rename from configs/lpcxpresso-lpc1768/src/up_usbmsc.c rename to configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c index 6ece902040f..f3ed398985f 100644 --- a/configs/lpcxpresso-lpc1768/src/up_usbmsc.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/lpcxpresso-lpc1768/src/up_usbmsc.c + * configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c * * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,7 @@ #include /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h b/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h index cf0f9c9a700..d8c85be95af 100644 --- a/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h +++ b/configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h @@ -1,6 +1,5 @@ /************************************************************************************ * configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h - * arch/arm/src/board/lpcxpresso_internal.n * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +44,7 @@ #include /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* LPCXpresso LPC1768 board pin usage ***********************************************/