diff -cr FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h
*** FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h	Thu Feb 21 19:05:48 2008
--- FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h	Sun Mar 23 18:33:40 2008
***************
*** 58,64 ****
  #define configUSE_PREEMPTION		1
  #define configUSE_IDLE_HOOK         0
  #define configUSE_TICK_HOOK         1
! #define configCPU_CLOCK_HZ          ( ( unsigned portLONG ) 47923200 )
  #define configTICK_RATE_HZ          ( ( portTickType ) 1000 )
  #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 4 )
  #define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 130 )
--- 58,64 ----
  #define configUSE_PREEMPTION		1
  #define configUSE_IDLE_HOOK         0
  #define configUSE_TICK_HOOK         1
! #define configCPU_CLOCK_HZ          ( ( unsigned portLONG ) 48054857 ) /* 47923200 )*/
  #define configTICK_RATE_HZ          ( ( portTickType ) 1000 )
  #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 4 )
  #define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 130 )
***************
*** 97,105 ****
  #define uipMAC_ADDR5	0x11
  
  /* IP address configuration. */
! #define uipIP_ADDR0		172
! #define uipIP_ADDR1		25
! #define uipIP_ADDR2		218
! #define uipIP_ADDR3		10	
  
  #endif /* FREERTOS_CONFIG_H */
--- 97,105 ----
  #define uipMAC_ADDR5	0x11
  
  /* IP address configuration. */
! #define uipIP_ADDR0		10
! #define uipIP_ADDR1		0
! #define uipIP_ADDR2		1
! #define uipIP_ADDR3		37	
  
  #endif /* FREERTOS_CONFIG_H */
diff -cr FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile
*** FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile	Thu Feb 21 19:05:48 2008
--- FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile	Sun Mar 23 20:08:17 2008
***************
*** 38,44 ****
  OBJCOPY=arm-elf-objcopy
  LDSCRIPT=atmel-rom.ld
  
! LINKER_FLAGS=-mthumb -nostartfiles -Xlinker -oRTOSDemo.elf -Xlinker -M -Xlinker -Map=rtosdemo.map
  
  DEBUG=-g
  OPTIM=-O3
--- 38,44 ----
  OBJCOPY=arm-elf-objcopy
  LDSCRIPT=atmel-rom.ld
  
! LINKER_FLAGS=-nostartfiles -Xlinker -oRTOSDemo.elf -Xlinker -M -Xlinker -Map=rtosdemo.map
  
  DEBUG=-g
  OPTIM=-O3
***************
*** 56,67 ****
  		-I ./SrcAtmel \
  		-I ./USB \
  		-D SAM7_GCC \
- 		-D THUMB_INTERWORK \
  		-mcpu=arm7tdmi \
  		-D PACK_STRUCT_END=__attribute\(\(packed\)\) \
  		-D ALIGN_STRUCT_END=__attribute\(\(aligned\(4\)\)\) \
! 		-fomit-frame-pointer \
! 		-mthumb-interwork
  										
  THUMB_SOURCE= \
  		main.c \
--- 56,65 ----
  		-I ./SrcAtmel \
  		-I ./USB \
  		-D SAM7_GCC \
  		-mcpu=arm7tdmi \
  		-D PACK_STRUCT_END=__attribute\(\(packed\)\) \
  		-D ALIGN_STRUCT_END=__attribute\(\(aligned\(4\)\)\) \
! 		-fomit-frame-pointer
  										
  THUMB_SOURCE= \
  		main.c \
***************
*** 112,118 ****
  	$(CC) $(CFLAGS) $(ARM_OBJS) $(THUMB_OBJS) $(LIBS) boot.s $(LINKER_FLAGS) 
  
  $(THUMB_OBJS) : %.o : %.c Makefile FreeRTOSConfig.h
! 	$(CC) -c $(CFLAGS) -mthumb $< -o $@
  
  $(ARM_OBJS) : %.o : %.c Makefile FreeRTOSConfig.h
  	$(CC) -c $(CFLAGS) $< -o $@
--- 110,116 ----
  	$(CC) $(CFLAGS) $(ARM_OBJS) $(THUMB_OBJS) $(LIBS) boot.s $(LINKER_FLAGS) 
  
  $(THUMB_OBJS) : %.o : %.c Makefile FreeRTOSConfig.h
! 	$(CC) -c $(CFLAGS) $< -o $@
  
  $(ARM_OBJS) : %.o : %.c Makefile FreeRTOSConfig.h
  	$(CC) -c $(CFLAGS) $< -o $@
diff -cr FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c
*** FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c	Thu Feb 21 19:05:48 2008
--- FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c	Sun Mar 23 18:13:12 2008
***************
*** 52,59 ****
   *-----------------------------------------------------------*/
  
  #define partstNUM_LEDS		( 4 )
  #define partstALL_LEDS		( ulLED_Mask[ 0 ] | ulLED_Mask[ 1 ] | ulLED_Mask[ 2 ] | ulLED_Mask[ 3 ] )
- const unsigned portLONG 	ulLED_Mask[ partstNUM_LEDS ]= { (1<<19), (1<<20), (1<<21), (1<<22) };
  
  
  void vParTestInitialise( void )
--- 52,59 ----
   *-----------------------------------------------------------*/
  
  #define partstNUM_LEDS		( 4 )
+ const unsigned portLONG 	ulLED_Mask[ partstNUM_LEDS ]= { (1<<27), (1<<28), (1<<29), (1<<30) };
  #define partstALL_LEDS		( ulLED_Mask[ 0 ] | ulLED_Mask[ 1 ] | ulLED_Mask[ 2 ] | ulLED_Mask[ 3 ] )
  
  
  void vParTestInitialise( void )
diff -cr FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/SrcAtmel/mii.h FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/SrcAtmel/mii.h
*** FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/SrcAtmel/mii.h	Sun Feb 17 18:38:04 2008
--- FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/SrcAtmel/mii.h	Sun Mar 23 20:08:03 2008
***************
*** 101,105 ****
--- 101,106 ----
  /* PHY ID */
  #define MII_DM9161_ID     0x0181b8a0
  #define MII_AM79C875_ID   0x00225540	/* 0x00225541 */
+ #define MII_MICREL_ID     0x00221610
  
  #define AT91C_PHY_ADDR	31
diff -cr FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c
*** FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c	Thu Feb 21 19:05:48 2008
--- FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c	Sun Mar 23 18:45:03 2008
***************
*** 65,75 ****
  #include "USBSample.h"
  
  /* Joystick inputs used to move the 'mouse' cursor. */
! #define usbSW1 	( 1 << 21 )	/* PA21 */
! #define usbSW2 	( 1 << 22 )	/* PA22 */
! #define usbSW3 	( 1 << 23 )	/* PA23 */
! #define usbSW4 	( 1 << 24 )	/* PA24 */
! #define usbSW_CLICK	( 1 << 25 ) /* PA25 */
  
  /* Descriptor type definitions. */
  #define usbDESCRIPTOR_TYPE_DEVICE			( 0x01 )
--- 65,75 ----
  #include "USBSample.h"
  
  /* Joystick inputs used to move the 'mouse' cursor. */
! #define usbSW1 	( 1 << 7 )	/* PA21 */
! #define usbSW2 	( 1 << 8 )	/* PA22 */
! #define usbSW3 	( 1 << 9 )	/* PA23 */
! #define usbSW4 	( 1 << 14 )	/* PA24 */
! #define usbSW_CLICK	( 1 << 15 ) /* PA25 */
  
  /* Descriptor type definitions. */
  #define usbDESCRIPTOR_TYPE_DEVICE			( 0x01 )
diff -cr FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c
*** FreeRTOS.orig/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c	Thu Feb 21 19:05:48 2008
--- FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c	Sun Mar 23 20:07:17 2008
***************
*** 527,533 ****
  			Bits 3:0 Revision Number Four bit manufacturer’s revision number.
  				0001 stands for Rev. A, etc.
  	*/
! 	if( ( ( ulPHYId1 << 16 ) | ( ulPHYId2 & 0xfff0 ) ) != MII_DM9161_ID )
  	{
  		/* Did not expect this ID. */
  		xReturn = pdFAIL;
--- 527,533 ----
  			Bits 3:0 Revision Number Four bit manufacturer’s revision number.
  				0001 stands for Rev. A, etc.
  	*/
! 	if( ( ( ulPHYId1 << 16 ) | ( ulPHYId2 & 0xfff0 ) ) != MII_MICREL_ID )
  	{
  		/* Did not expect this ID. */
  		xReturn = pdFAIL;
diff -cr FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/Board.h FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/Board.h
*** FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/Board.h	Sun Feb 17 18:36:40 2008
--- FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/Board.h	Sun Mar 23 19:07:27 2008
***************
*** 33,42 ****
  /*-----------------*/
  /* Leds Definition */
  /*-----------------*/
! #define LED1            (1<<19)	// PB19
! #define LED2            (1<<20)	// PB20
! #define LED3            (1<<21)	// PB21
! #define LED4            (1<<22)	// PB22
  #define NB_LED			4
  
  #define LED_MASK        (LED1|LED2|LED3|LED4)
--- 33,42 ----
  /*-----------------*/
  /* Leds Definition */
  /*-----------------*/
! #define LED1            (1<<27)	// PB19
! #define LED2            (1<<28)	// PB20
! #define LED3            (1<<29)	// PB21
! #define LED4            (1<<30)	// PB22
  #define NB_LED			4
  
  #define LED_MASK        (LED1|LED2|LED3|LED4)
***************
*** 45,68 ****
  /* Push Buttons Definition */
  /*-------------------------*/
  
! #define SW1_MASK        (1<<21)	// PA21
! #define SW2_MASK        (1<<22)	// PA22
! #define SW3_MASK        (1<<23)	// PA23
! #define SW4_MASK        (1<<24)	// PA24
  #define SW_MASK         (SW1_MASK|SW2_MASK|SW3_MASK|SW4_MASK)
  
  
! #define SW1 	(1<<21)	// PA21
! #define SW2 	(1<<22)	// PA22
! #define SW3 	(1<<23)	// PA23
! #define SW4 	(1<<24)	// PA24
  
  /*--------------*/
  /* Master Clock */
  /*--------------*/
  
  #define EXT_OC          18432000   // Exetrnal ocilator MAINCK
! #define MCK             47923200   // MCK (PLLRC div by 2)
  #define MCKKHz          (MCK/1000) //
  
  #endif /* Board_h */
--- 45,68 ----
  /* Push Buttons Definition */
  /*-------------------------*/
  
! #define SW1_MASK        (1<<7)	// PA21
! #define SW2_MASK        (1<<8)	// PA22
! #define SW3_MASK        (1<<9)	// PA23
! #define SW4_MASK        (1<<14)	// PA24
  #define SW_MASK         (SW1_MASK|SW2_MASK|SW3_MASK|SW4_MASK)
  
  
! #define SW1 	(1<<7)	// PA21
! #define SW2 	(1<<8)	// PA22
! #define SW3 	(1<<9)	// PA23
! #define SW4 	(1<<14)	// PA24
  
  /*--------------*/
  /* Master Clock */
  /*--------------*/
  
  #define EXT_OC          18432000   // Exetrnal ocilator MAINCK
! #define MCK             48054857   // MCK (PLLRC div by 2)
  #define MCKKHz          (MCK/1000) //
  
  #endif /* Board_h */
diff -cr FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c
*** FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c	Thu Feb 21 19:05:50 2008
--- FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c	Sun Mar 23 19:48:44 2008
***************
*** 711,717 ****
  			Bits 3:0 Revision Number Four bit manufacturer?s revision number.
  				0001 stands for Rev. A, etc.
  	*/
! 	if( ( ( ulPHYId1 << 16 ) | ( ulPHYId2 & 0xfff0 ) ) != MII_DM9161_ID )
  	{
  		/* Did not expect this ID. */
  		xReturn = pdFAIL;
--- 711,717 ----
  			Bits 3:0 Revision Number Four bit manufacturer?s revision number.
  				0001 stands for Rev. A, etc.
  	*/
! 	if( ( ( ulPHYId1 << 16 ) | ( ulPHYId2 & 0xfff0 ) ) != MII_MICREL_ID )
  	{
  		/* Did not expect this ID. */
  		xReturn = pdFAIL;
diff -cr FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.h FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.h
*** FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.h	Thu Feb 21 19:05:50 2008
--- FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.h	Sun Mar 23 19:17:46 2008
***************
*** 60,80 ****
  #define emacETHADDR5 0x22
  
  /* The IP address being used. */
! #define emacIPADDR0 172
! #define emacIPADDR1 25
! #define emacIPADDR2 218
! #define emacIPADDR3 205
  
  /* The gateway address being used. */
! #define emacGATEWAY_ADDR0 172
! #define emacGATEWAY_ADDR1 25
! #define emacGATEWAY_ADDR2 218
! #define emacGATEWAY_ADDR3 3
  
  /* The network mask being used. */
  #define emacNET_MASK0 255
  #define emacNET_MASK1 255
! #define emacNET_MASK2 0
  #define emacNET_MASK3 0
  
  /*
--- 60,80 ----
  #define emacETHADDR5 0x22
  
  /* The IP address being used. */
! #define emacIPADDR0 10
! #define emacIPADDR1 0
! #define emacIPADDR2 1
! #define emacIPADDR3 37
  
  /* The gateway address being used. */
! #define emacGATEWAY_ADDR0 10
! #define emacGATEWAY_ADDR1 0
! #define emacGATEWAY_ADDR2 1
! #define emacGATEWAY_ADDR3 1
  
  /* The network mask being used. */
  #define emacNET_MASK0 255
  #define emacNET_MASK1 255
! #define emacNET_MASK2 255
  #define emacNET_MASK3 0
  
  /*
diff -cr FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/EMAC/mii.h FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/mii.h
*** FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/EMAC/mii.h	Sun Feb 17 18:36:28 2008
--- FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/mii.h	Sun Mar 23 19:34:42 2008
***************
*** 101,105 ****
--- 101,106 ----
  /* PHY ID */
  #define MII_DM9161_ID     0x0181b8a0
  #define MII_AM79C875_ID   0x00225540	/* 0x00225541 */
+ #define MII_MICREL_ID     0x00221610    /* http://forum.sparkfun.com/viewtopic.php?t=5299&highlight=sam7ex256 */
  
  #define AT91C_PHY_ADDR	31
diff -cr FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h
*** FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h	Thu Feb 21 19:05:50 2008
--- FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h	Sun Mar 23 19:05:43 2008
***************
*** 60,66 ****
  #define configUSE_PREEMPTION		1
  #define configUSE_IDLE_HOOK			1
  #define configUSE_TICK_HOOK			0
! #define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 47923200 )
  #define configTICK_RATE_HZ			( ( portTickType ) 1000 )
  #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 5 )
  #define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 110 )
--- 60,66 ----
  #define configUSE_PREEMPTION		1
  #define configUSE_IDLE_HOOK			1
  #define configUSE_TICK_HOOK			0
! #define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 48054857 )
  #define configTICK_RATE_HZ			( ( portTickType ) 1000 )
  #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 5 )
  #define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 110 )
diff -cr FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/makefile FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/makefile
*** FreeRTOS.orig/Demo/lwIP_Demo_Rowley_ARM7/makefile	Thu Feb 21 19:05:50 2008
--- FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/makefile	Sun Mar 23 19:17:51 2008
***************
*** 57,71 ****
  -Wmissing-declarations  \
  -Wno-strict-aliasing  \
  -D SAM7_GCC  \
- -D THUMB_INTERWORK \
- -mthumb-interwork \
  -mcpu=arm7tdmi  \
  -T$(LDSCRIPT) \
  $(DEBUG)  \
  $(OPTIM) \
  -fomit-frame-pointer
  
! THUMB_FLAGS=-mthumb
  LINKER_FLAGS=-Xlinker -ortosdemo.elf -Xlinker -M -Xlinker -Map=rtosdemo.map
  
  #
--- 57,69 ----
  -Wmissing-declarations  \
  -Wno-strict-aliasing  \
  -D SAM7_GCC  \
  -mcpu=arm7tdmi  \
  -T$(LDSCRIPT) \
  $(DEBUG)  \
  $(OPTIM) \
  -fomit-frame-pointer
  
! THUMB_FLAGS=
  LINKER_FLAGS=-Xlinker -ortosdemo.elf -Xlinker -M -Xlinker -Map=rtosdemo.map
  
  #