Change projects to split the dsPIC and PIC24 taskYIELD implementations.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@414 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24.S b/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24.S
new file mode 100644 (file)
index 0000000..de6e151
--- /dev/null
+++ b/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24.S
@@ -0,0 +1,100 @@
+/*\r
+       FreeRTOS.org V5.0.2 - Copyright (C) 2003-2008 Richard Barry.\r
+\r
+       This file is part of the FreeRTOS.org distribution.\r
+\r
+       FreeRTOS.org is free software; you can redistribute it and/or modify\r
+       it under the terms of the GNU General Public License as published by\r
+       the Free Software Foundation; either version 2 of the License, or\r
+       (at your option) any later version.\r
+\r
+       FreeRTOS.org is distributed in the hope that it will be useful,\r
+       but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+       GNU General Public License for more details.\r
+\r
+       You should have received a copy of the GNU General Public License\r
+       along with FreeRTOS.org; if not, write to the Free Software\r
+       Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+\r
+       A special exception to the GPL can be applied should you wish to distribute\r
+       a combined work that includes FreeRTOS.org, without being obliged to provide\r
+       the source code for any proprietary components.  See the licensing section \r
+       of http://www.FreeRTOS.org for full details of how and when the exception\r
+       can be applied.\r
+\r
+    ***************************************************************************\r
+    ***************************************************************************\r
+    *                                                                         *\r
+    * SAVE TIME AND MONEY!  We can port FreeRTOS.org to your own hardware,    *\r
+    * and even write all or part of your application on your behalf.          *\r
+    * See http://www.OpenRTOS.com for details of the services we provide to   *\r
+    * expedite your project.                                                  *\r
+    *                                                                         *\r
+    ***************************************************************************\r
+    ***************************************************************************\r
+\r
+       Please ensure to read the configuration and relevant port sections of the\r
+       online documentation.\r
+\r
+       http://www.FreeRTOS.org - Documentation, latest information, license and \r
+       contact details.\r
+\r
+       http://www.SafeRTOS.com - A version that is certified for use in safety \r
+       critical systems.\r
+\r
+       http://www.OpenRTOS.com - Commercial support, development, porting, \r
+       licensing and training services.\r
+*/\r
+\r
+        .global _vPortYield\r
+               .extern _vTaskSwitchContext\r
+               .extern uxCriticalNesting\r
+\r
+_vPortYield:\r
+\r
+               PUSH    SR                                              /* Save the SR used by the task.... */\r
+               PUSH    W0                                              /* ....then disable interrupts. */\r
+               MOV             #32, W0\r
+               MOV             W0, SR\r
+               PUSH    W1                                              /* Save registers to the stack. */\r
+               PUSH.D  W2\r
+               PUSH.D  W4\r
+               PUSH.D  W6\r
+               PUSH.D  W8\r
+               PUSH.D  W10\r
+               PUSH.D  W12\r
+               PUSH    W14\r
+               PUSH    RCOUNT\r
+               PUSH    TBLPAG\r
+                                                                                                                                                                               \r
+               PUSH    CORCON\r
+               PUSH    PSVPAG\r
+               MOV             _uxCriticalNesting, W0          /* Save the critical nesting counter for the task. */\r
+               PUSH    W0\r
+               MOV             _pxCurrentTCB, W0                       /* Save the new top of stack into the TCB. */\r
+               MOV             W15, [W0]\r
+\r
+               call    _vTaskSwitchContext\r
+\r
+               MOV             _pxCurrentTCB, W0                       /* Restore the stack pointer for the task. */\r
+               MOV             [W0], W15\r
+               POP             W0                                                      /* Restore the critical nesting counter for the task. */\r
+               MOV             W0, _uxCriticalNesting\r
+               POP             PSVPAG\r
+               POP             CORCON\r
+               POP             TBLPAG\r
+               POP             RCOUNT                                          /* Restore the registers from the stack. */\r
+               POP             W14\r
+               POP.D   W12\r
+               POP.D   W10\r
+               POP.D   W8\r
+               POP.D   W6\r
+               POP.D   W4\r
+               POP.D   W2\r
+               POP.D   W0\r
+               POP             SR\r
+\r
+        return\r
+\r
+        .end\r

diff --git a/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24_dsPIC.S b/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24_dsPIC.S
deleted file mode 100644 (file)
index 2354f00..0000000
--- a/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24_dsPIC.S
+++ /dev/null
@@ -1,130 +0,0 @@
-/*\r
-       FreeRTOS.org V5.0.2 - Copyright (C) 2003-2008 Richard Barry.\r
-\r
-       This file is part of the FreeRTOS.org distribution.\r
-\r
-       FreeRTOS.org is free software; you can redistribute it and/or modify\r
-       it under the terms of the GNU General Public License as published by\r
-       the Free Software Foundation; either version 2 of the License, or\r
-       (at your option) any later version.\r
-\r
-       FreeRTOS.org is distributed in the hope that it will be useful,\r
-       but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-       GNU General Public License for more details.\r
-\r
-       You should have received a copy of the GNU General Public License\r
-       along with FreeRTOS.org; if not, write to the Free Software\r
-       Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
-\r
-       A special exception to the GPL can be applied should you wish to distribute\r
-       a combined work that includes FreeRTOS.org, without being obliged to provide\r
-       the source code for any proprietary components.  See the licensing section \r
-       of http://www.FreeRTOS.org for full details of how and when the exception\r
-       can be applied.\r
-\r
-    ***************************************************************************\r
-    ***************************************************************************\r
-    *                                                                         *\r
-    * SAVE TIME AND MONEY!  We can port FreeRTOS.org to your own hardware,    *\r
-    * and even write all or part of your application on your behalf.          *\r
-    * See http://www.OpenRTOS.com for details of the services we provide to   *\r
-    * expedite your project.                                                  *\r
-    *                                                                         *\r
-    ***************************************************************************\r
-    ***************************************************************************\r
-\r
-       Please ensure to read the configuration and relevant port sections of the\r
-       online documentation.\r
-\r
-       http://www.FreeRTOS.org - Documentation, latest information, license and \r
-       contact details.\r
-\r
-       http://www.SafeRTOS.com - A version that is certified for use in safety \r
-       critical systems.\r
-\r
-       http://www.OpenRTOS.com - Commercial support, development, porting, \r
-       licensing and training services.\r
-*/\r
-\r
-        .global _vPortYield\r
-               .extern _vTaskSwitchContext\r
-               .extern uxCriticalNesting\r
-\r
-_vPortYield:\r
-\r
-               PUSH    SR                                              /* Save the SR used by the task.... */\r
-               PUSH    W0                                              /* ....then disable interrupts. */\r
-               MOV             #32, W0\r
-               MOV             W0, SR\r
-               PUSH    W1                                              /* Save registers to the stack. */\r
-               PUSH.D  W2\r
-               PUSH.D  W4\r
-               PUSH.D  W6\r
-               PUSH.D  W8\r
-               PUSH.D  W10\r
-               PUSH.D  W12\r
-               PUSH    W14\r
-               PUSH    RCOUNT\r
-               PUSH    TBLPAG\r
-               \r
-               #ifdef MPLAB_DSPIC_PORT\r
-                       PUSH    ACCAL\r
-                       PUSH    ACCAH\r
-                       PUSH    ACCAU\r
-                       PUSH    ACCBL\r
-                       PUSH    ACCBH\r
-                       PUSH    ACCBU\r
-                       PUSH    DCOUNT\r
-                       PUSH    DOSTARTL\r
-                       PUSH    DOSTARTH\r
-                       PUSH    DOENDL\r
-                       PUSH    DOENDH\r
-               #endif\r
-               \r
-                                                                                                                                                                               \r
-               PUSH    CORCON\r
-               PUSH    PSVPAG\r
-               MOV             _uxCriticalNesting, W0          /* Save the critical nesting counter for the task. */\r
-               PUSH    W0\r
-               MOV             _pxCurrentTCB, W0                       /* Save the new top of stack into the TCB. */\r
-               MOV             W15, [W0]\r
-\r
-               call    _vTaskSwitchContext\r
-\r
-               MOV             _pxCurrentTCB, W0                       /* Restore the stack pointer for the task. */\r
-               MOV             [W0], W15\r
-               POP             W0                                                      /* Restore the critical nesting counter for the task. */\r
-               MOV             W0, _uxCriticalNesting\r
-               POP             PSVPAG\r
-               POP             CORCON\r
-\r
-               #ifdef MPLAB_DSPIC_PORT\r
-                       POP             DOENDH\r
-                       POP             DOENDL\r
-                       POP             DOSTARTH\r
-                       POP             DOSTARTL\r
-                       POP             DCOUNT\r
-                       POP             ACCBU\r
-                       POP             ACCBH\r
-                       POP             ACCBL\r
-                       POP             ACCAU\r
-                       POP             ACCAH\r
-                       POP             ACCAL\r
-               #endif\r
-\r
-               POP             TBLPAG\r
-               POP             RCOUNT                                          /* Restore the registers from the stack. */\r
-               POP             W14\r
-               POP.D   W12\r
-               POP.D   W10\r
-               POP.D   W8\r
-               POP.D   W6\r
-               POP.D   W4\r
-               POP.D   W2\r
-               POP.D   W0\r
-               POP             SR\r
-\r
-        return\r
-\r
-        .end\r

diff --git a/Source/portable/MPLAB/PIC24_dsPIC/portasm_dsPIC.S b/Source/portable/MPLAB/PIC24_dsPIC/portasm_dsPIC.S
new file mode 100644 (file)
index 0000000..0bcfc0a
--- /dev/null
+++ b/Source/portable/MPLAB/PIC24_dsPIC/portasm_dsPIC.S
@@ -0,0 +1,123 @@
+/*\r
+       FreeRTOS.org V5.0.2 - Copyright (C) 2003-2008 Richard Barry.\r
+\r
+       This file is part of the FreeRTOS.org distribution.\r
+\r
+       FreeRTOS.org is free software; you can redistribute it and/or modify\r
+       it under the terms of the GNU General Public License as published by\r
+       the Free Software Foundation; either version 2 of the License, or\r
+       (at your option) any later version.\r
+\r
+       FreeRTOS.org is distributed in the hope that it will be useful,\r
+       but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+       GNU General Public License for more details.\r
+\r
+       You should have received a copy of the GNU General Public License\r
+       along with FreeRTOS.org; if not, write to the Free Software\r
+       Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+\r
+       A special exception to the GPL can be applied should you wish to distribute\r
+       a combined work that includes FreeRTOS.org, without being obliged to provide\r
+       the source code for any proprietary components.  See the licensing section \r
+       of http://www.FreeRTOS.org for full details of how and when the exception\r
+       can be applied.\r
+\r
+    ***************************************************************************\r
+    ***************************************************************************\r
+    *                                                                         *\r
+    * SAVE TIME AND MONEY!  We can port FreeRTOS.org to your own hardware,    *\r
+    * and even write all or part of your application on your behalf.          *\r
+    * See http://www.OpenRTOS.com for details of the services we provide to   *\r
+    * expedite your project.                                                  *\r
+    *                                                                         *\r
+    ***************************************************************************\r
+    ***************************************************************************\r
+\r
+       Please ensure to read the configuration and relevant port sections of the\r
+       online documentation.\r
+\r
+       http://www.FreeRTOS.org - Documentation, latest information, license and \r
+       contact details.\r
+\r
+       http://www.SafeRTOS.com - A version that is certified for use in safety \r
+       critical systems.\r
+\r
+       http://www.OpenRTOS.com - Commercial support, development, porting, \r
+       licensing and training services.\r
+*/\r
+\r
+        .global _vPortYield\r
+               .extern _vTaskSwitchContext\r
+               .extern uxCriticalNesting\r
+\r
+_vPortYield:\r
+\r
+               PUSH    SR                                              /* Save the SR used by the task.... */\r
+               PUSH    W0                                              /* ....then disable interrupts. */\r
+               MOV             #32, W0\r
+               MOV             W0, SR\r
+               PUSH    W1                                              /* Save registers to the stack. */\r
+               PUSH.D  W2\r
+               PUSH.D  W4\r
+               PUSH.D  W6\r
+               PUSH.D  W8\r
+               PUSH.D  W10\r
+               PUSH.D  W12\r
+               PUSH    W14\r
+               PUSH    RCOUNT\r
+               PUSH    TBLPAG\r
+               PUSH    ACCAL\r
+               PUSH    ACCAH\r
+               PUSH    ACCAU\r
+               PUSH    ACCBL\r
+               PUSH    ACCBH\r
+               PUSH    ACCBU\r
+               PUSH    DCOUNT\r
+               PUSH    DOSTARTL\r
+               PUSH    DOSTARTH\r
+               PUSH    DOENDL\r
+               PUSH    DOENDH\r
+               \r
+                                                                                                                                                                               \r
+               PUSH    CORCON\r
+               PUSH    PSVPAG\r
+               MOV             _uxCriticalNesting, W0          /* Save the critical nesting counter for the task. */\r
+               PUSH    W0\r
+               MOV             _pxCurrentTCB, W0                       /* Save the new top of stack into the TCB. */\r
+               MOV             W15, [W0]\r
+\r
+               call    _vTaskSwitchContext\r
+\r
+               MOV             _pxCurrentTCB, W0                       /* Restore the stack pointer for the task. */\r
+               MOV             [W0], W15\r
+               POP             W0                                                      /* Restore the critical nesting counter for the task. */\r
+               MOV             W0, _uxCriticalNesting\r
+               POP             PSVPAG\r
+               POP             CORCON\r
+               POP             DOENDH\r
+               POP             DOENDL\r
+               POP             DOSTARTH\r
+               POP             DOSTARTL\r
+               POP             DCOUNT\r
+               POP             ACCBU\r
+               POP             ACCBH\r
+               POP             ACCBL\r
+               POP             ACCAU\r
+               POP             ACCAH\r
+               POP             ACCAL\r
+               POP             TBLPAG\r
+               POP             RCOUNT                                          /* Restore the registers from the stack. */\r
+               POP             W14\r
+               POP.D   W12\r
+               POP.D   W10\r
+               POP.D   W8\r
+               POP.D   W6\r
+               POP.D   W4\r
+               POP.D   W2\r
+               POP.D   W0\r
+               POP             SR\r
+\r
+        return\r
+\r
+        .end\r