Review/modifications for change of last merge
This commit is contained in:
parent
e4b0df0431
commit
d9d530850a
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user