From 4884f9da86e684713fba81b9720bc4c64547451a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 08:31:05 -0600 Subject: [PATCH] mbed: Rename files for better conformance to naming conventions --- configs/mbed/src/Makefile | 30 +++++++++---------- configs/mbed/src/{up_adc.c => lpc17_adc.c} | 6 ++-- configs/mbed/src/{up_boot.c => lpc17_boot.c} | 2 +- configs/mbed/src/{up_dac.c => lpc17_dac.c} | 6 ++-- .../mbed/src/{up_hidkbd.c => lpc17_hidkbd.c} | 4 +-- configs/mbed/src/{up_leds.c => lpc17_leds.c} | 4 +-- configs/mbed/src/{up_nsh.c => lpc17_nsh.c} | 5 ++-- configs/mbed/src/{up_pwm.c => lpc17_pwm.c} | 6 ++-- configs/mbed/src/mbed_internal.h | 3 +- 9 files changed, 32 insertions(+), 34 deletions(-) rename configs/mbed/src/{up_adc.c => lpc17_adc.c} (97%) rename configs/mbed/src/{up_boot.c => lpc17_boot.c} (99%) rename configs/mbed/src/{up_dac.c => lpc17_dac.c} (96%) rename configs/mbed/src/{up_hidkbd.c => lpc17_hidkbd.c} (97%) rename configs/mbed/src/{up_leds.c => lpc17_leds.c} (99%) rename configs/mbed/src/{up_nsh.c => lpc17_nsh.c} (97%) rename configs/mbed/src/{up_pwm.c => lpc17_pwm.c} (97%) diff --git a/configs/mbed/src/Makefile b/configs/mbed/src/Makefile index 63fcb075e7..f6350eca7e 100644 --- a/configs/mbed/src/Makefile +++ b/configs/mbed/src/Makefile @@ -35,35 +35,35 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched -ASRCS = -CSRCS = up_boot.c up_leds.c up_adc.c up_dac.c up_pwm.c +ASRCS = +CSRCS = lpc17_boot.c lpc17_leds.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_USBMSC),y) -CSRCS += up_usbmsc.c +CSRCS += lpc17_usbmsc.c endif ifeq ($(CONFIG_EXAMPLES_HIDKBD),y) -CSRCS += up_hidkbd.c +CSRCS += lpc17_hidkbd.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/mbed/src/up_adc.c b/configs/mbed/src/lpc17_adc.c similarity index 97% rename from configs/mbed/src/up_adc.c rename to configs/mbed/src/lpc17_adc.c index f48c0c383f..0ae4423b46 100644 --- a/configs/mbed/src/up_adc.c +++ b/configs/mbed/src/lpc17_adc.c @@ -1,12 +1,12 @@ /************************************************************************************ - * configs/mbed/src/up_adc.c + * configs/mbed/src/lpc17_adc.c * * Based on configs/zkit-arm-176/src/up-adc * * Copyright (C) 2013 Zilogic Systems. All rights reserved. * Author: Kannan * - * Based on configs/stm3220g-eval/src/up_adc.c + * Based on configs/lpc1720g-eval/src/lpc17_adc.c * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -61,7 +61,7 @@ #ifdef CONFIG_ADC /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/mbed/src/up_boot.c b/configs/mbed/src/lpc17_boot.c similarity index 99% rename from configs/mbed/src/up_boot.c rename to configs/mbed/src/lpc17_boot.c index 5866ec54c0..e4555940fc 100644 --- a/configs/mbed/src/up_boot.c +++ b/configs/mbed/src/lpc17_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/mbed/src/up_boot.c + * configs/mbed/src/lpc17_boot.c * * Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/mbed/src/up_dac.c b/configs/mbed/src/lpc17_dac.c similarity index 96% rename from configs/mbed/src/up_dac.c rename to configs/mbed/src/lpc17_dac.c index 8875d9db85..6f18a1411d 100644 --- a/configs/mbed/src/up_dac.c +++ b/configs/mbed/src/lpc17_dac.c @@ -1,12 +1,12 @@ /************************************************************************************ - * configs/mbed/src/up_dac.c + * configs/mbed/src/lpc17_dac.c * - * Based on configs/zkit-arm-1769/src/up_dac.c + * Based on 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/stm32_dac.c * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/mbed/src/up_hidkbd.c b/configs/mbed/src/lpc17_hidkbd.c similarity index 97% rename from configs/mbed/src/up_hidkbd.c rename to configs/mbed/src/lpc17_hidkbd.c index 4cf927e277..b13f8669ab 100644 --- a/configs/mbed/src/up_hidkbd.c +++ b/configs/mbed/src/lpc17_hidkbd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/mbed/src/up_hidkbd.c + * configs/mbed/src/lpc17_hidkbd.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,7 +47,7 @@ defined(CONFIG_EXAMPLES_HIDKBD) /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/configs/mbed/src/up_leds.c b/configs/mbed/src/lpc17_leds.c similarity index 99% rename from configs/mbed/src/up_leds.c rename to configs/mbed/src/lpc17_leds.c index 6119ec7585..206366e2f5 100644 --- a/configs/mbed/src/up_leds.c +++ b/configs/mbed/src/lpc17_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/mbed/src/up_leds.c + * configs/mbed/src/lpc17_leds.c * * Copyright (C) 2010, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -57,7 +57,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/mbed/src/up_nsh.c b/configs/mbed/src/lpc17_nsh.c similarity index 97% rename from configs/mbed/src/up_nsh.c rename to configs/mbed/src/lpc17_nsh.c index 4d7ac8b4e8..b8c3e90785 100644 --- a/configs/mbed/src/up_nsh.c +++ b/configs/mbed/src/lpc17_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/mbed/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/mbed/src/lpc17_nsh.c * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +47,7 @@ #include /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/mbed/src/up_pwm.c b/configs/mbed/src/lpc17_pwm.c similarity index 97% rename from configs/mbed/src/up_pwm.c rename to configs/mbed/src/lpc17_pwm.c index 569418052b..f994d93306 100644 --- a/configs/mbed/src/up_pwm.c +++ b/configs/mbed/src/lpc17_pwm.c @@ -1,7 +1,7 @@ /************************************************************************************ - * configs/mbed/up_pwm.c + * configs/mbed/lpc17_pwm.c * - * Based on onfigs/lpcexpresso-lpc1768/up_pwm.c + * Based on onfigs/lpcexpresso-lpc1768/lpc17_pwm.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +55,7 @@ #include "mbed_internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ #ifdef CONFIG_PWM diff --git a/configs/mbed/src/mbed_internal.h b/configs/mbed/src/mbed_internal.h index 947799d3c4..7aea71c8df 100644 --- a/configs/mbed/src/mbed_internal.h +++ b/configs/mbed/src/mbed_internal.h @@ -1,6 +1,5 @@ /************************************************************************************ * configs/mbed/src/mbed_internal.h - * arch/arm/src/board/mbed_internal.n * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +44,7 @@ #include /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* MBED GPIO Pin Definitions ********************************************************/