mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-08-20 01:58:32 -04:00
Start to remove unnecessary 'signed char *' casts from strings that are now just plain char * types.
This commit is contained in:
parent
b4116a7c7d
commit
da93f1fc4b
261 changed files with 2822 additions and 2815 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
|
||||
FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
|
||||
All rights reserved
|
||||
|
||||
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
|
||||
|
@ -180,8 +180,8 @@ int main( void )
|
|||
vParTestInitialise();
|
||||
|
||||
/* Create the queue used to communicate with the LCD print task. */
|
||||
xLCDQueue = xQueueCreate( mainLCD_QUEUE_LENGTH, sizeof( LCDMessage ) );
|
||||
|
||||
xLCDQueue = xQueueCreate( mainLCD_QUEUE_LENGTH, sizeof( LCDMessage ) );
|
||||
|
||||
/* Create the standard demo application tasks. See the WEB documentation
|
||||
for more information on these tasks. */
|
||||
vCreateBlockTimeTasks();
|
||||
|
@ -190,13 +190,13 @@ int main( void )
|
|||
vStartDynamicPriorityTasks();
|
||||
vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
|
||||
vStartIntegerMathTasks( tskIDLE_PRIORITY );
|
||||
|
||||
|
||||
/* Create the tasks defined within this file. */
|
||||
xTaskCreate( vPrintTask, ( signed char * ) "LCD", configMINIMAL_STACK_SIZE, NULL, mainLCD_TASK_PRIORITY, NULL );
|
||||
xTaskCreate( vCheckTask, ( signed char * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
|
||||
|
||||
xTaskCreate( vPrintTask, "LCD", configMINIMAL_STACK_SIZE, NULL, mainLCD_TASK_PRIORITY, NULL );
|
||||
xTaskCreate( vCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );
|
||||
|
||||
vTaskStartScheduler();
|
||||
|
||||
|
||||
/* Execution will only reach here if there was insufficient heap to
|
||||
start the scheduler. */
|
||||
return 0;
|
||||
|
@ -205,7 +205,7 @@ int main( void )
|
|||
|
||||
static void vCheckTask( void *pvParameters )
|
||||
{
|
||||
static unsigned long ulErrorDetected = pdFALSE;
|
||||
static unsigned long ulErrorDetected = pdFALSE;
|
||||
portTickType xLastExecutionTime;
|
||||
unsigned char *ucErrorMessage = ( unsigned char * )" FAIL";
|
||||
unsigned char *ucSuccessMessage = ( unsigned char * )" PASS";
|
||||
|
@ -222,7 +222,7 @@ LCDMessage xMessage;
|
|||
vTaskDelayUntil( &xLastExecutionTime, mainCHECK_TASK_CYCLE_TIME );
|
||||
|
||||
/* Has an error been found in any of the standard demo tasks? */
|
||||
|
||||
|
||||
if( xAreIntegerMathsTaskStillRunning() != pdTRUE )
|
||||
{
|
||||
ulErrorDetected = pdTRUE;
|
||||
|
@ -237,17 +237,17 @@ LCDMessage xMessage;
|
|||
{
|
||||
ulErrorDetected = pdTRUE;
|
||||
}
|
||||
|
||||
|
||||
if( xAreComTestTasksStillRunning() != pdTRUE )
|
||||
{
|
||||
ulErrorDetected = pdTRUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
|
||||
{
|
||||
ulErrorDetected = pdTRUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Calculate the LCD line on which we would like the message to
|
||||
be displayed. The column variable is used for convenience as
|
||||
it is incremented each cycle anyway. */
|
||||
|
@ -256,19 +256,19 @@ LCDMessage xMessage;
|
|||
/* The message displayed depends on whether an error was found or
|
||||
not. Any discovered error is latched. Here the column variable
|
||||
is used as an index into the text string as a simple way of moving
|
||||
the text from column to column. */
|
||||
the text from column to column. */
|
||||
if( ulErrorDetected == pdFALSE )
|
||||
{
|
||||
xMessage.pucString = ucSuccessMessage + uxColumn;
|
||||
}
|
||||
else
|
||||
{
|
||||
xMessage.pucString = ucErrorMessage + uxColumn;
|
||||
}
|
||||
xMessage.pucString = ucErrorMessage + uxColumn;
|
||||
}
|
||||
|
||||
/* Send the message to the print task for display. */
|
||||
xQueueSend( xLCDQueue, ( void * ) &xMessage, mainNO_DELAY );
|
||||
|
||||
|
||||
/* Make sure the message is printed in a different column the next
|
||||
time around. */
|
||||
uxColumn--;
|
||||
|
@ -289,7 +289,7 @@ LCDMessage xMessage;
|
|||
{
|
||||
/* Wait until a message arrives. */
|
||||
while( xQueueReceive( xLCDQueue, ( void * ) &xMessage, portMAX_DELAY ) != pdPASS );
|
||||
|
||||
|
||||
/* The message contains the text to display, and the line on which the
|
||||
text should be displayed. */
|
||||
LCD_Clear();
|
||||
|
@ -300,51 +300,51 @@ LCDMessage xMessage;
|
|||
|
||||
static void prvSetupHardware(void)
|
||||
{
|
||||
ErrorStatus OSC4MStartUpStatus01;
|
||||
ErrorStatus OSC4MStartUpStatus01;
|
||||
|
||||
/* ST provided routine. */
|
||||
|
||||
/* MRCC system reset */
|
||||
MRCC_DeInit();
|
||||
|
||||
|
||||
/* Wait for OSC4M start-up */
|
||||
OSC4MStartUpStatus01 = MRCC_WaitForOSC4MStartUp();
|
||||
|
||||
|
||||
if(OSC4MStartUpStatus01 == SUCCESS)
|
||||
{
|
||||
/* Set HCLK to 60MHz */
|
||||
MRCC_HCLKConfig(MRCC_CKSYS_Div1);
|
||||
|
||||
|
||||
/* Set CKTIM to 60MHz */
|
||||
MRCC_CKTIMConfig(MRCC_HCLK_Div1);
|
||||
|
||||
|
||||
/* Set PCLK to 30MHz */
|
||||
MRCC_PCLKConfig(MRCC_CKTIM_Div2);
|
||||
|
||||
|
||||
/* Enable Flash Burst mode */
|
||||
CFG_FLASHBurstConfig(CFG_FLASHBurst_Enable);
|
||||
|
||||
|
||||
/* Set CK_SYS to 60 MHz */
|
||||
MRCC_CKSYSConfig(MRCC_CKSYS_OSC4MPLL, MRCC_PLL_Mul_15);
|
||||
}
|
||||
|
||||
|
||||
/* GPIO pins optimized for 3V3 operation */
|
||||
MRCC_IOVoltageRangeConfig(MRCC_IOVoltageRange_3V3);
|
||||
|
||||
|
||||
/* GPIO clock source enable */
|
||||
MRCC_PeripheralClockConfig(MRCC_Peripheral_GPIO, ENABLE);
|
||||
|
||||
|
||||
/* EXTIT clock source enable */
|
||||
MRCC_PeripheralClockConfig(MRCC_Peripheral_EXTIT, ENABLE);
|
||||
/* TB clock source enable */
|
||||
MRCC_PeripheralClockConfig(MRCC_Peripheral_TB, ENABLE);
|
||||
|
||||
|
||||
/* Initialize the demonstration menu */
|
||||
LCD_Init();
|
||||
|
||||
|
||||
LCD_DisplayString(Line1, ( unsigned char * ) "www.FreeRTOS.org", BlackText);
|
||||
LCD_DisplayString(Line2, ( unsigned char * ) " STR750 Demo ", BlackText);
|
||||
|
||||
|
||||
EIC_IRQCmd(ENABLE);
|
||||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue