From 08670062554f1bdbf68b2d010c5b1ac1c5d6d659 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 14:05:26 -0600 Subject: [PATCH] NE64BADGE: Rename files for better conformance to naming conventions --- configs/ne64badge/src/Makefile | 24 +++++++++---------- .../ne64badge/src/{up_boot.c => m9s12_boot.c} | 4 ++-- .../src/{up_buttons.c => m9s12_buttons.c} | 2 +- .../ne64badge/src/{up_leds.c => m9s12_leds.c} | 2 +- .../ne64badge/src/{up_nsh.c => m9s12_nsh.c} | 5 ++-- .../ne64badge/src/{up_spi.c => m9s12_spi.c} | 5 ++-- configs/ne64badge/src/ne64badge_internal.h | 7 ++---- 7 files changed, 22 insertions(+), 27 deletions(-) rename configs/ne64badge/src/{up_boot.c => m9s12_boot.c} (96%) rename configs/ne64badge/src/{up_buttons.c => m9s12_buttons.c} (99%) rename configs/ne64badge/src/{up_leds.c => m9s12_leds.c} (99%) rename configs/ne64badge/src/{up_nsh.c => m9s12_nsh.c} (96%) rename configs/ne64badge/src/{up_spi.c => m9s12_spi.c} (98%) diff --git a/configs/ne64badge/src/Makefile b/configs/ne64badge/src/Makefile index 0e391489a7..74c95f3c80 100644 --- a/configs/ne64badge/src/Makefile +++ b/configs/ne64badge/src/Makefile @@ -35,26 +35,26 @@ -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_leds.c up_buttons.c up_spi.c +CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c ifeq ($(CONFIG_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += m9s12_nsh.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}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" else - CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common + CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common endif all: libboard$(LIBEXT) diff --git a/configs/ne64badge/src/up_boot.c b/configs/ne64badge/src/m9s12_boot.c similarity index 96% rename from configs/ne64badge/src/up_boot.c rename to configs/ne64badge/src/m9s12_boot.c index f5b0a0199e..2abb0c670e 100644 --- a/configs/ne64badge/src/up_boot.c +++ b/configs/ne64badge/src/m9s12_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/ne64badge/src/up_boot.c + * configs/ne64badge/src/m9s12_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -63,7 +63,7 @@ * * Description: * All HCS12 architectures must provide the following entry point. This entry point - * is called early in the intitialization -- after all memory has been configured + * is called early in the initialization -- after all memory has been configured * and mapped but before any devices have been initialized. * ************************************************************************************/ diff --git a/configs/ne64badge/src/up_buttons.c b/configs/ne64badge/src/m9s12_buttons.c similarity index 99% rename from configs/ne64badge/src/up_buttons.c rename to configs/ne64badge/src/m9s12_buttons.c index 3de13c8bde..f53ac6a1e1 100644 --- a/configs/ne64badge/src/up_buttons.c +++ b/configs/ne64badge/src/m9s12_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/ne64badge/src/board_buttons.c + * configs/ne64badge/src/m9s12_buttons.c * * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/ne64badge/src/up_leds.c b/configs/ne64badge/src/m9s12_leds.c similarity index 99% rename from configs/ne64badge/src/up_leds.c rename to configs/ne64badge/src/m9s12_leds.c index 1da92abd5e..a118a1615d 100644 --- a/configs/ne64badge/src/up_leds.c +++ b/configs/ne64badge/src/m9s12_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/ne64badge/src/up_leds.c + * configs/ne64badge/src/m9s12_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/ne64badge/src/up_nsh.c b/configs/ne64badge/src/m9s12_nsh.c similarity index 96% rename from configs/ne64badge/src/up_nsh.c rename to configs/ne64badge/src/m9s12_nsh.c index b0cbbd635e..0ccc7295a2 100644 --- a/configs/ne64badge/src/up_nsh.c +++ b/configs/ne64badge/src/m9s12_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/ne64badge/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/ne64badge/src/m9s12_nsh.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,7 +46,7 @@ #include "ne64badge_internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/configs/ne64badge/src/up_spi.c b/configs/ne64badge/src/m9s12_spi.c similarity index 98% rename from configs/ne64badge/src/up_spi.c rename to configs/ne64badge/src/m9s12_spi.c index eea74916a1..604fa0cd57 100644 --- a/configs/ne64badge/src/up_spi.c +++ b/configs/ne64badge/src/m9s12_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/ne64badge/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/ne64badge/src/m9s12_spi.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -52,7 +51,7 @@ #if defined(CONFIG_HCS12_SPI) /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/ne64badge/src/ne64badge_internal.h b/configs/ne64badge/src/ne64badge_internal.h index 02d64f2c11..e89cb9bd8e 100644 --- a/configs/ne64badge/src/ne64badge_internal.h +++ b/configs/ne64badge/src/ne64badge_internal.h @@ -1,6 +1,5 @@ /************************************************************************************ * configs/ne64badge/src/ne64badge_internal.h - * arch/arm/src/board/ne64badge_internal.n * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,7 +46,7 @@ #include "m9s12_internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* NE64BADGE Pin Usage **************************************************************/ @@ -186,9 +185,7 @@ * ************************************************************************************/ -extern void weak_function hcs12_spiinitialize(void); - +void weak_function hcs12_spiinitialize(void); #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_NE64BADGE_SRC_NE64BADGE_INTERNAL_H */ -