]> git.sur5r.net Git - freertos/commitdiff
Update demo projects for RX210, not yet complete, and not yet actually built.
authorrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Fri, 16 Sep 2011 08:48:59 +0000 (08:48 +0000)
committerrichardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Fri, 16 Sep 2011 08:48:59 +0000 (08:48 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1598 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

14 files changed:
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/HighFrequencyTimerTest.c
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/IntQueueTimer.c
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/ParTest.c
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/Renesas-Files/hwsetup.c
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/SessionRX200_E1_E20_SYSTEM.hsf
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/hd44780.c
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/IntQueueTimer.h
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/rskrx210def.h [new file with mode: 0644]
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/rskrx62ndef.h [deleted file]
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/lcd.c
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/main-blinky.c
Demo/RX200_RX210-RSK_Renesas/RTOSDemo/main-full.c

index e7130d5d85ef33cb03e62884a8f66446d36ab177..06914a7f7bbf733b7a3b5fc2e017fe505461ec4b 100644 (file)
@@ -1,41 +1,41 @@
 /*\r
-    FreeRTOS V6.1.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+       \r
 \r
     ***************************************************************************\r
-    *                                                                         *\r
-    * If you are:                                                             *\r
-    *                                                                         *\r
-    *    + New to FreeRTOS,                                                   *\r
-    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
-    *    + Looking for basic training,                                        *\r
-    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
-    *                                                                         *\r
-    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
-    *                                                                         *\r
-    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
-    *                  http://www.FreeRTOS.org/Documentation                  *\r
-    *                                                                         *\r
-    * A pdf reference manual is also available.  Both are usually delivered   *\r
-    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
-    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
-    * exceptional circumstances).  Thank you for your support!                *\r
-    *                                                                         *\r
+     *                                                                       *\r
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
+     *    Complete, revised, and edited pdf reference manuals are also       *\r
+     *    available.                                                         *\r
+     *                                                                       *\r
+     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
+     *    ensuring you get running as quickly as possible and with an        *\r
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
+     *    the FreeRTOS project to continue with its mission of providing     *\r
+     *    professional grade, cross platform, de facto standard solutions    *\r
+     *    for microcontrollers - completely free of charge!                  *\r
+     *                                                                       *\r
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
+     *                                                                       *\r
+     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *                                                                       *\r
     ***************************************************************************\r
 \r
+\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
-    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
-    a combined work that includes FreeRTOS without being obliged to provide the\r
-    source code for proprietary components outside of the FreeRTOS kernel.\r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public \r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it \r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained \r
+    >>>NOTE<<< The modification to the GPL is included to allow you to\r
+    distribute a combined work that includes FreeRTOS without being obliged to\r
+    provide the source code for proprietary components outside of the FreeRTOS\r
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+    more details. You should have received a copy of the GNU General Public\r
+    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
+    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
     by writing to Richard Barry, contact details for whom are available on the\r
     FreeRTOS WEB site.\r
 \r
@@ -137,29 +137,4 @@ required to ensure flase positive timing errors are not reported. */
 #define bktSECONDARY_PRIORITY  ( configMAX_PRIORITIES - 4 )\r
 #define intqHIGHER_PRIORITY            ( configMAX_PRIORITIES - 3 )\r
 \r
-\r
-/*-----------------------------------------------------------\r
- * Ethernet configuration.\r
- *-----------------------------------------------------------*/\r
-\r
-/* MAC address configuration. */\r
-#define configMAC_ADDR0        0x00\r
-#define configMAC_ADDR1        0x12\r
-#define configMAC_ADDR2        0x13\r
-#define configMAC_ADDR3        0x10\r
-#define configMAC_ADDR4        0x15\r
-#define configMAC_ADDR5        0x11\r
-\r
-/* IP address configuration. */\r
-#define configIP_ADDR0         192\r
-#define configIP_ADDR1         168\r
-#define configIP_ADDR2         0\r
-#define configIP_ADDR3         200\r
-\r
-/* Netmask configuration. */\r
-#define configNET_MASK0                255\r
-#define configNET_MASK1                255\r
-#define configNET_MASK2                255\r
-#define configNET_MASK3                0\r
-\r
 #endif /* FREERTOS_CONFIG_H */\r
index f17faafc094f5dc4bd67bc39a2a1d1836b3b0769..90ddf0067bf6fee39dbe817eea77f4e4ad84f221 100644 (file)
@@ -1,41 +1,41 @@
 /*\r
-    FreeRTOS V6.1.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+       \r
 \r
     ***************************************************************************\r
-    *                                                                         *\r
-    * If you are:                                                             *\r
-    *                                                                         *\r
-    *    + New to FreeRTOS,                                                   *\r
-    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
-    *    + Looking for basic training,                                        *\r
-    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
-    *                                                                         *\r
-    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
-    *                                                                         *\r
-    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
-    *                  http://www.FreeRTOS.org/Documentation                  *\r
-    *                                                                         *\r
-    * A pdf reference manual is also available.  Both are usually delivered   *\r
-    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
-    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
-    * exceptional circumstances).  Thank you for your support!                *\r
-    *                                                                         *\r
+     *                                                                       *\r
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
+     *    Complete, revised, and edited pdf reference manuals are also       *\r
+     *    available.                                                         *\r
+     *                                                                       *\r
+     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
+     *    ensuring you get running as quickly as possible and with an        *\r
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
+     *    the FreeRTOS project to continue with its mission of providing     *\r
+     *    professional grade, cross platform, de facto standard solutions    *\r
+     *    for microcontrollers - completely free of charge!                  *\r
+     *                                                                       *\r
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
+     *                                                                       *\r
+     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *                                                                       *\r
     ***************************************************************************\r
 \r
+\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
-    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
-    a combined work that includes FreeRTOS without being obliged to provide the\r
-    source code for proprietary components outside of the FreeRTOS kernel.\r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public \r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it \r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained \r
+    >>>NOTE<<< The modification to the GPL is included to allow you to\r
+    distribute a combined work that includes FreeRTOS without being obliged to\r
+    provide the source code for proprietary components outside of the FreeRTOS\r
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+    more details. You should have received a copy of the GNU General Public\r
+    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
+    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
     by writing to Richard Barry, contact details for whom are available on the\r
     FreeRTOS WEB site.\r
 \r
index 7b5064c6ba0cd832eebcc230b14d0f3ef7dc64e7..b373e57e11f1021b8945d718cf45d959d8923d6a 100644 (file)
@@ -1,41 +1,41 @@
 /*\r
-    FreeRTOS V6.1.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+       \r
 \r
     ***************************************************************************\r
-    *                                                                         *\r
-    * If you are:                                                             *\r
-    *                                                                         *\r
-    *    + New to FreeRTOS,                                                   *\r
-    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
-    *    + Looking for basic training,                                        *\r
-    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
-    *                                                                         *\r
-    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
-    *                                                                         *\r
-    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
-    *                  http://www.FreeRTOS.org/Documentation                  *\r
-    *                                                                         *\r
-    * A pdf reference manual is also available.  Both are usually delivered   *\r
-    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
-    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
-    * exceptional circumstances).  Thank you for your support!                *\r
-    *                                                                         *\r
+     *                                                                       *\r
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
+     *    Complete, revised, and edited pdf reference manuals are also       *\r
+     *    available.                                                         *\r
+     *                                                                       *\r
+     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
+     *    ensuring you get running as quickly as possible and with an        *\r
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
+     *    the FreeRTOS project to continue with its mission of providing     *\r
+     *    professional grade, cross platform, de facto standard solutions    *\r
+     *    for microcontrollers - completely free of charge!                  *\r
+     *                                                                       *\r
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
+     *                                                                       *\r
+     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *                                                                       *\r
     ***************************************************************************\r
 \r
+\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
-    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
-    a combined work that includes FreeRTOS without being obliged to provide the\r
-    source code for proprietary components outside of the FreeRTOS kernel.\r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public \r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it \r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained \r
+    >>>NOTE<<< The modification to the GPL is included to allow you to\r
+    distribute a combined work that includes FreeRTOS without being obliged to\r
+    provide the source code for proprietary components outside of the FreeRTOS\r
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+    more details. You should have received a copy of the GNU General Public\r
+    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
+    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
     by writing to Richard Barry, contact details for whom are available on the\r
     FreeRTOS WEB site.\r
 \r
index fa88596b5f3f836afa1f90d4bfd6e1998cad3048..32e412b696887212791479fa07c8b91d85976aa6 100644 (file)
@@ -1,41 +1,41 @@
 /*\r
-    FreeRTOS V6.1.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+       \r
 \r
     ***************************************************************************\r
-    *                                                                         *\r
-    * If you are:                                                             *\r
-    *                                                                         *\r
-    *    + New to FreeRTOS,                                                   *\r
-    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
-    *    + Looking for basic training,                                        *\r
-    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
-    *                                                                         *\r
-    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
-    *                                                                         *\r
-    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
-    *                  http://www.FreeRTOS.org/Documentation                  *\r
-    *                                                                         *\r
-    * A pdf reference manual is also available.  Both are usually delivered   *\r
-    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
-    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
-    * exceptional circumstances).  Thank you for your support!                *\r
-    *                                                                         *\r
+     *                                                                       *\r
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
+     *    Complete, revised, and edited pdf reference manuals are also       *\r
+     *    available.                                                         *\r
+     *                                                                       *\r
+     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
+     *    ensuring you get running as quickly as possible and with an        *\r
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
+     *    the FreeRTOS project to continue with its mission of providing     *\r
+     *    professional grade, cross platform, de facto standard solutions    *\r
+     *    for microcontrollers - completely free of charge!                  *\r
+     *                                                                       *\r
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
+     *                                                                       *\r
+     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *                                                                       *\r
     ***************************************************************************\r
 \r
+\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
-    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
-    a combined work that includes FreeRTOS without being obliged to provide the\r
-    source code for proprietary components outside of the FreeRTOS kernel.\r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public \r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it \r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained \r
+    >>>NOTE<<< The modification to the GPL is included to allow you to\r
+    distribute a combined work that includes FreeRTOS without being obliged to\r
+    provide the source code for proprietary components outside of the FreeRTOS\r
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+    more details. You should have received a copy of the GNU General Public\r
+    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
+    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
     by writing to Richard Barry, contact details for whom are available on the\r
     FreeRTOS WEB site.\r
 \r
@@ -97,10 +97,6 @@ void vParTestSetLED( unsigned long ulLED, signed long xValue )
                                                        break;\r
                                        case 3: LED3 = LED_ON;\r
                                                        break;\r
-//                                     case 4: LED4 = LED_ON;\r
-//                                                     break;\r
-//                                     case 5: LED5 = LED_ON;\r
-//                                                     break;\r
                                }\r
                        }\r
                        taskEXIT_CRITICAL();\r
@@ -120,10 +116,6 @@ void vParTestSetLED( unsigned long ulLED, signed long xValue )
                                                        break;\r
                                        case 3: LED3 = LED_OFF;\r
                                                        break;\r
-//                                     case 4: LED4 = LED_OFF;\r
-//                                                     break;\r
-//                                     case 5: LED5 = LED_OFF;\r
-//                                                     break;\r
                                }\r
 \r
                        }\r
@@ -181,16 +173,6 @@ long lReturn = pdTRUE;
                                                        lReturn =  pdFALSE;\r
                                                }\r
                                                break;                                  \r
-//                     case 4  :       if( LED4 != 0 )\r
-//                                             {\r
-//                                                     lReturn =  pdFALSE;\r
-//                                             }\r
-//                                             break;                                  \r
-//                     case 5  :       if( LED5 != 0 )\r
-//                                             {\r
-//                                                     lReturn =  pdFALSE;\r
-//                                             }\r
-//                                             break;                                  \r
                }\r
        }\r
        \r
index df3ec8e88ac73fb6043c6650b4313ef572623496..996cdbfeaa9fe09e9857cadfa5e0120ac661da4b 100644 (file)
Binary files a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav and b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/RTOSDemo.nav differ
index cba0b63d3f384f21f154133126e3e14fada38471..663c6bbb6bd8a73a02cebaf9840d1f17cb29c0f1 100644 (file)
@@ -41,8 +41,7 @@ Includes   <System Includes> , "Project Includes"
 ******************************************************************************/\r
 #include <stdint.h>\r
 #include "iodefine.h"\r
-//#include "r_ether.h"\r
-#include "rskrx62ndef.h"\r
+#include "rskrx210def.h"\r
 #include "hd44780.h"  /* EZ-LCD include file */\r
 \r
 /******************************************************************************\r
@@ -101,7 +100,6 @@ void HardwareSetup(void)
 void EnablePeripheralModules(void)\r
 {\r
        /*  Module standby clear */\r
-//     SYSTEM.MSTPCRB.BIT.MSTPB15 = 0;                         /* EtherC, EDMAC */\r
     SYSTEM.MSTPCRA.BIT.MSTPA15 = 0;             /* CMT0 */\r
 }\r
 \r
@@ -119,65 +117,6 @@ state changes on the external ports.
 Many peripheral modules will override the setting of the port registers. Ensure\r
 that the state is safe for external devices if the internal peripheral module is\r
 disabled or powered down. */\r
-#if(0)\r
-       /* ==== MII/RMII Pins setting ==== */\r
-       /*--------------------------------------*/\r
-       /*    Port Function Control Register    */\r
-       /*--------------------------------------*/\r
-#if ETH_MODE_SEL == ETH_MII_MODE\r
-       /*      EE=1, PHYMODE=1, ENETE3=1, ENETE2=0, ENETE1=1, ENETE0=0 (Ethernet)      */\r
-       IOPORT.PFENET.BYTE = 0x9A;\r
-#endif /*      ETH_MODE_SEL    */\r
-#if ETH_MODE_SEL == ETH_RMII_MODE\r
-       /*      EE=1, PHYMODE=0, ENETE3=0, ENETE2=0, ENETE1=1, ENETE0=0 (Ethernet)      */\r
-       IOPORT.PFENET.BYTE = 0x82;\r
-#endif /*      ETH_MODE_SEL    */\r
-       /*-------------------------------------------*/\r
-       /*    Input Buffer Control Register (ICR)    */\r
-       /*-------------------------------------------*/\r
-#if ETH_MODE_SEL == ETH_MII_MODE\r
-       /*      P54=1 Set ET_LINKSTA input      */\r
-       PORT5.ICR.BIT.B4 = 1;\r
-       /*      P71=1 Set ET_MDIO input */\r
-       PORT7.ICR.BIT.B1 = 1;\r
-       /*      P74=1 Set ET_ERXD1 input        */\r
-       PORT7.ICR.BIT.B4 = 1;\r
-       /*      P75=1 Set ET_ERXD0 input        */\r
-       PORT7.ICR.BIT.B5 = 1;\r
-       /*      P76=1 Set ET_RX_CLK input       */\r
-       PORT7.ICR.BIT.B6 = 1;\r
-       /*      P77=1 Set ET_RX_ER input        */\r
-       PORT7.ICR.BIT.B7 = 1;\r
-       /*      P83=1 Set ET_CRS input  */\r
-       PORT8.ICR.BIT.B3 = 1;\r
-       /*      PC0=1 Set ET_ERXD3 input        */\r
-       PORTC.ICR.BIT.B0 = 1;\r
-       /*      PC1=1 Set ET_ERXD2 input        */\r
-       PORTC.ICR.BIT.B1 = 1;\r
-       /*      PC2=1 Set ET_RX_DV input        */\r
-       PORTC.ICR.BIT.B2 = 1;\r
-       /*      PC4=1 Set EX_TX_CLK input       */\r
-       PORTC.ICR.BIT.B4 = 1;\r
-       /*      PC7=1 Set ET_COL input  */\r
-       PORTC.ICR.BIT.B7 = 1;\r
-#endif /*      ETH_MODE_SEL    */\r
-#if ETH_MODE_SEL == ETH_RMII_MODE\r
-       /*      P54=1 Set ET_LINKSTA input      */\r
-       PORT5.ICR.BIT.B4 = 1;\r
-       /*      P71=1 Set ET_MDIO input */\r
-       PORT7.ICR.BIT.B1 = 1;\r
-       /* P74=1 Set RMII_RXD1 input    */\r
-       PORT7.ICR.BIT.B4 = 1;\r
-       /* P75=1 Set RMII_RXD0 input    */\r
-       PORT7.ICR.BIT.B5 = 1;\r
-       /* P76=1 Set REF50CLK input     */\r
-       PORT7.ICR.BIT.B6 = 1;\r
-       /* P77=1 Set RMII_RX_ER input   */\r
-       PORT7.ICR.BIT.B7 = 1;\r
-       /* P83=1 Set RMII_CRS_DV input  */\r
-       PORT8.ICR.BIT.B3 = 1;\r
-#endif /*      ETH_MODE_SEL    */\r
-#endif\r
     /* Configure LED 0-4 pin settings */\r
     PORT1.PODR.BIT.B4 = 1; \r
     PORT1.PODR.BIT.B5 = 1;\r
@@ -215,50 +154,64 @@ void io_set_cpg(void)
 changes to the debugger and flash kernel BRR settings. */\r
 \r
        /* ==== CPG setting ==== */\r
-//     SYSTEM.SCKCR.LONG = 0x00020100; /* Clockin = 12MHz */\r
-//                                                                     /* I Clock = 96MHz, B Clock = 24MHz, */\r
-//                                                                     /* P Clock = 48MHz */\r
 \r
        unsigned int i;\r
 \r
-       SYSTEM.PRCR.WORD = 0xA503;                                              /* Protect on */\r
+       SYSTEM.PRCR.WORD = 0xA503;                              /* Protect off                                          */\r
 \r
-//     SYSTEM.SOSCCR.BYTE = 0x01;                              /* stop sub-clock */\r
-                                               /* delete when you use sub-clock */\r
-       \r
-//     SYSTEM.HOCOPCR.BYTE = 0x01;                             /* HOCO power supply off */\r
-                                               /* delete when you use HOCO */\r
+#if (CLK_SRC_HOCO == 1)        \r
+       SYSTEM.HOCOPCR.BYTE = 0x00;                             /* HOCO power supply on */\r
+       SYSTEM.HOCOCR2.BYTE = 0x03;                             /* Select - 50MHz */\r
+       SYSTEM.HOCOCR.BYTE  = 0x01;                             /* HOCO is operating */\r
 \r
-       SYSTEM.MOSCWTCR.BYTE = 0x0D;                    /* 131072 state */\r
-                                                                                       /* wait over 10ms  @12.5MHz */\r
+       for(i=0; i<10; i++){                                    /* wait over 60us */\r
+       }\r
+#else\r
+       SYSTEM.MOSCWTCR.BYTE = 0x0C;                    /* Main Clock Oscillator Wait Control Register */\r
+                                                                                       /* 65536 states                                         */\r
+                                                                                       /* wait over 2 ms  @20MHz                       */\r
 \r
-       SYSTEM.PLLWTCR.BYTE = 0x0E;                             /* 2097152 state */\r
-                                               /* wait over 12ms  @PLL=100MHz(12.5MHz*8) */\r
+       SYSTEM.PLLWTCR.BYTE = 0x0B;                             /* PLL Wait Control Register            */\r
+                                                                                       /* 262144 states                                        */\r
+                                                                                       /* wait over 2.1 ms  @PLL = 80Hz        */\r
+                                                                                       /*                                      (20/2x8*8)              */\r
        \r
-//     SYSTEM.PLLCR.WORD = 0x0902;                             /* x10 @PLL */\r
-                                                                                       /* Input to PLL (EXTAL in) / 2 */\r
+       SYSTEM.PLLCR.WORD = 0x0701;                             /* x8 @PLL                                                      */\r
+                                                                                       /* Input to PLL (EXTAL in) / 2          */\r
+                                                                                       /* Therefore: \r
+                                                                                                       PLL = EXTAL / 2         \r
+                                                                                                               = 20M / 2\r
+                                                                                                               = 10MHz                                                                                                         \r
+                                                                                               PLL * 8 = 80Mhz                                 */      \r
        \r
-//     SYSTEM.MOSCCR.BYTE = 0x02;                              /* EXTAL ON */\r
+       SYSTEM.MOSCCR.BYTE = 0x02;                              /* EXTAL ON */\r
                                                                                        /* External oscillation input selection */\r
-//     SYSTEM.PLLCR2.BYTE = 0x00;                              /* PLL ON */\r
+       SYSTEM.PLLCR2.BYTE = 0x00;                              /* PLL ON */\r
        \r
-//     for(i = 0;i< 0x168;i++)                         /* wait over 12ms */\r
-//     {\r
-//  }\r
+       for(i = 0; i<263; i++){                                 /* wait over 2.1ms */\r
+       }\r
+#endif\r
        \r
-//     SYSTEM.SCKCR.LONG = 0x21022222;                 /* ICK=PLL/2,FCK,PCK,BCL=PLL/4 */\r
-//     SYSTEM.SCKCR3.WORD = 0x0400;                    /* LOCO -> PLL */\r
-\r
-    \r
-    /*************************************************************************/\r
-    /* Using HOCO set to 50MHz to run device                                 */ \r
-    /* ICLK = 50MHz                                                          */ \r
-    /* PCLKD (12ADC) = 50MHz                                                 */ \r
-    /* All other clocks = CLK / 2 = 25MHz                                    */ \r
-    /*************************************************************************/\r
-    \r
-    SYSTEM.HOCOCR2.BYTE = 0x03;                            /* 50MHz        */\r
-    SYSTEM.SCKCR.LONG = 0x10811110;                    \r
-    SYSTEM.SCKCR3.WORD = 0x0100;                       /* LOCO -> HOCO */\r
+//     SYSTEM.SCKCR.LONG = 0x21823333;                 /* ICK=PLL/2,FCK,PCK,BCL=PLL/4 */\r
+/************************************************************************/\r
+/*  If setting bits individually, rather than a single long write,             */\r
+/*     set the BCK value before that of ICK                                                            */\r
+/************************************************************************/\r
+       SYSTEM.SCKCR.BIT.PCKD   = 3;                    /* PLL/8 = 10MHz                */\r
+       SYSTEM.SCKCR.BIT.PCKC   = 3;                    /* PLL/8 = 10MHz                */      \r
+       SYSTEM.SCKCR.BIT.PCKB   = 3;                    /* PLL/8 = 10MHz                */\r
+       SYSTEM.SCKCR.BIT.PCKA   = 3;                    /* PLL/8 = 10MHz                */\r
+       SYSTEM.SCKCR.BIT.BCK    = 3;                    /* PLL/8 = 10MHz                */\r
+       SYSTEM.SCKCR.BIT.PSTOP1 = 1;                    /* BUS CLK OUT Disabled */\r
+       SYSTEM.SCKCR.BIT.ICK    = 1;                    /* PLL/2 = 40MHz                */\r
+       SYSTEM.SCKCR.BIT.FCK    = 2;                    /* PLL/4 = 20MHz                */\r
+\r
+       while(SYSTEM.OPCCR.BIT.OPCMTSF == 1);\r
+       SYSTEM.OPCCR.BIT.OLPCM = 0;\r
+       while(SYSTEM.OPCCR.BIT.OPCMTSF == 1);\r
+#if (CLK_SRC_HOCO == 1)        \r
+       SYSTEM.SCKCR3.WORD = 0x0100;                    /* LOCO -> HOCO */\r
+#else\r
+       SYSTEM.SCKCR3.WORD = 0x0400;                    /* LOCO -> PLL */\r
+#endif\r
 }\r
-\r
index 0cc0a6e0607bdcaf58ae6cbfceca9a80a7abbb8f..0d5c76dcdb63fd095b32eff57c60602975d9e42d 100644 (file)
 "{5F75FDA0-6FF0-11D5-B7CE-00E029352378}PACtrlViews" "0" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_DENORMAL_MODE" "16777216" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_EVAL_ROUND_MODE" "768" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "0000000000004100" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "0000000000000001\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "00000000A5A5A5A5\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "00000000A5A5A5A5\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "00000000A5A5A5A5\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "00000000A5A5A5A5\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "000000000000E3E0" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000003E84\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "0000000000004100" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "000000000000EB10" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000000030000" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFF821C5\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "0000000000004102\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_20" "00000000FFF813CC\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_0" "0000000000000000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_1" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_10" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_11" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_12" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_13" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_14" "0000000000000000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_15" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_16" "0000000000000000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_17" "0000000000000000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_18" "0000000000000000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_19" "00000000FFFF8000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_2" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_20" "0000000000000000\r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_21" "0000000000000000" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_22" "0000000000000000" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_23" "0000000000000000" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_24" "1234567887650000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_24" "0000000000000000" \r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_25" "1234567887650000" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_3" "000000000000E560" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000001644\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000002845\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_3" "0000000000000000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_4" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_5" "0000000000000000\r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_6" "0000000000000000" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "0000000000003DC0" \r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "00000000A5A5A5A5\r
-"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "00000000A5A5A5A5\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_7" "0000000000000000" \r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_8" "0000000000000000\r
+"{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_9" "0000000000000000\r
 "{64753FED-D387-4B8C-A91D-D3419C869C07}C_REGISTER_REG_COUNT" "25" \r
 "{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileDir" "" \r
 "{6C4D5B81-FD67-46A9-A089-EA44DCDE47FD}RAMMonitorManagerCtrlBlockInfoFileName" "" \r
 [CONFIG_INFO_VD4]\r
 0 \r
 [WINDOW_POSITION_STATE_DATA_VD1]\r
-"Help" "TOOLBAR 0" 59419 1 5 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
+"Help" "TOOLBAR 0" 59419 1 6 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
 "QzROM" "TOOLBAR 0" 59419 4 1 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
 "{WK_00000001_CmdLine}ADC_Single_DTC_MTUDefaultSession" "WINDOW" 59422 0 1 "0.50" 230 0 0 350 200 17 0 "32771|32772|32778|<<separator>>|32773|32774|<<separator>>|32820|<<separator>>|32801|32824" "0.0" \r
-"{WK_00000001_CmdLine}" "WINDOW" 59422 0 1 "0.07" 172 0 0 350 200 17 0 "32771|32772|32778|<<separator>>|32773|32774|<<separator>>|32820|<<separator>>|32801|32824" "0.0" \r
+"{WK_00000001_CmdLine}" "WINDOW" 59422 0 2 "0.07" 172 0 0 350 200 17 0 "32771|32772|32778|<<separator>>|32773|32774|<<separator>>|32820|<<separator>>|32801|32824" "0.0" \r
 "{WK_00000001_DEBUGCONSOLE}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59421 0 1 "1.00" 300 0 0 350 200 17 0 "57634|57637|57633|<<separator>>|32781|32782|<<separator>>|32780|32785|32787" "0.0" \r
 "{WK_00000001_DISASSEMBLY}" "WINDOW" 0 0 0 "0.00" 0 -4 -23 936 558 9 0 "" "0.0" \r
+"{WK_00000001_IO}RTOSDemoSessionRX200_E1_E20_SYSTEM" "WINDOW" 59422 0 1 "0.33" 172 0 0 350 200 18 0 "32817|32826|32819|32820|32821" "0.0" \r
 "{WK_00000001_IO}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 1 "0.50" 172 0 0 869 657 17 0 "32817|32826|32819|32820|32821" "0.0" \r
 "{WK_00000001_MEMORY}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 0 "1.00" 219 1452 519 1033 219 2053 0 "42202|42203|42204|42233|<<separator>>|42206|42205|42230|42229|42207|<<separator>>|42208|42209|42210|49076|42228|42227|<<separator>>|42231|42232|42234|42235|<<separator>>|42211|<<separator>>" "0.0" \r
-"{WK_00000001_OUTPUT}" "WINDOW" 59422 0 0 "1.00" 172 560 340 350 200 18 0 "36756|36757|36758|36759|<<separator>>|36746|36747|<<separator>>|39531|<<separator>>|39500|39534|<<separator>>|36687" "0.0" \r
+"{WK_00000001_OUTPUT}" "WINDOW" 59422 0 0 "0.67" 172 560 340 350 200 18 0 "36756|36757|36758|36759|<<separator>>|36746|36747|<<separator>>|39531|<<separator>>|39500|39534|<<separator>>|36687" "0.0" \r
 "{WK_00000001_REGISTERS}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59421 0 1 "1.00" 300 0 0 350 200 2065 0 "" "0.0" \r
 "{WK_00000001_STACKTRACE}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59422 0 0 "0.50" 277 0 0 350 200 2065 0 "" "0.0" \r
 "{WK_00000001_WATCH}RTOSDemoSessionRX600_E1_E20_SYSTEM" "WINDOW" 59421 0 0 "0.50" 300 0 0 1040 307 17 0 "32781|32783|<<separator>>|32771|32829|32772|32827|32773|<<separator>>|32786|<<separator>>|32810|32811" "0.0" \r
-"{WK_00000002_WORKSPACE}" "WINDOW" 59420 0 0 "1.00" 260 560 340 350 200 18 0 "" "0.0" \r
+"{WK_00000002_WORKSPACE}" "WINDOW" 59420 0 0 "1.00" 354 560 340 350 200 18 0 "" "0.0" \r
 "{WK_TB00000001_STANDARD}" "TOOLBAR 0" 59419 0 3 "0.00" 0 0 0 0 0 18 0 "" "0.0" \r
 "{WK_TB00000002_EDITOR}" "TOOLBAR 0" 59419 0 0 "0.00" 0 0 0 0 0 18 0 "" "0.0" \r
 "{WK_TB00000003_BOOKMARKS}" "TOOLBAR 0" 59419 1 1 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
 "{WK_TB00000018_DEFAULTWINDOW}" "TOOLBAR 0" 59419 1 2 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
 "{WK_TB00000023_RTOS}" "TOOLBAR 0" 59419 2 5 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
 "{WK_TB00000025_HELPSYSTEMTOOL}" "TOOLBAR 0" 59419 0 0 "0.00" 0 788 192 0 0 5 0 "" "0.0" \r
-"{WK_TB00000026_MACRO}" "TOOLBAR 0" 59419 1 6 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
+"{WK_TB00000026_MACRO}" "TOOLBAR 0" 59419 1 5 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
 "{WK_TB00000027_EVENT}" "TOOLBAR 0" 59419 2 1 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
 "{WK_TB00000028_RTOSDEBUG}" "TOOLBAR 0" 59419 0 0 "0.00" 0 559 254 0 0 5 0 "" "0.0" \r
 "{WK_TB00000029_SYSTEMTOOL}" "TOOLBAR 0" 59419 2 0 "0.00" 0 0 0 0 0 17 0 "" "0.0" \r
 [WINDOW_POSITION_STATE_DATA_VD4]\r
 [WINDOW_Z_ORDER]\r
 "{WK_TB00000028_RTOSDEBUG} TOOLBAR 0" \r
-"{WK_TB00000025_HELPSYSTEMTOOL} TOOLBAR 0" \r
+"{WK_TB00000013_SYMBOL} TOOLBAR 0" \r
+"{WK_TB00000011_CPU} TOOLBAR 0" \r
 [TARGET_NAME]\r
 "RX E1/E20 SYSTEM" "" 0 \r
 [STATUSBAR_STATEINFO_VD1]\r
index d403156ce33591360f9b2787f34d83d98fbfad47..43bf94ad6409c6fd33c39876b375e663cc337345 100644 (file)
@@ -21,7 +21,7 @@
 \r
 /* Bus controls */\r
 #include "iodefine.h"                  /* Device specific include file */\r
-#include "rskrx62ndef.h"\r
+#include "rskrx210def.h"\r
 \r
 #define        IF_BUS          4                       /* Data bus width (4 or 8) */\r
 #define        IF_INIT()       {}                      /* Initialize control port */\r
index 0c48f47a35f7dad363e44a2a24cd1f97b1492c98..5a989ce1fcc68742b7ab7c18828e1a7bb2b02ffd 100644 (file)
@@ -1,41 +1,41 @@
 /*\r
-    FreeRTOS V6.1.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+       \r
 \r
     ***************************************************************************\r
-    *                                                                         *\r
-    * If you are:                                                             *\r
-    *                                                                         *\r
-    *    + New to FreeRTOS,                                                   *\r
-    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
-    *    + Looking for basic training,                                        *\r
-    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
-    *                                                                         *\r
-    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
-    *                                                                         *\r
-    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
-    *                  http://www.FreeRTOS.org/Documentation                  *\r
-    *                                                                         *\r
-    * A pdf reference manual is also available.  Both are usually delivered   *\r
-    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
-    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
-    * exceptional circumstances).  Thank you for your support!                *\r
-    *                                                                         *\r
+     *                                                                       *\r
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
+     *    Complete, revised, and edited pdf reference manuals are also       *\r
+     *    available.                                                         *\r
+     *                                                                       *\r
+     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
+     *    ensuring you get running as quickly as possible and with an        *\r
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
+     *    the FreeRTOS project to continue with its mission of providing     *\r
+     *    professional grade, cross platform, de facto standard solutions    *\r
+     *    for microcontrollers - completely free of charge!                  *\r
+     *                                                                       *\r
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
+     *                                                                       *\r
+     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *                                                                       *\r
     ***************************************************************************\r
 \r
+\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
-    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
-    a combined work that includes FreeRTOS without being obliged to provide the\r
-    source code for proprietary components outside of the FreeRTOS kernel.\r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public \r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it \r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained \r
+    >>>NOTE<<< The modification to the GPL is included to allow you to\r
+    distribute a combined work that includes FreeRTOS without being obliged to\r
+    provide the source code for proprietary components outside of the FreeRTOS\r
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+    more details. You should have received a copy of the GNU General Public\r
+    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
+    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
     by writing to Richard Barry, contact details for whom are available on the\r
     FreeRTOS WEB site.\r
 \r
diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/rskrx210def.h b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/rskrx210def.h
new file mode 100644 (file)
index 0000000..0dca415
--- /dev/null
@@ -0,0 +1,121 @@
+\r
+/******************************************************************************\r
+* DISCLAIMER\r
+* Please refer to http://www.renesas.com/disclaimer\r
+******************************************************************************\r
+  Copyright (C) 2008. Renesas Technology Corp., All Rights Reserved.\r
+*******************************************************************************\r
+* File Name    : rsksh7216.h\r
+* Version      : 1.00\r
+* Description  : RSK 7216 board specific settings\r
+******************************************************************************\r
+* History : DD.MM.YYYY Version Description\r
+*         : 06.10.2009 1.00    First Release\r
+******************************************************************************/\r
+\r
+#ifndef RSKRX62N_H\r
+#define RSKRX62N_H\r
+\r
+/******************************************************************************\r
+Includes   <System Includes> , "Project Includes"\r
+******************************************************************************/\r
+\r
+/******************************************************************************\r
+Typedef definitions\r
+******************************************************************************/\r
+\r
+/******************************************************************************\r
+Macro definitions\r
+******************************************************************************/\r
+\r
+/* System Clock Settings */\r
+#define                CLK_SRC_HOCO    0\r
+\r
+/* DETAIL THIS LATER !!!! */\r
+#if (CLK_SRC_HOCO == 0)\r
+/* External xtal and PLL circuit */\r
+#define     XTAL_FREQUENCY  (20000000L)        \r
+#define     PLL_MUL         (8)\r
+#define     PLL_INPUT_FREQ_DIV         (2)\r
+#define     ICLK_DIV        (2)\r
+#define     PCLK_DIV        (8)\r
+#define     BCLK_DIV        (8)\r
+#define     PLL_FREQUENCY   (XTAL_FREQUENCY * (PLL_MUL / PLL_INPUT_FREQ_DIV))  \r
+#define     ICLK_FREQUENCY  (PLL_FREQUENCY / ICLK_DIV)\r
+#define     PCLK_FREQUENCY  (PLL_FREQUENCY / PCLK_DIV)\r
+#define     BCLK_FREQUENCY  (PLL_FREQUENCY / BCLK_DIV)\r
+#else\r
+/* Internal high speed on-chip oscillator (HOCO) */\r
+#define     XTAL_FREQUENCY  (50000000L)        \r
+#define     PLL_MUL         (1)\r
+#define     PLL_INPUT_FREQ_DIV         (1)\r
+#define     ICLK_DIV        (2)\r
+#define     PCLK_DIV        (8)\r
+#define     BCLK_DIV        (8)\r
+#define     PLL_FREQUENCY   (XTAL_FREQUENCY * (PLL_MUL / PLL_INPUT_FREQ_DIV))  \r
+#define     ICLK_FREQUENCY  (PLL_FREQUENCY / ICLK_DIV)\r
+#define     PCLK_FREQUENCY  (PLL_FREQUENCY / PCLK_DIV)\r
+#define     BCLK_FREQUENCY  (PLL_FREQUENCY / BCLK_DIV)\r
+#endif\r
+\r
+#define     CMT0_CLK_SELECT (512)\r
+\r
+/* General Values */\r
+#define                LED_ON          (0)\r
+#define        LED_OFF                 (1)\r
+#define        SET_BIT_HIGH    (1)\r
+#define        SET_BIT_LOW             (0)\r
+#define        SET_BYTE_HIGH   (0xFF)\r
+#define        SET_BYTE_LOW    (0x00)\r
+\r
+/* Define switches to be polled if not available as interrupts */\r
+#define                SW_ACTIVE               FALSE\r
+#define        SW1                     PORT0.DR.BIT.B0\r
+#define        SW2                     PORT0.DR.BIT.B1\r
+#define     SW3             PORT0.DR.BIT.B7\r
+#define        SW1_DDR                 PORT0.DDR.BIT.B0\r
+#define        SW2_DDR                 PORT0.DDR.BIT.B1\r
+#define     SW3_DDR         PORT0.DDR.BIT.B7\r
+#define        SW1_ICR                 PORT0.ICR.BIT.B0\r
+#define        SW2_ICR                 PORT0.ICR.BIT.B1\r
+#define     SW3_ICR         PORT0.ICR.BIT.B7\r
+\r
+/* LEDs */\r
+#define                LED0                    PORT1.PODR.BIT.B4\r
+#define                LED1                    PORT1.PODR.BIT.B5\r
+#define                LED2                    PORT1.PODR.BIT.B6\r
+#define                LED3                    PORT1.PODR.BIT.B7\r
+//#define          LED4                        PORT6.DR.BIT.B0\r
+//#define          LED5                        PORT7.DR.BIT.B3\r
+#define                LED0_DDR        PORT1.PDR.BIT.B4\r
+#define                LED1_DDR        PORT1.PDR.BIT.B5\r
+#define                LED2_DDR        PORT1.PDR.BIT.B6\r
+#define                LED3_DDR        PORT1.PDR.BIT.B7\r
+//#define          LED4_DDR        PORT6.DDR.BIT.B0\r
+//#define          LED5_DDR        PORT7.DDR.BIT.B3\r
+\r
+/* 2x8 segment LCD */\r
+#define                INCLUDE_LCD             1\r
+#define     LCD_RS          PORTJ.PODR.BIT.B1\r
+#define     LCD_EN          PORTJ.PODR.BIT.B3\r
+#define     LCD_DATA        PORTH.PODR.BYTE\r
+\r
+#define     LCD_RS_DDR      PORTJ.PDR.BIT.B1\r
+#define     LCD_EN_DDR      PORTJ.PDR.BIT.B3\r
+#define     LCD_DATA_DDR    PORTH.PDR.BYTE\r
+\r
+\r
+\r
+/******************************************************************************\r
+Variable Externs\r
+******************************************************************************/\r
+\r
+/******************************************************************************\r
+Functions Prototypes\r
+******************************************************************************/\r
+\r
+\r
+\r
+/* RSKRX62N_H */\r
+#endif         \r
+\r
diff --git a/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/rskrx62ndef.h b/Demo/RX200_RX210-RSK_Renesas/RTOSDemo/include/rskrx62ndef.h
deleted file mode 100644 (file)
index c65ab0a..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-\r
-/******************************************************************************\r
-* DISCLAIMER\r
-* Please refer to http://www.renesas.com/disclaimer\r
-******************************************************************************\r
-  Copyright (C) 2008. Renesas Technology Corp., All Rights Reserved.\r
-*******************************************************************************\r
-* File Name    : rsksh7216.h\r
-* Version      : 1.00\r
-* Description  : RSK 7216 board specific settings\r
-******************************************************************************\r
-* History : DD.MM.YYYY Version Description\r
-*         : 06.10.2009 1.00    First Release\r
-******************************************************************************/\r
-\r
-#ifndef RSKRX62N_H\r
-#define RSKRX62N_H\r
-\r
-/******************************************************************************\r
-Includes   <System Includes> , "Project Includes"\r
-******************************************************************************/\r
-\r
-/******************************************************************************\r
-Typedef definitions\r
-******************************************************************************/\r
-\r
-/******************************************************************************\r
-Macro definitions\r
-******************************************************************************/\r
-\r
-/* System Clock Settings */\r
-\r
-/* DETAIL THIS LATER !!!! */\r
-\r
-#define     XTAL_FREQUENCY  (50000000L)        \r
-#define     ICLK_MUL        (1)\r
-#define     PCLK_MUL        (2)\r
-#define     BCLK_MUL        (2)\r
-#define     ICLK_FREQUENCY  (XTAL_FREQUENCY * ICLK_MUL)\r
-#define     PCLK_FREQUENCY  (XTAL_FREQUENCY / PCLK_MUL)\r
-#define     BCLK_FREQUENCY  (XTAL_FREQUENCY / BCLK_MUL)\r
-\r
-#define     CMT0_CLK_SELECT (512)\r
-\r
-/* General Values */\r
-#define                LED_ON          (0)\r
-#define        LED_OFF                 (1)\r
-#define        SET_BIT_HIGH    (1)\r
-#define        SET_BIT_LOW             (0)\r
-#define        SET_BYTE_HIGH   (0xFF)\r
-#define        SET_BYTE_LOW    (0x00)\r
-\r
-/* Define switches to be polled if not available as interrupts */\r
-#define                SW_ACTIVE               FALSE\r
-#define        SW1                     PORT0.DR.BIT.B0\r
-#define        SW2                     PORT0.DR.BIT.B1\r
-#define     SW3             PORT0.DR.BIT.B7\r
-#define        SW1_DDR                 PORT0.DDR.BIT.B0\r
-#define        SW2_DDR                 PORT0.DDR.BIT.B1\r
-#define     SW3_DDR         PORT0.DDR.BIT.B7\r
-#define        SW1_ICR                 PORT0.ICR.BIT.B0\r
-#define        SW2_ICR                 PORT0.ICR.BIT.B1\r
-#define     SW3_ICR         PORT0.ICR.BIT.B7\r
-\r
-/* LEDs */\r
-#define                LED0                    PORT1.PODR.BIT.B4\r
-#define                LED1                    PORT1.PODR.BIT.B5\r
-#define                LED2                    PORT1.PODR.BIT.B6\r
-#define                LED3                    PORT1.PODR.BIT.B7\r
-//#define          LED4                        PORT6.DR.BIT.B0\r
-//#define          LED5                        PORT7.DR.BIT.B3\r
-#define                LED0_DDR        PORT1.PDR.BIT.B4\r
-#define                LED1_DDR        PORT1.PDR.BIT.B5\r
-#define                LED2_DDR        PORT1.PDR.BIT.B6\r
-#define                LED3_DDR        PORT1.PDR.BIT.B7\r
-//#define          LED4_DDR        PORT6.DDR.BIT.B0\r
-//#define          LED5_DDR        PORT7.DDR.BIT.B3\r
-\r
-/* 2x8 segment LCD */\r
-#define                INCLUDE_LCD             1\r
-#define     LCD_RS          PORTJ.PODR.BIT.B1\r
-#define     LCD_EN          PORTJ.PODR.BIT.B3\r
-#define     LCD_DATA        PORTH.PODR.BYTE\r
-\r
-#define     LCD_RS_DDR      PORTJ.PDR.BIT.B1\r
-#define     LCD_EN_DDR      PORTJ.PDR.BIT.B3\r
-#define     LCD_DATA_DDR    PORTH.PDR.BYTE\r
-\r
-\r
-\r
-/******************************************************************************\r
-Variable Externs\r
-******************************************************************************/\r
-\r
-/******************************************************************************\r
-Functions Prototypes\r
-******************************************************************************/\r
-\r
-\r
-\r
-/* RSKRX62N_H */\r
-#endif         \r
-\r
index 4f592fae2fe1b1177803222d9ea71fb03120f638..930111b4974de38db5bfd45fa73795b32e567c03 100644 (file)
@@ -27,7 +27,7 @@ User Includes
 /* iodefine.h provides a structure to access all of the device registers. */\r
 #include "iodefine.h"\r
 /* rsk1664def.h provides common defines for widely used items. */\r
-#include "rskrx62ndef.h"\r
+#include "rskrx210def.h"\r
 #include "lcd.h"\r
 \r
 /* Kernel includes. */\r
index 70cdc02d6fe4ac815912fa3573614d216d208765..5b63f63230a2c8d6cb2aaa75e0891a95377d40dc 100644 (file)
@@ -1,41 +1,41 @@
 /*\r
-    FreeRTOS V6.1.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+       \r
 \r
     ***************************************************************************\r
-    *                                                                         *\r
-    * If you are:                                                             *\r
-    *                                                                         *\r
-    *    + New to FreeRTOS,                                                   *\r
-    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
-    *    + Looking for basic training,                                        *\r
-    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
-    *                                                                         *\r
-    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
-    *                                                                         *\r
-    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
-    *                  http://www.FreeRTOS.org/Documentation                  *\r
-    *                                                                         *\r
-    * A pdf reference manual is also available.  Both are usually delivered   *\r
-    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
-    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
-    * exceptional circumstances).  Thank you for your support!                *\r
-    *                                                                         *\r
+     *                                                                       *\r
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
+     *    Complete, revised, and edited pdf reference manuals are also       *\r
+     *    available.                                                         *\r
+     *                                                                       *\r
+     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
+     *    ensuring you get running as quickly as possible and with an        *\r
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
+     *    the FreeRTOS project to continue with its mission of providing     *\r
+     *    professional grade, cross platform, de facto standard solutions    *\r
+     *    for microcontrollers - completely free of charge!                  *\r
+     *                                                                       *\r
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
+     *                                                                       *\r
+     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *                                                                       *\r
     ***************************************************************************\r
 \r
+\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
-    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
-    a combined work that includes FreeRTOS without being obliged to provide the\r
-    source code for proprietary components outside of the FreeRTOS kernel.\r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public \r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it \r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained \r
+    >>>NOTE<<< The modification to the GPL is included to allow you to\r
+    distribute a combined work that includes FreeRTOS without being obliged to\r
+    provide the source code for proprietary components outside of the FreeRTOS\r
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+    more details. You should have received a copy of the GNU General Public\r
+    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
+    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
     by writing to Richard Barry, contact details for whom are available on the\r
     FreeRTOS WEB site.\r
 \r
index 99b6d756faaa720976bc8b43d59a18c7a59fd3aa..8c1b693d0aa35a2679e62e747cea6b5874c848f7 100644 (file)
@@ -1,38 +1,38 @@
 /*\r
-    FreeRTOS V6.1.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+    FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd.\r
+       \r
 \r
     ***************************************************************************\r
-    *                                                                         *\r
-    * If you are:                                                             *\r
-    *                                                                         *\r
-    *    + New to FreeRTOS,                                                   *\r
-    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
-    *    + Looking for basic training,                                        *\r
-    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
-    *                                                                         *\r
-    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
-    *                                                                         *\r
-    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
-    *                  http://www.FreeRTOS.org/Documentation                  *\r
-    *                                                                         *\r
-    * A pdf reference manual is also available.  Both are usually delivered   *\r
-    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
-    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
-    * exceptional circumstances).  Thank you for your support!                *\r
-    *                                                                         *\r
+     *                                                                       *\r
+     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
+     *    Complete, revised, and edited pdf reference manuals are also       *\r
+     *    available.                                                         *\r
+     *                                                                       *\r
+     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
+     *    ensuring you get running as quickly as possible and with an        *\r
+     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
+     *    the FreeRTOS project to continue with its mission of providing     *\r
+     *    professional grade, cross platform, de facto standard solutions    *\r
+     *    for microcontrollers - completely free of charge!                  *\r
+     *                                                                       *\r
+     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
+     *                                                                       *\r
+     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
+     *                                                                       *\r
     ***************************************************************************\r
 \r
+\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
-    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
-    a combined work that includes FreeRTOS without being obliged to provide the\r
-    source code for proprietary components outside of the FreeRTOS kernel.\r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
+    >>>NOTE<<< The modification to the GPL is included to allow you to\r
+    distribute a combined work that includes FreeRTOS without being obliged to\r
+    provide the source code for proprietary components outside of the FreeRTOS\r
+    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
     more details. You should have received a copy of the GNU General Public\r
     License and the FreeRTOS license exception along with FreeRTOS; if not it\r
     can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
  * of all the 8bit timers (as two cascaded 16bit units).\r
 */\r
 \r
+/* Standard includes. */\r
 #include <string.h>\r
 \r
 /* Hardware specific includes. */\r
 #include "GenQTest.h"\r
 #include "QPeek.h"\r
 #include "recmutex.h"\r
-//#include "flop.h"\r
 \r
+/* Peripheral includes. */\r
 #include "lcd.h"\r
 \r
 /* Values that are passed into the reg test tasks using the task parameter.  The\r
@@ -233,17 +234,6 @@ static void prvRegTest2Implementation( void );
 static void prvCheckTask( void *pvParameters );\r
 \r
 \r
-/*\r
- * The LCD task as described at the top of this file.\r
- */\r
-\r
-\r
-\r
-/*\r
- * Contains the implementation of the WEB server.\r
- */\r
-extern void vuIP_Task( void *pvParameters );\r
-\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Variables that are incremented on each iteration of the reg test tasks -\r
@@ -285,8 +275,6 @@ extern void HardwareSetup( void );
        xTaskCreate( prvRegTest1Task, "RegTst1", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_1_PARAMETER, tskIDLE_PRIORITY, NULL );\r
        xTaskCreate( prvRegTest2Task, "RegTst2", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_2_PARAMETER, tskIDLE_PRIORITY, NULL );\r
 \r
-       /* The web server task. */\r
-//     xTaskCreate( vuIP_Task, "uIP", mainuIP_STACK_SIZE, NULL, mainuIP_TASK_PRIORITY, NULL );\r
 \r
        /* LCD task */\r
        LCD_Mutex = xSemaphoreCreateMutex();\r