sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Arduino-Atmega2560: Updates from review of merge plus name changes to be consistent with the new conventions that I am trying to establish

Browse Source
This commit is contained in:
Gregory Nutt 2015-12-29 12:36:59 -06:00
parent 321d8f1441
commit 9bde162fd6
6 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/arduino-mega2560/README.txt
View File

@ -20,4 +20,3 @@ http://www.atmel.com/tools/atmelavrtoolchainforwindows.aspx
It is basically WinAVR compatible so sub-projects may define WinAVR as a It is basically WinAVR compatible so sub-projects may define WinAVR as a
tool-chain but specify path to the Atmel AVR8 in path. See tool-chain but specify path to the Atmel AVR8 in path. See
arduino-mega2560/hello for example. arduino-mega2560/hello for example.

3
configs/arduino-mega2560/include/board.h
View File

@ -1,8 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/arduino-mega2560/include/board.h * configs/arduino-mega2560/include/board.h
* include/arch/board/board.h
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

14
configs/arduino-mega2560/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/arduino-mega2560/src/Makefile # configs/arduino-mega2560/src/Makefile
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2015 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -35,11 +35,11 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
ASRCS = ASRCS =
CSRCS = up_boot.c CSRCS = avr_boot.c
ifeq ($(CONFIG_ARCH_LEDS),y) ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += up_leds.c CSRCS += avr_leds.c
endif endif
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))
@ -58,14 +58,14 @@ endif
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}" CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)/atmega2560}" CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)/atmega2560}"
else else
CFLAGS += -I "$(TOPDIR)/sched" CFLAGS += -I "$(TOPDIR)/sched"
CFLAGS += -I "$(ARCH_SRCDIR)/chip" CFLAGS += -I "$(ARCH_SRCDIR)/chip"
CFLAGS += -I "$(ARCH_SRCDIR)/common" CFLAGS += -I "$(ARCH_SRCDIR)/common"
CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)" CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)"
CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)/atmega2560" CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)/atmega2560"
endif endif

6
configs/arduino-mega2560/src/arduino_mega2560_internal.h → configs/arduino-mega2560/src/arduino_mega2560.h
View File

@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_INTERNAL_H #ifndef __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H
#define __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_INTERNAL_H #define __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -74,4 +74,4 @@ void atmega_led_initialize(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_INTERNAL_H */ #endif /* __CONFIGS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H */

13
configs/arduino-mega2560/src/up_boot.c → configs/arduino-mega2560/src/avr_boot.c
View File

@ -1,7 +1,7 @@
/****************************************************************************** /******************************************************************************
* configs/arduino-mega2560/src/up_boot.c * configs/arduino-mega2560/src/avr_boot.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -47,7 +47,7 @@
#include "up_internal.h" #include "up_internal.h"
#include "atmega_internal.h" #include "atmega_internal.h"
#include "arduino_mega2560_internal.h" #include "arduino_mega2560.h"
/****************************************************************************** /******************************************************************************
* Definitions * Definitions
@ -65,9 +65,9 @@
* Name: up_boardinitialize * Name: up_boardinitialize
* *
* Description: * Description:
* All ATMega architectures must provide the following entry point. * All ATMega architectures must provide the following entry point.
* This entry point is called early in the intitialization -- after all * This entry point is called early in the intitialization -- after all
* memory has been configured and mapped but before any devices have been * memory has been configured and mapped but before any devices have been
* initialized. * initialized.
* *
******************************************************************************/ ******************************************************************************/
@ -80,4 +80,3 @@ void atmega_boardinitialize(void)
atmega_led_initialize(); atmega_led_initialize();
#endif #endif
} }

9
configs/arduino-mega2560/src/up_leds.c → configs/arduino-mega2560/src/avr_leds.c
View File

@ -1,7 +1,7 @@
/****************************************************************************** /******************************************************************************
* configs/arduino-mega2560/src/up_boot.c * configs/arduino-mega2560/src/avr_leds.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -47,7 +47,7 @@
#include "up_internal.h" #include "up_internal.h"
#include "atmega2560_internal.h" #include "atmega2560_internal.h"
#include "arduino_mega2560_internal.h" #include "arduino_mega2560.h"
/**************************************************************************** /****************************************************************************
* Name: board_autoled_initialize * Name: board_autoled_initialize
@ -73,4 +73,5 @@ void board_autoled_on(int led)
void board_autoled_off(int led) void board_autoled_off(int led)
{ {
} }
#endoif
#endif /* CONFIG_ARCH_LEDS */