AT90USB port is basically functional

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3715 7fd9a85b-ad96-42d3-883c-3090e2eb8679

3 files changed, 52 insertions, 29 deletions

diff --git a/nuttx/arch/avr/src/avr/excptmacros.h b/nuttx/arch/avr/src/avr/excptmacros.h
index 140d3d467e..0cc8902d8f 100755
--- a/nuttx/arch/avr/src/avr/excptmacros.h
+++ b/nuttx/arch/avr/src/avr/excptmacros.h
@@ -159,7 +159,7 @@
 
 	/* Save R1 -- the zero register (which may not be zero).  R1 must be zero for our purposes */
 
-    push    r1
+	push	r1
 	clr		r1
 
 	/* Save r2-r17 - Call-saved, "static" registers */
@@ -325,7 +325,12 @@
 
 	.macro	USER_SAVE
 
-	/* Save the current stack pointer (SPH then SPL). */
+	/* Pop the return address from the stack (PCH then PCL).  R18:19 are Call-used */
+
+	pop		r19			/* r19=PCH */
+	pop		r18			/* r18=PCL */
+
+	/* Save the current stack pointer  as it would be after the return(SPH then SPL). */
 
 	in		r25, _SFR_IO_ADDR(SPH)
 	st		x+, r25
@@ -341,9 +346,10 @@
 	st		x+, r29
 	st		x+, r28
 
-	/* Skip over r18-r27 - Call-used, "volatile" registers (r26-r27 have been skipped) */
+	/* Skip over r18-r27 - Call-used, "volatile" registers (r26-r27 have
+	 * already been skipped, r24 is saved elsewhere) */
 
-	adiw	r26, 8		/* Eight registers: r18-r25 */
+	adiw	r26, 7		/* Seven registers: r18-23, r25 */
 
 	/* Save r2-r17 - Call-saved, "static" registers */
 
@@ -378,12 +384,10 @@
 
 	adiw	r26, 2		/* Two registers: r0, r24 */
 
-	/* Pop and save the return address */
+	/* Save the return address that we have saved in r18:19*/
 
-	pop		r0
-	st		x+, r0
-	pop		r0
-	st		x+, r0
+	st		x+, r19		/* r19=PCH */
+	st		x+, r18		/* r18=PCL */
 	.endm
 
 /********************************************************************************************
@@ -400,13 +404,21 @@
  *
  * On completion:
  *	All registers restored except for the PC with now resides at the top of the new stack
- *  so that iret can be used to switch to the new context.
+ *	so that ret can be used to switch to the new context. (ret, not reti, becaue ret
+ * 	will preserve the restored interrupt state).
  *
  ********************************************************************************************/
 
 	.macro	TCB_RESTORE, regs
 
-	/* Fetch the new stack pointer */
+	/* X [r36:27] points to the resister save block.  Get an offset pointer to the PC in
+	 * Y [r28:29]
+	 */
+
+	movw	r28, r26			/* Get a pointer to the PCH/PCL storage location */
+	adiw	r28, REG_PCH
+
+	/* Fetch and set the new stack pointer */
 
 	ld		r25, x+				/* Fetch stack pointer (post-incrementing) */
 	out		_SFR_IO_ADDR(SPH), r25		/* (SPH then SPL) */       
@@ -414,23 +426,31 @@
 	out		_SFR_IO_ADDR(SPL), r24
  
 	/* Fetch the return address and save it at the bottom of the new stack so
-	 * that we can iret to switch contexts.
+	 * that we can iret to switch contexts.  The new stack is now:
+	 *
+	 *  PCL
+	 *  PCH
+	 *  --- <- SP
 	 */
 
-	movw	r28, r26			/* Get a pointer to the PCH/PCL storage location */
-	adiw	r28, REG_PCH
-	ld		r25, y+				/* Load PCH (r25) and PCL (r24) */
+	ld		r25, y+				/* Load PCH (r25) then PCL (r24) */
 	ld		r24, y+
 	push	r24					/* Push PCH and PCL on the stack (PCL then PCH) */
 	push	r25
 
 	/* Then get value of X [r26:r27].  Save X on the new stack where we can
-	 * recover it later.
+	 * recover it later.  The new stack is now:
+	 *
+	 *  PCL
+	 *  PCH
+	 *  R26
+	 *  R27
+	 *  --- <- SP
 	 */
 
 	ld		r25, x+				/* Fetch r26-r27 and save to the new stack */
 	ld		r24, x+
-	push	r24
+	push	r24					/* r26 then r27 */
 	push	r25
 
 	/* Restore r30-r31 - Call-used, "volatile" registers */
@@ -474,7 +494,7 @@
 	ld		r3, x+
 	ld		r2, x+
 
-	/* Restore r1 - The "scratch" register */
+	/* Restore r1 - zero register (which may not be zero) */
 
 	ld		r1, x+
 
@@ -483,16 +503,17 @@
 	ld		r0, x+
 	out		_SFR_IO_ADDR(SREG), r0
 
-	/* Restore r0 and r241 - The scratch and IRQ number registers */
+	/* Restore r0 and r24 - The scratch and IRQ number registers */
 
 	ld		r0, x+
 	ld		r24, x+
 
 	/* Finally, recover X [r26-r27] from the the new stack.  The PC remains on the new
-	 * stack so that the user of this macro can return with iret.
+	 * stack so that the user of this macro can return with ret (not reti, ret will
+	 * preserve the restored interrupt state).
 	 */
 
-	pop		r27
+	pop		r27					/* R27 then R26 */
 	pop		r26
 	.endm
 
diff --git a/nuttx/arch/avr/src/avr/up_switchcontext.S b/nuttx/arch/avr/src/avr/up_switchcontext.S
index 18653d3051..e60939c849 100755
--- a/nuttx/arch/avr/src/avr/up_switchcontext.S
+++ b/nuttx/arch/avr/src/avr/up_switchcontext.S
@@ -86,9 +86,9 @@
 
 	.text
 	.globl	up_switchcontext
-    .func	up_switchcontext
+	.func	up_switchcontext
 up_switchcontext:
-	/* Use X ]r26:r27] to reference the save structure.  (X is Call-used) */
+	/* Use X [r26:r27] to reference the save structure.  (X is Call-used) */
 
 	movw	r26, r24
 
@@ -99,7 +99,7 @@ up_switchcontext:
 	/* Then fall through to do the full context restore with r24-r5 = restoreregs */
 
 	movw	r24, r22
-    .endfunc
+	.endfunc
 
 /****************************************************************************
  * Name: up_fullcontextrestore
@@ -120,7 +120,7 @@ up_switchcontext:
 
 	.text
 	.global	up_fullcontextrestore
-    .func   up_fullcontextrestore
+	.func	up_fullcontextrestore
 up_fullcontextrestore:
 	/* Use X ]r26:r27] to reference the restore structure.  */
 
@@ -130,9 +130,11 @@ up_fullcontextrestore:
 
 	TCB_RESTORE
 
-    /* And "return" to the new task. */
+	/* And "return" to the new task (using ret not reti so that the interrupt
+	 * state that we just restored will be preserved).
+	 */
 
-    reti
-    .endfunc
+	ret
+	.endfunc
 	.end
 
diff --git a/nuttx/arch/avr/src/common/up_mdelay.c b/nuttx/arch/avr/src/common/up_mdelay.c
index 3fb76a0589..171835f39b 100644
--- a/nuttx/arch/avr/src/common/up_mdelay.c
+++ b/nuttx/arch/avr/src/common/up_mdelay.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/avr/src/common/up_mdelay.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without