Continue work on Rowley LPC1768 demo.

[freertos] / Demo / CORTEX_LPC1768_GCC_Rowley / ParTest.c

diff --git a/Demo/CORTEX_LPC1768_GCC_Rowley/ParTest.c b/Demo/CORTEX_LPC1768_GCC_Rowley/ParTest.c
index ef091723e7f516edce00d96483a0fdf68afac167..48ca1fcf073a2a69e4926f889542de956261095d 100644 (file)
--- a/Demo/CORTEX_LPC1768_GCC_Rowley/ParTest.c
+++ b/Demo/CORTEX_LPC1768_GCC_Rowley/ParTest.c
@@ -68,12 +68,12 @@
 void vParTestInitialise( void )\r
 {\r
        /* LEDs on ports 1 and 2 to output. */\r
-       FIO2DIR  = partstFIO2_BITS;\r
-    FIO1DIR  = partstFIO1_BITS;\r
+       GPIO2->FIODIR  = partstFIO2_BITS;\r
+    GPIO1->FIODIR  = partstFIO1_BITS;\r
 \r
        /* Start will all LEDs off. */\r
-    FIO1CLR = partstFIO1_BITS;\r
-    FIO2CLR = partstFIO2_BITS;\r
+    GPIO2->FIOCLR = partstFIO2_BITS;\r
+    GPIO1->FIOCLR = partstFIO1_BITS;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -89,11 +89,11 @@ unsigned portLONG ulLED = partstFIRST_IO;
                /* Set of clear the output. */\r
                if( xValue )\r
                {\r
-                       FIO2CLR = ulLED;\r
+                       GPIO2->FIOCLR = ulLED;\r
                }\r
                else\r
                {\r
-                       FIO2SET = ulLED;\r
+                       GPIO2->FIOSET = ulLED;\r
                }\r
        }\r
 }\r
@@ -110,14 +110,14 @@ unsigned portLONG ulLED = partstFIRST_IO, ulCurrentState;
                ulLED <<= ( unsigned portLONG ) uxLED;\r
 \r
                /* If this bit is already set, clear it, and visa versa. */\r
-               ulCurrentState = FIO2PIN;\r
+               ulCurrentState = GPIO2->FIOPIN;\r
                if( ulCurrentState & ulLED )\r
                {\r
-                       FIO2CLR = ulLED;\r
+                       GPIO2->FIOCLR = ulLED;\r
                }\r
                else\r
                {\r
-                       FIO2SET = ulLED;\r
+                       GPIO2->FIOSET = ulLED;\r
                }\r
        }\r
 }\r
@@ -129,7 +129,7 @@ unsigned portLONG ulLED = partstFIRST_IO;
 \r
     ulLED <<= ( unsigned portLONG ) uxLED;\r
 \r
-    return ( FIO2PIN & ulLED );\r
+    return ( GPIO2->FIOPIN & ulLED );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -139,11 +139,3 @@ long lParTestGetLEDState( unsigned portBASE_TYPE uxLED )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-int __putchar( int x )\r
-{\r
-       /* Not used. */\r
-}\r
-\r
-\r
-\r
-\r