/*\r
- FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.\r
+ FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.\r
\r
- This file is part of the FreeRTOS.org distribution.\r
+ This file is part of the FreeRTOS 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
+ 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.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
+ 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\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
+ 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
- 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
+ * 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
- Please ensure to read the configuration and relevant port sections of the \r
- online documentation.\r
+ 1 tab == 4 spaces!\r
\r
- +++ http://www.FreeRTOS.org +++\r
- Documentation, latest information, license and contact details. \r
+ Please ensure to read the configuration and relevant port sections of the\r
+ online documentation.\r
\r
- +++ http://www.SafeRTOS.com +++\r
- A version that is certified for use in safety critical systems.\r
+ http://www.FreeRTOS.org - Documentation, latest information, license and\r
+ contact details.\r
\r
- +++ http://www.OpenRTOS.com +++\r
- Commercial support, development, porting, licensing and training services.\r
+ http://www.SafeRTOS.com - A version that is certified for use in safety\r
+ critical systems.\r
\r
- ***************************************************************************\r
+ http://www.OpenRTOS.com - Commercial support, development, porting,\r
+ licensing and training services.\r
*/\r
\r
/* Scheduler includes. */\r
/* 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
/* Clear whichever bit we want clear. */ \\r
- ( * ( ( unsigned portLONG * ) pulValueNow ) ) &= ( ~ulBit ); \\r
+ ( * ( ( unsigned long * ) pulValueNow ) ) &= ( ~ulBit ); \\r
}\r
\r
\r
* Actual ISR handler. This must be separate from the entry point as the stack\r
* is used.\r
*/\r
-void vUSB_ISR_Handler( void );\r
+void vUSB_ISR_Handler( void ) __attribute__((noinline));\r
\r
/*-----------------------------------------------------------*/\r
\r
\r
void vUSB_ISR_Handler( void )\r
{\r
-portBASE_TYPE xTaskWokenByPost = pdFALSE; \r
-static volatile unsigned portLONG ulNextMessage = 0;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; \r
+static volatile unsigned long ulNextMessage = 0;\r
xISRStatus *pxMessage;\r
-unsigned portLONG ulTemp, ulRxBytes;\r
+unsigned long ulTemp, ulRxBytes;\r
\r
/* To reduce the amount of time spent in this interrupt it would be \r
possible to defer the majority of this processing to an 'interrupt task',\r
/* The message now contains the entire state and optional data from\r
the USB interrupt. This can now be posted on the Rx queue ready for\r
processing at the task level. */\r
- xTaskWokenByPost = xQueueSendFromISR( xUSBInterruptQueue, &pxMessage, xTaskWokenByPost );\r
+ xQueueSendFromISR( xUSBInterruptQueue, &pxMessage, &xHigherPriorityTaskWoken );\r
\r
/* We may want to switch to the USB task, if this message has made\r
it the highest priority task that is ready to execute. */\r
- if( xTaskWokenByPost )\r
+ if( xHigherPriorityTaskWoken )\r
{\r
portYIELD_FROM_ISR();\r
}\r
\r
/* Call the handler itself. This must be a separate function as it uses\r
the stack. */\r
- vUSB_ISR_Handler();\r
+ __asm volatile ("bl vUSB_ISR_Handler");\r
\r
/* Restore the context of the task that is going to \r
execute next. This might not be the same as the originally \r