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

Review/modifications for change of last merge

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-31 14:10:53 -06:00
parent 399bfcbf94
commit de24a50eaa
11 changed files with 207 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/README.html
View File

@ -135,6 +135,8 @@
| | | `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/mirtoo/README.txt"><b><i>README.txt</i></b></a>
| | |- mt-db-x3//
| | | `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/mt-db-x3//README.txt"><b><i>README.txt</i></b></a>
| | |- moteino-mega/
| | | `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/moteino-mega/README.txt"><b><i>README.txt</i></b></a>
| | |- mx1ads/
| | | `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/mx1ads/README.txt"><b><i>README.txt</i></b></a>
| | |- ne64badge/

2
README.txt
View File

@ -1192,6 +1192,8 @@ nuttx
| | `- README.txt
| |- mt-db-x3/
| | `- README.txt
| |- moteino-mega/
| | `- README.txt
| |- mx1ads/
| | `- README.txt
| |- ne63badge/

5
arch/avr/include/atmega/irq.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/avr/include/atmega/irq.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -153,7 +153,8 @@
#ifndef __ASSEMBLY__
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C" {
extern "C"
{
#else
#define EXTERN extern
#endif

3
arch/avr/src/atmega/atmega_exceptions.S
View File

@ -1,7 +1,7 @@
/********************************************************************************************
* arch/avr/src/atmega/atmega_exceptions.S
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -206,4 +206,3 @@ up_interruptstack:
.size up_interruptstack, .-up_interruptstack
#endif
.end

2
arch/avr/src/atmega/atmega_head.S
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/avr/src/atmega/atmega_head.S
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

4
arch/avr/src/atmega/atmega_lowconsole.c
View File

@ -52,7 +52,7 @@
#include "atmega_internal.h"
/******************************************************************************
* Private Definitions
* Pre-processor Definitions
******************************************************************************/
/* USART0 Baud rate settings for normal and double speed modes */
@ -329,6 +329,7 @@ void usart0_configure(void)
DDRD |= (1 << 1); /* Force Port D pin 1 to be an output -- should not be necessary */
PORTD |= (1 << 0); /* Set pull-up on Port D pin 0 */
#else
/* Pin Configuration: None necessary, Port E bits 0&1 are automatically
* configured:
@ -471,4 +472,3 @@ void up_lowputc(char ch)
# endif
#endif
}

5
configs/README.txt
View File

@ -319,6 +319,11 @@ configs/mirtoo
This is the port to the DTX1-4000L "Mirtoo" module. This module uses MicroChip
PIC32MX250F128D. See http://www.dimitech.com/ for further information.
configs/moteino-mega
This is placeholder for the LowPowerLab MoteinoMEGA that is based
on the Atmel AVR ATMega1284P MCU. There is not much there yet and what is
there is untested due to tool-related issues.
configs/mx1ads
This is a port to the Motorola MX1ADS development board. That board
is based on the Freescale i.MX1 processor. The i.MX1 is an ARM920T.

3
configs/moteino-mega/include/board.h
View File

@ -83,7 +83,8 @@
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C" {
extern "C"
{
#else
#define EXTERN extern
#endif

7
configs/moteino-mega/src/moteino_mega_internal.h
View File

@ -63,7 +63,8 @@
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C" {
extern "C"
{
#else
#define EXTERN extern
#endif
@ -77,7 +78,7 @@ extern "C" {
************************************************************************************/
#if defined(CONFIG_AVR_SPI1) || defined(CONFIG_AVR_SPI2)
EXTERN void weak_function atmega_spiinitialize(void);
void weak_function atmega_spiinitialize(void);
#endif
/************************************************************************************
@ -89,7 +90,7 @@ EXTERN void weak_function atmega_spiinitialize(void);
************************************************************************************/
#ifdef CONFIG_ARCH_LEDS
EXTERN void atmega_ledinit(void);
void atmega_ledinit(void);
#endif
#undef EXTERN

4
configs/moteino-mega/src/up_boot.c
View File

@ -50,7 +50,7 @@
#include "moteino_mega_internal.h"
/************************************************************************************
* Definitions
* Pre-processor Definitions
************************************************************************************/
/************************************************************************************
@ -66,7 +66,7 @@
*
* Description:
* All ATMega architectures must provide the following entry point. This entry
* point is called early in the intitialization -- after all memory has been
* point is called early in the initialization -- after all memory has been
* configured and mapped but before any devices have been initialized.
*
************************************************************************************/

2
configs/moteino-mega/src/up_leds.c
View File

@ -52,7 +52,7 @@
#ifdef CONFIG_ARCH_LEDS
/****************************************************************************
* Definitions
* Pre-processor Definitions
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG