sergiotarxz/nuttx
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 e4b0df0431
commit d9d530850a
4 changed files with 189 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/avr/include/atmega/irq.h * 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> * 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
@ -153,7 +153,8 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef __cplusplus #ifdef __cplusplus
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif

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

@ -1,7 +1,7 @@
/******************************************************************************************** /********************************************************************************************
* arch/avr/src/atmega/atmega_exceptions.S * 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> * 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
@ -206,4 +206,3 @@ up_interruptstack:
.size up_interruptstack, .-up_interruptstack .size up_interruptstack, .-up_interruptstack
#endif #endif
.end .end

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

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/avr/src/atmega/atmega_head.S * 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> * 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

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

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