/*\r
- FreeRTOS.org V4.2.1 - Copyright (C) 2003-2007 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
- See http://www.FreeRTOS.org for documentation, latest information, license \r
- and contact details. Please ensure to read the configuration and relevant \r
- port sections of the online documentation.\r
-\r
- Also see http://www.SafeRTOS.com for an IEC 61508 compliant version along\r
- with commercial development and support options.\r
- ***************************************************************************\r
+ FreeRTOS V7.1.1 - Copyright (C) 2012 Real Time Engineers Ltd.\r
+ \r
+\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 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
+ 1 tab == 4 spaces!\r
+ \r
+ ***************************************************************************\r
+ * *\r
+ * Having a problem? Start by reading the FAQ "My application does *\r
+ * not run, what could be wrong? *\r
+ * *\r
+ * http://www.FreeRTOS.org/FAQHelp.html *\r
+ * *\r
+ ***************************************************************************\r
+\r
+ \r
+ http://www.FreeRTOS.org - Documentation, training, latest information, \r
+ license and contact details.\r
+ \r
+ http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
+ including FreeRTOS+Trace - an indispensable productivity tool.\r
+\r
+ Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
+ the code with commercial support, indemnification, and middleware, under \r
+ the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also\r
+ provide a safety engineered and independently SIL3 certified version under \r
+ the SafeRTOS brand: http://www.SafeRTOS.com.\r
*/\r
\r
\r
static void vPrintTask( void *pvParameter );\r
\r
/* String that is transmitted on the UART. */\r
-static portCHAR *cMessage = "Task woken by button interrupt! --- ";\r
-static volatile portCHAR *pcNextChar;\r
+static char *cMessage = "Task woken by button interrupt! --- ";\r
+static volatile char *pcNextChar;\r
\r
/* The semaphore used to wake the button handler task from within the GPIO\r
interrupt handler. */\r
/* The queue used to send strings to the print task for display on the LCD. */\r
xQueueHandle xPrintQueue;\r
\r
+/* Newer library version. */\r
+extern void UARTConfigSetExpClk(unsigned long ulBase, unsigned long ulUARTClk, unsigned long ulBaud, unsigned long ulConfig);\r
/*-----------------------------------------------------------*/\r
\r
int main( void )\r
xSemaphoreTake( xButtonSemaphore, 0 );\r
\r
/* Create the queue used to pass message to vPrintTask. */\r
- xPrintQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( portCHAR * ) );\r
+ xPrintQueue = xQueueCreate( mainQUEUE_SIZE, sizeof( char * ) );\r
\r
/* Start the standard demo tasks. */\r
vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
{\r
portBASE_TYPE xErrorOccurred = pdFALSE;\r
portTickType xLastExecutionTime;\r
-const portCHAR *pcPassMessage = "PASS";\r
-const portCHAR *pcFailMessage = "FAIL";\r
+const char *pcPassMessage = "PASS";\r
+const char *pcFailMessage = "FAIL";\r
\r
/* Initialise xLastExecutionTime so the first call to vTaskDelayUntil()\r
works correctly. */\r
SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOC);\r
GPIODirModeSet(GPIO_PORTC_BASE, mainPUSH_BUTTON, GPIO_DIR_MODE_IN);\r
GPIOIntTypeSet( GPIO_PORTC_BASE, mainPUSH_BUTTON,GPIO_FALLING_EDGE );\r
+ IntPrioritySet( INT_GPIOC, configKERNEL_INTERRUPT_PRIORITY );\r
GPIOPinIntEnable( GPIO_PORTC_BASE, mainPUSH_BUTTON );\r
IntEnable( INT_GPIOC );\r
\r
GPIODirModeSet( GPIO_PORTA_BASE, GPIO_PIN_0 | GPIO_PIN_1, GPIO_DIR_MODE_HW );\r
\r
/* Configure the UART for 8-N-1 operation. */\r
- UARTConfigSet( UART0_BASE, mainBAUD_RATE, UART_CONFIG_WLEN_8 | UART_CONFIG_PAR_NONE | UART_CONFIG_STOP_ONE );\r
+ UARTConfigSetExpClk( UART0_BASE, SysCtlClockGet(), mainBAUD_RATE, UART_CONFIG_WLEN_8 | UART_CONFIG_PAR_NONE | UART_CONFIG_STOP_ONE );\r
\r
/* We don't want to use the fifo. This is for test purposes to generate\r
as many interrupts as possible. */\r
\r
/* Enable Tx interrupts. */\r
HWREG( UART0_BASE + UART_O_IM ) |= UART_INT_TX;\r
+ IntPrioritySet( INT_UART0, configKERNEL_INTERRUPT_PRIORITY );\r
IntEnable( INT_UART0 );\r
\r
\r
\r
static void vButtonHandlerTask( void *pvParameters )\r
{\r
-const portCHAR *pcInterruptMessage = "Int";\r
+const char *pcInterruptMessage = "Int";\r
\r
for( ;; )\r
{\r
\r
void vUART_ISR(void)\r
{\r
-unsigned portLONG ulStatus;\r
+unsigned long ulStatus;\r
\r
/* What caused the interrupt. */\r
ulStatus = UARTIntStatus( UART0_BASE, pdTRUE );\r
\r
void vGPIO_ISR( void )\r
{\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
+\r
/* Clear the interrupt. */\r
- GPIOPinIntClear(GPIO_PORTC_BASE, mainPUSH_BUTTON);\r
+ GPIOPinIntClear( GPIO_PORTC_BASE, mainPUSH_BUTTON );\r
\r
/* Wake the button handler task. */\r
- if( xSemaphoreGiveFromISR( xButtonSemaphore, pdFALSE ) )\r
- {\r
- portEND_SWITCHING_ISR( pdTRUE );\r
- }\r
+ xSemaphoreGiveFromISR( xButtonSemaphore, &xHigherPriorityTaskWoken );\r
+ portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );\r
}\r
/*-----------------------------------------------------------*/\r
\r
static void vPrintTask( void *pvParameters )\r
{\r
-portCHAR *pcMessage;\r
+char *pcMessage;\r
unsigned portBASE_TYPE uxLine = 0, uxRow = 0;\r
\r
for( ;; )\r
projects / freertos / blobdiff