More AVR context switching logic

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3683 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 48 insertions, 34 deletions

diff --git a/nuttx/arch/avr/src/at90usb/Make.defs b/nuttx/arch/avr/src/at90usb/Make.defs
index a206f4f6f..dcff056b5 100644
--- a/nuttx/arch/avr/src/at90usb/Make.defs
+++ b/nuttx/arch/avr/src/at90usb/Make.defs
@@ -40,12 +40,20 @@ HEAD_ASRC	= at90usb_head.S
 # Common AVR files
 
 CMN_ASRCS	= up_switchcontext.S
-CMN_CSRCS	= up_allocateheap.c up_copystate.c up_createstack.c up_exit.c \
-			  up_idle.c up_initialize.c up_interruptcontext.c up_lowputs.c \
-			  up_mdelay.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \
-			  up_puts.c up_releasestack.c up_udelay.c up_usestack.c
+CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
+			  up_createstack.c up_doirq.c up_exit.c  up_idle.c up_initialize.c \
+			  up_interruptcontext.c up_lowputs.c up_mdelay.c up_modifyreg8.c \
+			  up_modifyreg16.c up_modifyreg32.c up_puts.c up_releasepending.c \
+			  up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c \
+			  up_sigdeliver.c up_udelay.c up_unblocktask.c up_usestack.c
 
-# Required aT90USB files
+# Configuration-dependent common files
+
+ifeq ($(CONFIG_ARCH_STACKDUMP),y)
+CMN_CSRCS	+= up_dumpstate.c
+endif
+
+# Required AT90USB files
 
 CHIP_ASRCS	= at90usb_exceptions.S
 CHIP_CSRCS	= 
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_exceptions.S b/nuttx/arch/avr/src/at90usb/at90usb_exceptions.S
index 748fd5efc..862ea06ae 100755
--- a/nuttx/arch/avr/src/at90usb/at90usb_exceptions.S
+++ b/nuttx/arch/avr/src/at90usb/at90usb_exceptions.S
@@ -64,43 +64,43 @@
 

 	.section .handlers, "ax", @progbits

 

-	HANDLER	at90usb_int0, ATMEGA_IRQ_INT0, excpt_common			/* External interrupt request 0 */

-	HANDLER	at90usb_int1, ATMEGA_IRQ_INT1, excpt_common			/* External interrupt request 1 */

-	HANDLER	at90usb_int2, ATMEGA_IRQ_INT2, excpt_common			/* External interrupt request 2 */

-	HANDLER	at90usb_int3, ATMEGA_IRQ_INT3, excpt_common			/* External interrupt request 3 */

-	HANDLER	at90usb_int4, ATMEGA_IRQ_INT4, excpt_common			/* External interrupt request 4 */

-	HANDLER	at90usb_int5, ATMEGA_IRQ_INT5, excpt_common			/* External interrupt request 5 */

-	HANDLER	at90usb_int6, ATMEGA_IRQ_INT6, excpt_common			/* External interrupt request 6 */

-	HANDLER	at90usb_int7, ATMEGA_IRQ_INT7, excpt_common			/* External interrupt request 7 */

+	HANDLER	at90usb_int0, AT90USB_IRQ_INT0, excpt_common		/* External interrupt request 0 */

+	HANDLER	at90usb_int1, AT90USB_IRQ_INT1, excpt_common		/* External interrupt request 1 */

+	HANDLER	at90usb_int2, AT90USB_IRQ_INT2, excpt_common		/* External interrupt request 2 */

+	HANDLER	at90usb_int3, AT90USB_IRQ_INT3, excpt_common		/* External interrupt request 3 */

+	HANDLER	at90usb_int4, AT90USB_IRQ_INT4, excpt_common		/* External interrupt request 4 */

+	HANDLER	at90usb_int5, AT90USB_IRQ_INT5, excpt_common		/* External interrupt request 5 */

+	HANDLER	at90usb_int6, AT90USB_IRQ_INT6, excpt_common		/* External interrupt request 6 */

+	HANDLER	at90usb_int7, AT90USB_IRQ_INT7, excpt_common		/* External interrupt request 7 */

 	HANDLER	at90usb_pcint0, AT90USB_IRQ_PCINT0, excpt_common	/* Pin Change Interrupt Request 0 */

 	HANDLER	at90usb_usbgen, AT90USB_IRQ_USBGEN, excpt_common	/* USB General USB General Interrupt request */

 	HANDLER	at90usb_usbep, AT90USB_IRQ_USBEP, excpt_common		/* USB Endpoint/Pipe USB ENdpoint/Pipe Interrupt request */

 	HANDLER	at90usb_wdt, AT90USB_IRQ_WDT, excpt_common			/* Watchdog Time-out Interrupt */

 	HANDLER	at90usb_t2compa, AT90USB_IRQ_T2COMPA, excpt_common	/* TIMER2 COMPA Timer/Counter2 Compare Match A */

 	HANDLER	at90usb_t2compb, AT90USB_IRQ_T2COMPB, excpt_common	/* TIMER2 COMPA Timer/Counter2 Compare Match B */

-	HANDLER	at90usb_t2ovf, ATMEGA_IRQ_T2OVF, excpt_common		/* TIMER2 OVF timer/counter2 overflow */

-	HANDLER	at90usb_t1capt, ATMEGA_IRQ_T1CAPT, excpt_common		/* TIMER1 CAPT timer/counter1 capture event */

-	HANDLER	at90usb_t1compa, ATMEGA_IRQ_T1COMPA, excpt_common	/* TIMER1 COMPA timer/counter1 compare match A */

-	HANDLER	at90usb_t1compb, ATMEGA_IRQ_T1COMPB, excpt_common	/* TIMER1 COMPB timer/counter1 compare match B */

-	HANDLER	at90usb_t1compc, ATMEGA_IRQ_T1COMPC, excpt_common	/* TIMER1 COMPC timer/counter1 compare match C */

-	HANDLER	at90usb_t1ovf, ATMEGA_IRQ_T1OVF, excpt_common		/* TIMER1 OVF timer/counter1 overflow */

+	HANDLER	at90usb_t2ovf, AT90USB_IRQ_T2OVF, excpt_common		/* TIMER2 OVF timer/counter2 overflow */

+	HANDLER	at90usb_t1capt, AT90USB_IRQ_T1CAPT, excpt_common	/* TIMER1 CAPT timer/counter1 capture event */

+	HANDLER	at90usb_t1compa, AT90USB_IRQ_T1COMPA, excpt_common	/* TIMER1 COMPA timer/counter1 compare match A */

+	HANDLER	at90usb_t1compb, AT90USB_IRQ_T1COMPB, excpt_common	/* TIMER1 COMPB timer/counter1 compare match B */

+	HANDLER	at90usb_t1compc, AT90USB_IRQ_T1COMPC, excpt_common	/* TIMER1 COMPC timer/counter1 compare match C */

+	HANDLER	at90usb_t1ovf, AT90USB_IRQ_T1OVF, excpt_common		/* TIMER1 OVF timer/counter1 overflow */

 	HANDLER	at90usb_t0compa, AT90USB_IRQ_T0COMPA, excpt_common	/* TIMER0 COMPA Timer/Counter0 Compare Match A */

 	HANDLER	at90usb_t0compb, AT90USB_IRQ_T0COMPB, excpt_common	/* TIMER0 COMPB Timer/Counter0 Compare Match B */

-	HANDLER	at90usb_t0ovf, ATMEGA_IRQ_T0OVF, excpt_common		/* TIMER0 OVF timer/counter0 overflow */

-	HANDLER	at90usb_spi, ATMEGA_IRQ_SPI, excpt_common			/* STC SPI serial transfer complete */

-	HANDLER	at90usb_u1rx, ATMEGA_IRQ_U1RX, excpt_common			/* USART1 RX complete */

-	HANDLER	at90usb_u1dre, ATMEGA_IRQ_U1DRE, excpt_common		/* USART1 data register empty */

-	HANDLER	at90usb_u1tx, ATMEGA_IRQ_U1TX, excpt_common			/* USART1 TX complete */

-	HANDLER	at90usb_anacomp, ATMEGA_IRQ_ANACOMP, excpt_common	/* ANALOG COMP analog comparator */

-	HANDLER	at90usb_adc, ATMEGA_IRQ_ADC, excpt_common			/* ADC conversion complete */

-	HANDLER	at90usb_ee, ATMEGA_IRQ_EE, excpt_common				/* EEPROM ready */

-	HANDLER	at90usb_t3capt, ATMEGA_IRQ_T3CAPT, excpt_common		/* TIMER3 CAPT timer/counter3 capture event */

-	HANDLER	at90usb_t3compa, ATMEGA_IRQ_T3COMPA, excpt_common	/* TIMER3 COMPA timer/counter3 compare match a */

-	HANDLER	at90usb_t3compb, ATMEGA_IRQ_T3COMPB, excpt_common	/* TIMER3 COMPB timer/counter3 compare match b */

-	HANDLER	at90usb_t3compc, ATMEGA_IRQ_T3COMPC, excpt_common	/* TIMER3 COMPC timer/counter3 compare match c */

-	HANDLER	at90usb_t3ovf, ATMEGA_IRQ_T3OVF, excpt_common		/* TIMER3 OVF timer/counter3 overflow */

-	HANDLER	at90usb_twi, ATMEGA_IRQ_TWI, excpt_common			/* TWI two-wire serial interface */

-	HANDLER	at90usb_spmrdy, ATMEGA_IRQ_SPMRDY, excpt_common		/* Store program memory ready */

+	HANDLER	at90usb_t0ovf, AT90USB_IRQ_T0OVF, excpt_common		/* TIMER0 OVF timer/counter0 overflow */

+	HANDLER	at90usb_spi, AT90USB_IRQ_SPI, excpt_common			/* STC SPI serial transfer complete */

+	HANDLER	at90usb_u1rx, AT90USB_IRQ_U1RX, excpt_common		/* USART1 RX complete */

+	HANDLER	at90usb_u1dre, AT90USB_IRQ_U1DRE, excpt_common		/* USART1 data register empty */

+	HANDLER	at90usb_u1tx, AT90USB_IRQ_U1TX, excpt_common		/* USART1 TX complete */

+	HANDLER	at90usb_anacomp, AT90USB_IRQ_ANACOMP, excpt_common	/* ANALOG COMP analog comparator */

+	HANDLER	at90usb_adc, AT90USB_IRQ_ADC, excpt_common			/* ADC conversion complete */

+	HANDLER	at90usb_ee, AT90USB_IRQ_EE, excpt_common			/* EEPROM ready */

+	HANDLER	at90usb_t3capt, AT90USB_IRQ_T3CAPT, excpt_common	/* TIMER3 CAPT timer/counter3 capture event */

+	HANDLER	at90usb_t3compa, AT90USB_IRQ_T3COMPA, excpt_common	/* TIMER3 COMPA timer/counter3 compare match a */

+	HANDLER	at90usb_t3compb, AT90USB_IRQ_T3COMPB, excpt_common	/* TIMER3 COMPB timer/counter3 compare match b */

+	HANDLER	at90usb_t3compc, AT90USB_IRQ_T3COMPC, excpt_common	/* TIMER3 COMPC timer/counter3 compare match c */

+	HANDLER	at90usb_t3ovf, AT90USB_IRQ_T3OVF, excpt_common		/* TIMER3 OVF timer/counter3 overflow */

+	HANDLER	at90usb_twi, AT90USB_IRQ_TWI, excpt_common			/* TWI two-wire serial interface */

+	HANDLER	at90usb_spmrdy, AT90USB_IRQ_SPMRDY, excpt_common	/* Store program memory ready */

 

 /* Common exception handling logic. */

 

diff --git a/nuttx/arch/avr/src/at90usb/at90usb_head.S b/nuttx/arch/avr/src/at90usb/at90usb_head.S
index 16d4abcc1..f951bac1d 100755
--- a/nuttx/arch/avr/src/at90usb/at90usb_head.S
+++ b/nuttx/arch/avr/src/at90usb/at90usb_head.S
@@ -193,6 +193,9 @@ __start:
 

 	/* Copy initial global data values from FLASH into RAM */

 

+    .global __do_copy_data;     /* Required to suppress dragging in logic from libgcc */

+__do_copy_data:

+

 #ifdef HAVE_RAMPZ

 	ldi		r17, hi8(_edata)

 	ldi		r26, lo8(_sdata)

@@ -230,6 +233,9 @@ __start:
 

 	/* Clear uninitialized data */

 

+    .global __do_clear_bss;     /* Required to suppress dragging in logic from libgcc */

+__do_clear_bss:

+

 	ldi		r17, hi8(_ebss)

 	ldi		r26, lo8(_sbss)

 	ldi		r27, hi8(_sbss)