len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-20 05:21:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor formatting and name changes only.

Browse source
This commit is contained in:
Richard Barry 2010-03-26 10:03:32 +00:00
parent a93c8d6659
commit b492b7eb89
2 changed files with 58 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
Demo/CORTUS_APS3_GCC/Demo/7seg.c
View file

@ -1,5 +1,5 @@
/* /*
FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd. FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
*************************************************************************** ***************************************************************************
* * * *
@ -51,6 +51,7 @@
licensing and training services. licensing and training services.
*/ */
#include <stdlib.h> #include <stdlib.h>
/* Scheduler include files. */ /* Scheduler include files. */
@ -63,23 +64,25 @@
#define x7segSTACK_SIZE configMINIMAL_STACK_SIZE #define x7segSTACK_SIZE configMINIMAL_STACK_SIZE
static portTASK_FUNCTION_PROTO( vRefreshTask, pvParameters ); static void prvRefreshTask( void *pvParameters );
static portTASK_FUNCTION_PROTO( vCountTask, pvParameters ); static void prvCountTask( void *pvParameters );
void vStart7SegTasks( unsigned portBASE_TYPE uxPriority )
{
xTaskCreate (vRefreshTask, ( signed char * ) "7SegRefresh", x7segSTACK_SIZE, NULL, uxPriority, ( xTaskHandle *) NULL );
xTaskCreate (vCountTask, ( signed char * ) "7SegCount", x7segSTACK_SIZE, NULL, uxPriority, ( xTaskHandle *) NULL );
}
/* Value to output to 7 segment display /* Value to output to 7 segment display
led_digits[0] is the right most digit */ led_digits[0] is the right most digit */
static signed char seg7_digits[4]; static signed char seg7_digits[4];
static portTASK_FUNCTION_PROTO( vRefreshTask, pvParameters ) void vStart7SegTasks( unsigned portBASE_TYPE uxPriority )
{
xTaskCreate( prvRefreshTask, ( signed char * ) "7SegRefresh", x7segSTACK_SIZE, NULL, uxPriority, ( xTaskHandle *) NULL );
xTaskCreate( prvCountTask, ( signed char * ) "7SegCount", x7segSTACK_SIZE, NULL, uxPriority, ( xTaskHandle *) NULL );
}
/*-----------------------------------------------------------*/
static void prvRefreshTask( void *pvParameters )
{ {
/* This is table 3.3 from the Spartan-3 Starter Kit board user guide */ /* This is table 3.3 from the Spartan-3 Starter Kit board user guide */
const unsigned char bits[16] = { const unsigned char bits[ 16 ] =
{
0x01, 0x01,
0x4f, 0x4f,
0x12, 0x12,
@ -98,7 +101,8 @@ const unsigned char bits[16] = {
0x38 0x38
}; };
const unsigned char apsx[4] = { const unsigned char apsx[4] =
{
0x06, /* 3 */ 0x06, /* 3 */
0x24, /* S */ 0x24, /* S */
0x18, /* P */ 0x18, /* P */
@ -124,24 +128,26 @@ static int d = 0;
/* Display digit */ /* Display digit */
gpio->out.an = -1; gpio->out.an = -1;
if (seg7_digits[1] == 4 || seg7_digits[1] == 5) { if( ( seg7_digits[ 1 ] == 4 ) || ( seg7_digits[ 1 ] == 5 ) )
{
gpio->out.digit = apsx[ d ]; gpio->out.digit = apsx[ d ];
} else { }
else
{
gpio->out.digit = bits[ seg7_digits[ d ] ]; gpio->out.digit = bits[ seg7_digits[ d ] ];
} }
gpio->out.dp = 1; gpio->out.dp = 1;
gpio->out.an = ~(1 << d); gpio->out.an = ~(1 << d);
} }
} }
} }
/*-----------------------------------------------------------*/
static void prvCountTask( void *pvParameters )
static portTASK_FUNCTION_PROTO( vCountTask, pvParameters )
{ {
portTickType xCountRate, xLastCountTime; portTickType xCountRate, xLastCountTime;
/* Approximately 20HZ */ /* Approximately 20HZ */
xCountRate = configTICK_RATE_HZ / 20; xCountRate = configTICK_RATE_HZ / 20;
@ -155,16 +161,20 @@ portTickType xCountRate, xLastCountTime;
/* Really ugly way to do BCD arithmetic.... */ /* Really ugly way to do BCD arithmetic.... */
seg7_digits[ 0 ] -= 1; seg7_digits[ 0 ] -= 1;
if (seg7_digits[0] < 0) { if( seg7_digits[ 0 ] < 0 )
{
seg7_digits[ 0 ] = 9; seg7_digits[ 0 ] = 9;
seg7_digits[ 1 ] -= 1; seg7_digits[ 1 ] -= 1;
if (seg7_digits[1] < 0) { if( seg7_digits[ 1 ] < 0 )
{
seg7_digits[ 1 ] = 9; seg7_digits[ 1 ] = 9;
seg7_digits[ 2 ] -= 1; seg7_digits[ 2 ] -= 1;
if (seg7_digits[2] < 0) { if( seg7_digits[ 2 ] < 0 )
{
seg7_digits[ 2 ] = 9; seg7_digits[ 2 ] = 9;
seg7_digits[ 3 ] -= 1; seg7_digits[ 3 ] -= 1;
if (seg7_digits[3] < 0) { if( seg7_digits[ 3 ] < 0 )
{
seg7_digits[ 3 ] = 9; seg7_digits[ 3 ] = 9;
} }
} }
@ -173,6 +183,4 @@ portTickType xCountRate, xLastCountTime;
} }
} }
// Local Variables:
// tab-width:4
// End:

4
Demo/CORTUS_APS3_GCC/Demo/serial.c
View file

@ -68,7 +68,7 @@
#include "serial.h" #include "serial.h"
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
#define COM_BLOCK_RETRYTIME 10 #define comBLOCK_RETRY_TIME 10
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vUARTInterruptHandlerTxWrapper(void) __attribute((naked)); void vUARTInterruptHandlerTxWrapper(void) __attribute((naked));
@ -132,7 +132,7 @@ void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString
for( i = 0; i < usStringLength; i++ ) for( i = 0; i < usStringLength; i++ )
{ {
/* Block until character has been transmitted. */ /* Block until character has been transmitted. */
while( xSerialPutChar( pxPort, *pChNext, COM_BLOCK_RETRYTIME ) != pdTRUE ); pChNext++; while( xSerialPutChar( pxPort, *pChNext, comBLOCK_RETRY_TIME ) != pdTRUE ); pChNext++;
} }
} }