]> git.sur5r.net Git - freertos/blobdiff - Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.h
Remove unnecessary use of portLONG, portCHAR and portSHORT.
[freertos] / Demo / ARM7_AT91SAM7X256_Eclipse / RTOSDemo / USB / USBSample.h
index 6fe8e0fb26650ac37dd2d398ffa2c4207d8d1515..03ccd612be3d09536f028bf1d92acea2bc59cf6a 100644 (file)
@@ -1,48 +1,49 @@
 /*\r
-       FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.\r
+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.\r
 \r
-       This file is part of the FreeRTOS distribution.\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 a\r
-       combined work that includes FreeRTOS without being obliged to provide the \r
-       source code for proprietary components outside of the FreeRTOS kernel.  \r
-       Alternative commercial license and support terms are also available upon \r
-       request.  See the licensing section of http://www.FreeRTOS.org for full \r
-       license details.\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 a\r
+    combined work that includes FreeRTOS without being obliged to provide the\r
+    source code for proprietary components outside of the FreeRTOS kernel.\r
+    Alternative commercial license and support terms are also available upon\r
+    request.  See the licensing section of http://www.FreeRTOS.org for full\r
+    license details.\r
 \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.\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.\r
 \r
-       You should have received a copy of the GNU General Public License along\r
-       with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59\r
-       Temple Place, Suite 330, Boston, MA  02111-1307  USA.\r
+    You should have received a copy of the GNU General Public License along\r
+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59\r
+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.\r
 \r
 \r
-       ***************************************************************************\r
-       *                                                                         *\r
-       * Looking for a quick start?  Then check out the FreeRTOS eBook!          *\r
-       * See http://www.FreeRTOS.org/Documentation for details                   *\r
-       *                                                                         *\r
-       ***************************************************************************\r
+    ***************************************************************************\r
+    *                                                                         *\r
+    * The FreeRTOS eBook and reference manual are available to purchase for a *\r
+    * small fee. Help yourself get started quickly while also helping the     *\r
+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *\r
+    *                                                                         *\r
+    ***************************************************************************\r
 \r
-       1 tab == 4 spaces!\r
+    1 tab == 4 spaces!\r
 \r
-       Please ensure to read the configuration and relevant port sections of the\r
-       online documentation.\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
+    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
+    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
+    http://www.OpenRTOS.com - Commercial support, development, porting,\r
+    licensing and training services.\r
 */\r
 \r
 #ifndef USB_DEMO_H\r
 #define usbQUEUE_LENGTH                                                ( 0x3 ) /* Must have all bits set! */\r
 #define usbEND_POINT_0                                         ( 0 )\r
 #define usbEND_POINT_1                                         ( 1 )\r
-#define usbRX_COUNT_MASK                                       ( ( unsigned portLONG ) 0x7ff )\r
+#define usbRX_COUNT_MASK                                       ( ( unsigned long ) 0x7ff )\r
 #define AT91C_UDP_STALLSENT                                    AT91C_UDP_ISOERROR\r
 \r
 /* Structure used to take a snapshot of the USB status from within the ISR. */\r
 typedef struct X_ISR_STATUS\r
 {\r
-       unsigned portLONG ulISR;\r
-       unsigned portLONG ulCSR0;\r
-       unsigned portCHAR ucFifoData[ 8 ];\r
+       unsigned long ulISR;\r
+       unsigned long ulCSR0;\r
+       unsigned char ucFifoData[ 8 ];\r
 } xISRStatus;\r
 \r
 /* Macros to manipulate the control and status registers.  These registers \r
@@ -75,14 +76,14 @@ unchanged by writing with a 1. */
        /* Set TXCOMP, RX_DATA_BK0, RXSETUP, */                                                                                         \\r
        /* STALLSENT and RX_DATA_BK1 to 1 so the */                                                                                     \\r
        /* write has no effect. */                                                                                                                      \\r
-       ( * ( ( unsigned portLONG * ) pulValueNow ) ) |= ( unsigned portLONG ) 0x4f;            \\r
+       ( * ( ( unsigned long * ) pulValueNow ) ) |= ( unsigned long ) 0x4f;            \\r
                                                                                                                                                                                \\r
        /* Clear the FORCE_STALL and TXPKTRDY bits */                                                                           \\r
        /* so the write has no effect. */                                                                                                       \\r
-       ( * ( ( unsigned portLONG * ) pulValueNow ) ) &= ( unsigned portLONG ) 0xffffffcf;      \\r
+       ( * ( ( unsigned long * ) pulValueNow ) ) &= ( unsigned long ) 0xffffffcf;      \\r
                                                                                                                                                                                \\r
        /* Set whichever bit we want set. */                                                                                            \\r
-       ( * ( ( unsigned portLONG * ) pulValueNow ) ) |= ( ulBit );                                                     \\r
+       ( * ( ( unsigned long * ) pulValueNow ) ) |= ( ulBit );                                                 \\r
 }\r
 \r
 /*\r