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

AVR: Need to use rjmp, not jmp, in vector table

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3707 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-06-15 20:43:32 +00:00
parent 2552ab4cb1
commit 0077d0a70d
4 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/avr/src/at90usb/at90usb_head.S
View File

@ -119,7 +119,7 @@
****************************************************************************/
.macro vector name
jmp \name
rjmp \name
.endm
/****************************************************************************

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

@ -116,7 +116,7 @@
****************************************************************************/
.macro vector name
jmp \name
rjmp \name
.endm
/****************************************************************************

43
arch/avr/src/atmega/atmega_lowinit.c
View File

@ -47,6 +47,28 @@
* Private Definitions
**************************************************************************/
#if defined(CONFIG_WDTO_15MS)
# define WDTO_VALUE WDTO_15MS
#elif defined(CONFIG_WDTO_30MS)
# define WDTO_VALUE WDTO_30MS
#elif defined(CONFIG_WDTO_60MS)
# define WDTO_VALUE WDTO_60MS
#elif defined(CONFIG_WDTO_120MS)
# define WDTO_VALUE WDTO_120MS
#elif defined(CONFIG_WDTO_1250MS)
# define WDTO_VALUE WDTO_250MS
#elif defined(CONFIG_WDTO_500MS)
# define WDTO_VALUE WDTO_500MS
#elif defined(CONFIG_WDTO_1S)
# define WDTO_VALUE WDTO_1S
#elif defined(CONFIG_WDTO_2S)
# define WDTO_VALUE WDTO_2S
#elif defined(CONFIG_WDTO_4S)
# define WDTO_VALUE WDTO_4S
#else /* if defined(CONFIG_WDTO_8S) */
# define WDTO_VALUE WDTO_8S
#endif
/**************************************************************************
* Private Types
**************************************************************************/
@ -67,6 +89,23 @@
* Private Functions
**************************************************************************/
/**************************************************************************
* Name: up_wdtinit
*
* Description:
* Initialize the watchdog per the NuttX configuration.
*
**************************************************************************/
static inline void up_wdtinit(void)
{
#ifndef CONFIG_AVR_WDT
wdt_disable();
#else
wdt_enable(WDTO_VALUE);
#endif
}
/**************************************************************************
* Public Functions
**************************************************************************/
@ -83,6 +122,10 @@
void up_lowinit(void)
{
/* Initialize the watchdog timer */
up_wdtinit();
/* Initialize a console (probably a serial console) */
up_consoleinit();

17
configs/amber/README.txt
View File

@ -446,6 +446,7 @@ Amber Web Server Configuration Options
CONFIG_AVR_INT5=n
CONFIG_AVR_INT6=n
CONFIG_AVR_INT7=n
CONFIG_AVR_WDT=n
CONFIG_AVR_TIMER0=n
CONFIG_AVR_TIMER1=n
CONFIG_AVR_TIMER2=n
@ -457,7 +458,21 @@ Amber Web Server Configuration Options
CONFIG_AVR_ANACOMP=n
CONFIG_AVR_TWI=n
ATMEGA specific device driver settings
If the watchdog is enabled, this specifies the initial timeout. Default
is maximum supported value.
CONFIG_WDTO_15MS
CONFIG_WDTO_30MS
CONFIG_WDTO_60MS
CONFIG_WDTO_120MS
CONFIG_WDTO_1250MS
CONFIG_WDTO_500MS
CONFIG_WDTO_1S
CONFIG_WDTO_2S
CONFIG_WDTO_4S
CONFIG_WDTO_8S
ATMEGA specific device driver settings
CONFIG_USARTn_SERIAL_CONSOLE - selects the USARTn for the
console and ttys0 (default is the USART0).