Index: webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs
===================================================================
--- webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs (revision 14)
+++ webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs (revision 17)
@@ -1,25 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -35,15 +16,8 @@
-
-
-
-
-
-
-
@@ -59,28 +33,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
-
-
-
+
+
-
+
Index: webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/LCD/portlcd.c
===================================================================
--- webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/LCD/portlcd.c (revision 14)
+++ webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/LCD/portlcd.c (revision 17)
@@ -20,5 +20,5 @@
************************************************************************/
-#include
+#include
#include "portlcd.h"
#include "FreeRTOS.h"
Index: webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c
===================================================================
--- webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c (revision 14)
+++ webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c (revision 17)
@@ -53,6 +53,19 @@
#define partstFIRST_IO ( ( unsigned portLONG ) 0x01 )
-#define partstNUM_LEDS ( 8 )
+#define partstNUM_LEDS ( 2 )
#define partstALL_OUTPUTS_OFF ( ( unsigned portLONG ) 0xff )
+
+// Pin I/O LED Control Maskbit
+#define LED1 0x02000000 // P3.25(0000 00x0 0000 0000 0000 0000 0000 0000)
+#define LED2 0x04000000 // P3.26(0000 0x00 0000 0000 0000 0000 0000 0000)
+
+#define LED1_ON() FIO3CLR = LED1 // LED1 Pin = 0 (ON LED)
+#define LED1_OFF() FIO3SET = LED1 // LED1 Pin = 1 (OFF LED)
+#define LED2_ON() FIO3CLR = LED2 // LED2 Pin = 0 (ON LED)
+#define LED2_OFF() FIO3SET = LED2 // LED2 Pin = 1 (OFF LED)
+
+int led_1_state;
+int led_2_state;
+
/*-----------------------------------------------------------
@@ -62,11 +75,21 @@
void vParTestInitialise( void )
{
- PINSEL10 = 0;
- FIO2DIR = 0x000000FF;
- FIO2MASK = 0x00000000;
- FIO2CLR = 0xFF;
- SCS |= (1<<0); //fast mode for port 0 and 1
- FIO2CLR = partstALL_OUTPUTS_OFF;
+ // Config Pin GPIO3[26:25]
+ PINSEL7 &= 0xFFC3FFFF; // P3[26:25] = GPIO Function(xxxx xxxx xx00 00xx xxxx xxxx xxxx xxxx)
+ PINMODE7 &= 0xFFC3FFFF; // Enable Puul-Up on P3[26:25]
+
+ FIO3DIR |= LED1; // Set GPIO-3[26:25] = Output(xxxx x11x xxxx xxxx xxxx xxxx xxxx xxxx)
+ FIO3DIR |= LED2;
+ LED1_OFF(); // Default LED Status
+ LED2_OFF();
+
+// PINSEL10 = 0;
+// FIO2DIR = 0x000000FF;
+// FIO2MASK = 0x00000000;
+// FIO2CLR = 0xFF;
+// SCS |= (1<<0); //fast mode for port 0 and 1
+
+// FIO2CLR = partstALL_OUTPUTS_OFF;
}
/*-----------------------------------------------------------*/
@@ -75,5 +98,5 @@
{
unsigned portLONG ulLED = partstFIRST_IO;
-
+#if 0
if( uxLED < partstNUM_LEDS )
{
@@ -91,4 +114,5 @@
}
}
+#endif
}
/*-----------------------------------------------------------*/
@@ -98,4 +122,19 @@
unsigned portLONG ulLED = partstFIRST_IO, ulCurrentState;
+
+ if (led_1_state == 0)
+ {
+ LED1_ON();
+
+ led_1_state = 1;
+ }
+ else
+ {
+ LED1_OFF();
+ led_1_state = 0;
+ }
+
+
+#if 0
if( uxLED < partstNUM_LEDS )
{
@@ -115,4 +154,5 @@
}
}
+#endif
}
@@ -120,4 +160,5 @@
unsigned portBASE_TYPE uxParTextGetLED( unsigned portBASE_TYPE uxLED )
{
+#if 0
unsigned portLONG ulLED = partstFIRST_IO;
@@ -125,4 +166,6 @@
return ( FIO2PIN & ulLED );
+#endif
+ return 0;
}
Index: webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
===================================================================
--- webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c (revision 14)
+++ webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c (revision 17)
@@ -77,6 +77,6 @@
#define uipIP_ADDR0 192
#define uipIP_ADDR1 168
-#define uipIP_ADDR2 0
-#define uipIP_ADDR3 200
+#define uipIP_ADDR2 3
+#define uipIP_ADDR3 100
/* How long to wait before attempting to connect the MAC again. */
@@ -152,5 +152,5 @@
portENTER_CRITICAL();
{
- IntEnable = INT_RX_DONE;
+ MAC_INTENABLE = INT_RX_DONE;
VICIntEnable |= 0x00200000;
VICVectAddr21 = ( portLONG ) vEMAC_ISR_Wrapper;
Index: webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/EMAC_ISR.c
===================================================================
--- webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/EMAC_ISR.c (revision 14)
+++ webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/EMAC_ISR.c (revision 17)
@@ -17,5 +17,5 @@
/* Clear the interrupt. */
- IntClear = 0xffff;
+ MAC_INTCLEAR = 0xffff;
VICVectAddr = 0;
Index: webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h
===================================================================
--- webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h (revision 14)
+++ webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h (revision 17)
@@ -50,5 +50,5 @@
#include
-#include
+#include
#define vPortYieldProcessor swi_handler
@@ -70,5 +70,5 @@
/* Value to use on rev 'A' and newer devices. */
-//#define configPINSEL2_VALUE 0x50150105
+#define configPINSEL2_VALUE 0x50150105
#ifndef configPINSEL2_VALUE
@@ -130,6 +130,6 @@
-#define VICVectAddr VICAddress
-#define VICVectCntl4 VICVectPriority4
+//#define VICVectAddr VICAddress
+//#define VICVectCntl4 VICVectPriority4
typedef struct
{
Index: webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/main.c
===================================================================
--- webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/main.c (revision 14)
+++ webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/main.c (revision 17)
@@ -47,5 +47,5 @@
/* Environment includes. */
-#include
+#include
/* Scheduler includes. */
Index: webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp
===================================================================
--- webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (revision 14)
+++ webserver/example/freeRTOS/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzp (revision 17)
@@ -1,103 +1,110 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
Index: webserver/example/freeRTOS/Demo/Common/Minimal/flash.c
===================================================================
--- webserver/example/freeRTOS/Demo/Common/Minimal/flash.c (revision 14)
+++ webserver/example/freeRTOS/Demo/Common/Minimal/flash.c (revision 17)
@@ -71,5 +71,5 @@
#define ledSTACK_SIZE configMINIMAL_STACK_SIZE
-#define ledNUMBER_OF_LEDS ( 3 )
+#define ledNUMBER_OF_LEDS ( 1 )
#define ledFLASH_RATE_BASE ( ( portTickType ) 333 )