From 457552e15d5b0579b65d7418a508b3591eee8831 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 13:56:50 -0600 Subject: [PATCH] Kwikstick-K40: Rename files for better conformance to naming conventions --- configs/kwikstik-k40/src/Makefile | 34 +++++++++---------- .../src/{up_boot.c => k40_boot.c} | 2 +- .../src/{up_buttons.c => k40_buttons.c} | 2 +- .../kwikstik-k40/src/{up_lcd.c => k40_lcd.c} | 6 ++-- .../src/{up_leds.c => k40_leds.c} | 2 +- .../kwikstik-k40/src/{up_nsh.c => k40_nsh.c} | 5 ++- .../kwikstik-k40/src/{up_spi.c => k40_spi.c} | 5 ++- .../src/{up_usbdev.c => k40_usbdev.c} | 6 ++-- .../src/{up_usbmsc.c => k40_usbmsc.c} | 4 +-- 9 files changed, 30 insertions(+), 36 deletions(-) rename configs/kwikstik-k40/src/{up_boot.c => k40_boot.c} (99%) rename configs/kwikstik-k40/src/{up_buttons.c => k40_buttons.c} (99%) rename configs/kwikstik-k40/src/{up_lcd.c => k40_lcd.c} (98%) rename configs/kwikstik-k40/src/{up_leds.c => k40_leds.c} (99%) rename configs/kwikstik-k40/src/{up_nsh.c => k40_nsh.c} (98%) rename configs/kwikstik-k40/src/{up_spi.c => k40_spi.c} (98%) rename configs/kwikstik-k40/src/{up_usbdev.c => k40_usbdev.c} (98%) rename configs/kwikstik-k40/src/{up_usbmsc.c => k40_usbmsc.c} (98%) diff --git a/configs/kwikstik-k40/src/Makefile b/configs/kwikstik-k40/src/Makefile index e4edfb0c52..9dc769bb0d 100644 --- a/configs/kwikstik-k40/src/Makefile +++ b/configs/kwikstik-k40/src/Makefile @@ -35,45 +35,45 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched -ASRCS = -AOBJS = $(ASRCS:.S=$(OBJEXT)) +ASRCS = +AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_boot.c up_lcd.c up_spi.c +CSRCS = k40_boot.c k40_lcd.c k40_spi.c ifeq ($(CONFIG_ARCH_LEDS),y) -CSRCS += up_leds.c +CSRCS += k40_leds.c endif ifeq ($(CONFIG_ARCH_BUTTONS),y) -CSRCS += up_buttons.c +CSRCS += k40_buttons.c endif ifeq ($(CONFIG_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += k40_nsh.c endif ifeq ($(CONFIG_USBDEV),y) -CSRCS += up_usbdev.c +CSRCS += k40_usbdev.c endif ifeq ($(CONFIG_USBMSC),y) -CSRCS += up_usbmsc.c +CSRCS += k40_usbmsc.c endif -COBJS = $(CSRCS:.c=$(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/kwikstik-k40/src/up_boot.c b/configs/kwikstik-k40/src/k40_boot.c similarity index 99% rename from configs/kwikstik-k40/src/up_boot.c rename to configs/kwikstik-k40/src/k40_boot.c index 06f829bda7..dea0016541 100644 --- a/configs/kwikstik-k40/src/up_boot.c +++ b/configs/kwikstik-k40/src/k40_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/kwikstik-k40/src/up_boot.c + * configs/kwikstik-k40/src/k40_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/kwikstik-k40/src/up_buttons.c b/configs/kwikstik-k40/src/k40_buttons.c similarity index 99% rename from configs/kwikstik-k40/src/up_buttons.c rename to configs/kwikstik-k40/src/k40_buttons.c index e9b8e3e0dd..50f248f597 100644 --- a/configs/kwikstik-k40/src/up_buttons.c +++ b/configs/kwikstik-k40/src/k40_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/kwikstik-k40/src/board_buttons.c + * configs/kwikstik-k40/src/k40_buttons.c * * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/kwikstik-k40/src/up_lcd.c b/configs/kwikstik-k40/src/k40_lcd.c similarity index 98% rename from configs/kwikstik-k40/src/up_lcd.c rename to configs/kwikstik-k40/src/k40_lcd.c index 2e28701af5..30139b94e6 100644 --- a/configs/kwikstik-k40/src/up_lcd.c +++ b/configs/kwikstik-k40/src/k40_lcd.c @@ -1,6 +1,5 @@ /************************************************************************************** - * configs/kwikstik-k40/src/up_lcd.c - * arch/arm/src/board/up_lcd.c + * configs/kwikstik-k40/src/k40_lcd.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -71,7 +70,7 @@ **************************************************************************************/ /************************************************************************************** - * Private Function Protototypes + * Private Function Prototypes **************************************************************************************/ /************************************************************************************** @@ -131,4 +130,3 @@ void up_lcduninitialize(void) { #warning "Missing logic" } - diff --git a/configs/kwikstik-k40/src/up_leds.c b/configs/kwikstik-k40/src/k40_leds.c similarity index 99% rename from configs/kwikstik-k40/src/up_leds.c rename to configs/kwikstik-k40/src/k40_leds.c index 1120d07c7c..f5806dc45e 100644 --- a/configs/kwikstik-k40/src/up_leds.c +++ b/configs/kwikstik-k40/src/k40_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/kwikstik-k40/src/up_leds.c + * configs/kwikstik-k40/src/k40_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/kwikstik-k40/src/up_nsh.c b/configs/kwikstik-k40/src/k40_nsh.c similarity index 98% rename from configs/kwikstik-k40/src/up_nsh.c rename to configs/kwikstik-k40/src/k40_nsh.c index 42885d12f4..ec7de573d8 100644 --- a/configs/kwikstik-k40/src/up_nsh.c +++ b/configs/kwikstik-k40/src/k40_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/kwikstik-k40/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/kwikstik-k40/src/k40_nsh.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -54,7 +53,7 @@ #include "kwikstik-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/kwikstik-k40/src/up_spi.c b/configs/kwikstik-k40/src/k40_spi.c similarity index 98% rename from configs/kwikstik-k40/src/up_spi.c rename to configs/kwikstik-k40/src/k40_spi.c index acb1ca1c9d..ac7c2de507 100644 --- a/configs/kwikstik-k40/src/up_spi.c +++ b/configs/kwikstik-k40/src/k40_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/kwikstik-k40/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/kwikstik-k40/src/k40_spi.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2) /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/kwikstik-k40/src/up_usbdev.c b/configs/kwikstik-k40/src/k40_usbdev.c similarity index 98% rename from configs/kwikstik-k40/src/up_usbdev.c rename to configs/kwikstik-k40/src/k40_usbdev.c index 38e3413c7a..1dca3f0033 100644 --- a/configs/kwikstik-k40/src/up_usbdev.c +++ b/configs/kwikstik-k40/src/k40_usbdev.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/kwikstik-k40/src/up_usbdev.c - * arch/arm/src/board/up_boot.c + * configs/kwikstik-k40/src/k40_usbdev.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -53,7 +52,7 @@ #include "kwikstik-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ @@ -112,4 +111,3 @@ void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume) ulldbg("resume: %d\n", resume); #warning "Missing logic" } - diff --git a/configs/kwikstik-k40/src/up_usbmsc.c b/configs/kwikstik-k40/src/k40_usbmsc.c similarity index 98% rename from configs/kwikstik-k40/src/up_usbmsc.c rename to configs/kwikstik-k40/src/k40_usbmsc.c index 2aa39fd9cd..1eeaad4071 100644 --- a/configs/kwikstik-k40/src/up_usbmsc.c +++ b/configs/kwikstik-k40/src/k40_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/kwikstik-k40/src/up_usbmsc.c + * configs/kwikstik-k40/src/k40_usbmsc.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,7 +51,7 @@ #include "kinetis_internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/