mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-09-02 12:24:07 -04:00
Tidy up 16bit Fujitsu port ready for release.
This commit is contained in:
Richard Barry
parent
95189f40d2
commit
6bc6cc282d
12 changed files with 607 additions and 318 deletions
|
|
@ -0,0 +1,286 @@
|
|||
/*
|
||||
Copyright 2001, 2002 Georges Menie (www.menie.org)
|
||||
stdarg version contributed by Christian Ettinger
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
/*
|
||||
putchar is the only external dependency for this file,
|
||||
if you have a working putchar, leave it commented out.
|
||||
If not, uncomment the define below and
|
||||
replace outbyte(c) by your own function call.
|
||||
|
||||
#define putchar(c) outbyte(c)
|
||||
*/
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
static void printchar(char **str, int c)
|
||||
{
|
||||
extern int putchar(int c);
|
||||
|
||||
if (str) {
|
||||
**str = c;
|
||||
++(*str);
|
||||
}
|
||||
else (void)putchar(c);
|
||||
}
|
||||
|
||||
#define PAD_RIGHT 1
|
||||
#define PAD_ZERO 2
|
||||
|
||||
static int prints(char **out, const char *string, int width, int pad)
|
||||
{
|
||||
register int pc = 0, padchar = ' ';
|
||||
|
||||
if (width > 0) {
|
||||
register int len = 0;
|
||||
register const char *ptr;
|
||||
for (ptr = string; *ptr; ++ptr) ++len;
|
||||
if (len >= width) width = 0;
|
||||
else width -= len;
|
||||
if (pad & PAD_ZERO) padchar = '0';
|
||||
}
|
||||
if (!(pad & PAD_RIGHT)) {
|
||||
for ( ; width > 0; --width) {
|
||||
printchar (out, padchar);
|
||||
++pc;
|
||||
}
|
||||
}
|
||||
for ( ; *string ; ++string) {
|
||||
printchar (out, *string);
|
||||
++pc;
|
||||
}
|
||||
for ( ; width > 0; --width) {
|
||||
printchar (out, padchar);
|
||||
++pc;
|
||||
}
|
||||
|
||||
return pc;
|
||||
}
|
||||
|
||||
/* the following should be enough for 32 bit int */
|
||||
#define PRINT_BUF_LEN 12
|
||||
|
||||
static int printi(char **out, int i, int b, int sg, int width, int pad, int letbase)
|
||||
{
|
||||
char print_buf[PRINT_BUF_LEN];
|
||||
register char *s;
|
||||
register int t, neg = 0, pc = 0;
|
||||
register unsigned int u = i;
|
||||
|
||||
if (i == 0) {
|
||||
print_buf[0] = '0';
|
||||
print_buf[1] = '\0';
|
||||
return prints (out, print_buf, width, pad);
|
||||
}
|
||||
|
||||
if (sg && b == 10 && i < 0) {
|
||||
neg = 1;
|
||||
u = -i;
|
||||
}
|
||||
|
||||
s = print_buf + PRINT_BUF_LEN-1;
|
||||
*s = '\0';
|
||||
|
||||
while (u) {
|
||||
t = u % b;
|
||||
if( t >= 10 )
|
||||
t += letbase - '0' - 10;
|
||||
*--s = t + '0';
|
||||
u /= b;
|
||||
}
|
||||
|
||||
if (neg) {
|
||||
if( width && (pad & PAD_ZERO) ) {
|
||||
printchar (out, '-');
|
||||
++pc;
|
||||
--width;
|
||||
}
|
||||
else {
|
||||
*--s = '-';
|
||||
}
|
||||
}
|
||||
|
||||
return pc + prints (out, s, width, pad);
|
||||
}
|
||||
|
||||
static int print( char **out, const char *format, va_list args )
|
||||
{
|
||||
register int width, pad;
|
||||
register int pc = 0;
|
||||
char scr[2];
|
||||
|
||||
for (; *format != 0; ++format) {
|
||||
if (*format == '%') {
|
||||
++format;
|
||||
width = pad = 0;
|
||||
if (*format == '\0') break;
|
||||
if (*format == '%') goto out;
|
||||
if (*format == '-') {
|
||||
++format;
|
||||
pad = PAD_RIGHT;
|
||||
}
|
||||
while (*format == '0') {
|
||||
++format;
|
||||
pad |= PAD_ZERO;
|
||||
}
|
||||
for ( ; *format >= '0' && *format <= '9'; ++format) {
|
||||
width *= 10;
|
||||
width += *format - '0';
|
||||
}
|
||||
if( *format == 's' ) {
|
||||
register char *s = (char *)va_arg( args, int );
|
||||
pc += prints (out, s?s:"(null)", width, pad);
|
||||
continue;
|
||||
}
|
||||
if( *format == 'd' ) {
|
||||
pc += printi (out, va_arg( args, int ), 10, 1, width, pad, 'a');
|
||||
continue;
|
||||
}
|
||||
if( *format == 'x' ) {
|
||||
pc += printi (out, va_arg( args, int ), 16, 0, width, pad, 'a');
|
||||
continue;
|
||||
}
|
||||
if( *format == 'X' ) {
|
||||
pc += printi (out, va_arg( args, int ), 16, 0, width, pad, 'A');
|
||||
continue;
|
||||
}
|
||||
if( *format == 'u' ) {
|
||||
pc += printi (out, va_arg( args, int ), 10, 0, width, pad, 'a');
|
||||
continue;
|
||||
}
|
||||
if( *format == 'c' ) {
|
||||
/* char are converted to int then pushed on the stack */
|
||||
scr[0] = (char)va_arg( args, int );
|
||||
scr[1] = '\0';
|
||||
pc += prints (out, scr, width, pad);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else {
|
||||
out:
|
||||
printchar (out, *format);
|
||||
++pc;
|
||||
}
|
||||
}
|
||||
if (out) **out = '\0';
|
||||
va_end( args );
|
||||
return pc;
|
||||
}
|
||||
|
||||
int printf(const char *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start( args, format );
|
||||
return print( 0, format, args );
|
||||
}
|
||||
|
||||
int sprintf(char *out, const char *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start( args, format );
|
||||
return print( &out, format, args );
|
||||
}
|
||||
|
||||
|
||||
int snprintf( char *buf, unsigned int count, const char *format, ... )
|
||||
{
|
||||
va_list args;
|
||||
|
||||
( void ) count;
|
||||
|
||||
va_start( args, format );
|
||||
return print( &buf, format, args );
|
||||
}
|
||||
|
||||
|
||||
#ifdef TEST_PRINTF
|
||||
int main(void)
|
||||
{
|
||||
char *ptr = "Hello world!";
|
||||
char *np = 0;
|
||||
int i = 5;
|
||||
unsigned int bs = sizeof(int)*8;
|
||||
int mi;
|
||||
char buf[80];
|
||||
|
||||
mi = (1 << (bs-1)) + 1;
|
||||
printf("%s\n", ptr);
|
||||
printf("printf test\n");
|
||||
printf("%s is null pointer\n", np);
|
||||
printf("%d = 5\n", i);
|
||||
printf("%d = - max int\n", mi);
|
||||
printf("char %c = 'a'\n", 'a');
|
||||
printf("hex %x = ff\n", 0xff);
|
||||
printf("hex %02x = 00\n", 0);
|
||||
printf("signed %d = unsigned %u = hex %x\n", -3, -3, -3);
|
||||
printf("%d %s(s)%", 0, "message");
|
||||
printf("\n");
|
||||
printf("%d %s(s) with %%\n", 0, "message");
|
||||
sprintf(buf, "justif: \"%-10s\"\n", "left"); printf("%s", buf);
|
||||
sprintf(buf, "justif: \"%10s\"\n", "right"); printf("%s", buf);
|
||||
sprintf(buf, " 3: %04d zero padded\n", 3); printf("%s", buf);
|
||||
sprintf(buf, " 3: %-4d left justif.\n", 3); printf("%s", buf);
|
||||
sprintf(buf, " 3: %4d right justif.\n", 3); printf("%s", buf);
|
||||
sprintf(buf, "-3: %04d zero padded\n", -3); printf("%s", buf);
|
||||
sprintf(buf, "-3: %-4d left justif.\n", -3); printf("%s", buf);
|
||||
sprintf(buf, "-3: %4d right justif.\n", -3); printf("%s", buf);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* if you compile this file with
|
||||
* gcc -Wall $(YOUR_C_OPTIONS) -DTEST_PRINTF -c printf.c
|
||||
* you will get a normal warning:
|
||||
* printf.c:214: warning: spurious trailing `%' in format
|
||||
* this line is testing an invalid % at the end of the format string.
|
||||
*
|
||||
* this should display (on 32bit int machine) :
|
||||
*
|
||||
* Hello world!
|
||||
* printf test
|
||||
* (null) is null pointer
|
||||
* 5 = 5
|
||||
* -2147483647 = - max int
|
||||
* char a = 'a'
|
||||
* hex ff = ff
|
||||
* hex 00 = 00
|
||||
* signed -3 = unsigned 4294967293 = hex fffffffd
|
||||
* 0 message(s)
|
||||
* 0 message(s) with %
|
||||
* justif: "left "
|
||||
* justif: " right"
|
||||
* 3: 0003 zero padded
|
||||
* 3: 3 left justif.
|
||||
* 3: 3 right justif.
|
||||
* -3: -003 zero padded
|
||||
* -3: -3 left justif.
|
||||
* -3: -3 right justif.
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
/* To keep linker happy. */
|
||||
int write( int i, char* c, int n)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -15,8 +15,9 @@
|
|||
#include "mb96348hs.h"
|
||||
#include "FreeRTOS.h"
|
||||
#include "task.h"
|
||||
#include "queue.h"
|
||||
|
||||
static void vUART1Task( void *pvParameters );
|
||||
static void vUART0Task( void *pvParameters );
|
||||
|
||||
/**************************@INCLUDE_END*************************/
|
||||
|
||||
|
|
@ -25,63 +26,64 @@ const char ASCII[] = "0123456789ABCDEF";
|
|||
|
||||
xTaskHandle UART_TaskHandle;
|
||||
|
||||
void InitUart1( void )
|
||||
static xQueueHandle xQueue;
|
||||
void InitUart0( void )
|
||||
{
|
||||
/* Initialize UART asynchronous mode */
|
||||
BGR1 = configCLKP1_CLOCK_HZ / 9600; /* 9600 Baud @ CLKP1 - 56 MHz */
|
||||
BGR0 = configCLKP1_CLOCK_HZ / 9600; /* 9600 Baud @ CLKP1 - 56 MHz */
|
||||
|
||||
SCR1 = 0x17; /* 8N1 */
|
||||
SMR1 = 0x0d; /* enable SOT3, Reset, normal mode */
|
||||
SSR1 = 0x02; /* LSB first, enable receive interrupts */
|
||||
SCR0 = 0x17; /* 8N1 */
|
||||
SMR0 = 0x0d; /* enable SOT3, Reset, normal mode */
|
||||
SSR0 = 0x02; /* LSB first, enable receive interrupts */
|
||||
|
||||
PIER08_IE5 = 1; /* enable input */
|
||||
DDR08_D5 = 0; /* switch P08_5 to input */
|
||||
DDR08_D6 = 1; /* switch P08_6 to output */
|
||||
PIER08_IE2 = 1; /* enable input */
|
||||
DDR08_D2 = 0; /* switch P08_2 to input */
|
||||
DDR08_D3 = 1; /* switch P08_3 to output */
|
||||
}
|
||||
|
||||
void Putch1( char ch ) /* sends a char */
|
||||
void Putch0( char ch ) /* sends a char */
|
||||
{
|
||||
while( SSR1_TDRE == 0 );
|
||||
while( SSR0_TDRE == 0 );
|
||||
|
||||
/* wait for transmit buffer empty */
|
||||
TDR1 = ch; /* put ch into buffer */
|
||||
TDR0 = ch; /* put ch into buffer */
|
||||
}
|
||||
|
||||
char Getch1( void ) /* waits for and returns incomming char */
|
||||
char Getch0( void ) /* waits for and returns incomming char */
|
||||
{
|
||||
volatile unsigned ch;
|
||||
|
||||
while( SSR1_RDRF == 0 );
|
||||
while( SSR0_RDRF == 0 );
|
||||
|
||||
/* wait for data received */
|
||||
if( SSR1_ORE ) /* overrun error */
|
||||
if( SSR0_ORE ) /* overrun error */
|
||||
{
|
||||
ch = RDR1; /* reset error flags */
|
||||
ch = RDR0; /* reset error flags */
|
||||
return ( char ) ( -1 );
|
||||
}
|
||||
else
|
||||
{
|
||||
return( RDR1 ); /* return char */
|
||||
return( RDR0 ); /* return char */
|
||||
}
|
||||
}
|
||||
|
||||
void Puts1( const char *Name1 ) /* Puts a String to UART */
|
||||
void Puts0( const char *Name1 ) /* Puts a String to UART */
|
||||
{
|
||||
volatile portSHORT i, len;
|
||||
len = strlen( Name1 );
|
||||
|
||||
for( i = 0; i < strlen(Name1); i++ ) /* go through string */
|
||||
for( i = 0; i < len; i++ ) /* go through string */
|
||||
{
|
||||
if( Name1[i] == 10 )
|
||||
{
|
||||
Putch1( 13 );
|
||||
Putch0( 13 );
|
||||
}
|
||||
|
||||
Putch1( Name1[i] ); /* send it out */
|
||||
Putch0( Name1[i] ); /* send it out */
|
||||
}
|
||||
}
|
||||
|
||||
void Puthex1( unsigned long n, unsigned char digits )
|
||||
void Puthex0( unsigned long n, unsigned char digits )
|
||||
{
|
||||
unsigned portCHAR digit = 0, div = 0, i;
|
||||
|
||||
|
|
@ -89,12 +91,12 @@ void Puthex1( unsigned long n, unsigned char digits )
|
|||
for( i = 0; i < digits; i++ )
|
||||
{
|
||||
digit = ( (n >> div) & 0xF ); /* get hex-digit value */
|
||||
Putch1( digit + ((digit < 0xA) ? '0' : 'A' - 0xA) );
|
||||
Putch0( digit + ((digit < 0xA) ? '0' : 'A' - 0xA) );
|
||||
div -= 4; /* next digit shift */
|
||||
}
|
||||
}
|
||||
|
||||
void Putdec1( unsigned long x, int digits )
|
||||
void Putdec0( unsigned long x, int digits )
|
||||
{
|
||||
portSHORT i;
|
||||
portCHAR buf[10], sign = 1;
|
||||
|
|
@ -124,95 +126,101 @@ void Putdec1( unsigned long x, int digits )
|
|||
}
|
||||
}
|
||||
|
||||
Puts1( buf ); /* send string */
|
||||
Puts0( buf ); /* send string */
|
||||
}
|
||||
|
||||
void vTraceListTasks( unsigned portBASE_TYPE uxPriority )
|
||||
void vUtilityStartTraceTask( unsigned portBASE_TYPE uxPriority )
|
||||
{
|
||||
portENTER_CRITICAL();
|
||||
InitUart1();
|
||||
portENTER_CRITICAL();
|
||||
xTaskCreate( vUART1Task, (signed portCHAR *) "UART1", ( unsigned portSHORT ) 2048, ( void * ) NULL, uxPriority, &UART_TaskHandle );
|
||||
xQueue = xQueueCreate( 5, sizeof( char ) );
|
||||
|
||||
if( xQueue != NULL )
|
||||
{
|
||||
portENTER_CRITICAL();
|
||||
InitUart0();
|
||||
portENTER_CRITICAL();
|
||||
xTaskCreate( vUART0Task, (signed portCHAR *) "UART1", configMINIMAL_STACK_SIZE * 3, ( void * ) NULL, uxPriority, &UART_TaskHandle );
|
||||
}
|
||||
}
|
||||
|
||||
static void vUART1Task( void *pvParameters )
|
||||
static void vUART0Task( void *pvParameters )
|
||||
{
|
||||
portCHAR tasklist_buff[512];
|
||||
portCHAR trace_buff[512];
|
||||
static portCHAR buff[ 800 ] = { 0 };
|
||||
unsigned portLONG trace_len;
|
||||
signed portLONG i, j, l = 0;
|
||||
|
||||
unsigned portCHAR ch;
|
||||
( void ) pvParameters;
|
||||
|
||||
Puts1( "\n -------------MB96348 FreeRTOS DEMO Task List and Trace Utility----------- \n" );
|
||||
SSR0_RIE = 1;
|
||||
|
||||
Puts0( "\n -------------MB96348 FreeRTOS DEMO Task List and Trace Utility----------- \n" );
|
||||
|
||||
for( ;; )
|
||||
{
|
||||
Puts1( "\n\rPress any of the following keys for the corresponding functionality: " );
|
||||
Puts0( "\n\rPress any of the following keys for the corresponding functionality: " );
|
||||
|
||||
Puts1( "\n\r1: To call vTaskList() and display current task status " );
|
||||
Puts0( "\n\r1: To call vTaskList() and display current task status " );
|
||||
|
||||
Puts1( "\n\r2: To call vTaskStartTrace() and to display trace results once the trace ends" );
|
||||
Puts0( "\n\r2: To call vTaskStartTrace() and to display trace results once the trace ends" );
|
||||
|
||||
SSR1_RIE = 1;
|
||||
|
||||
vTaskSuspend( NULL );
|
||||
|
||||
ch = Getch1();
|
||||
/* Block on the semaphore. The UART interrupt will use the semaphore to
|
||||
wake this task when required. */
|
||||
xQueueReceive( xQueue, &ch, portMAX_DELAY );
|
||||
|
||||
switch( ch )
|
||||
{
|
||||
case '1':
|
||||
vTaskList( (signed char *) tasklist_buff );
|
||||
Puts1( "\n\rThe current task list is as follows...." );
|
||||
Puts1( "\n\r----------------------------------------------" );
|
||||
Puts1( "\n\rName State Priority Stack Number" );
|
||||
Puts1( "\n\r----------------------------------------------" );
|
||||
Puts1( tasklist_buff );
|
||||
Puts1( "\r----------------------------------------------" );
|
||||
vTaskList( (signed char *) buff );
|
||||
Puts0( "\n\rThe current task list is as follows...." );
|
||||
Puts0( "\n\r----------------------------------------------" );
|
||||
Puts0( "\n\rName State Priority Stack Number" );
|
||||
Puts0( "\n\r----------------------------------------------" );
|
||||
Puts0( buff );
|
||||
Puts0( "\r----------------------------------------------" );
|
||||
break;
|
||||
|
||||
case '2':
|
||||
vTaskStartTrace( (signed char *) trace_buff, 512 );
|
||||
Puts1( "\n\rThe trace started!!" );
|
||||
vTaskStartTrace( (signed char *) buff, sizeof( buff ) );
|
||||
Puts0( "\n\rThe trace started!!" );
|
||||
vTaskDelay( (portTickType) 500 );
|
||||
trace_len = ulTaskEndTrace();
|
||||
Puts1( "\n\rThe trace ended!!" );
|
||||
Puts1( "\n\rThe trace is as follows...." );
|
||||
Puts1( "\n\r--------------------------------------------------------" );
|
||||
Puts1( "\n\r Tick | Task Number | Tick | Task Number |" );
|
||||
Puts1( "\n\r--------------------------------------------------------\n\r" );
|
||||
Puts0( "\n\rThe trace ended!!" );
|
||||
Puts0( "\n\rThe trace is as follows...." );
|
||||
Puts0( "\n\r--------------------------------------------------------" );
|
||||
Puts0( "\n\r Tick | Task Number | Tick | Task Number |" );
|
||||
Puts0( "\n\r--------------------------------------------------------\n\r" );
|
||||
|
||||
for( i = 0; i < trace_len; i += 4 )
|
||||
{
|
||||
for( j = i + 3; j >= i; j-- )
|
||||
{
|
||||
Puthex1( trace_buff[j], 2 );
|
||||
Puthex0( buff[j], 2 );
|
||||
}
|
||||
|
||||
Puts1( " | " );
|
||||
Puts0( " | " );
|
||||
l++;
|
||||
if( l == 4 )
|
||||
{
|
||||
Puts1( "\n" );
|
||||
Puts0( "\n" );
|
||||
l = 0;
|
||||
}
|
||||
}
|
||||
|
||||
Puts1( "\r--------------------------------------------------------" );
|
||||
Puts0( "\r--------------------------------------------------------" );
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Puts1( "\n" );
|
||||
Puts0( "\n" );
|
||||
}
|
||||
}
|
||||
|
||||
__interrupt void UART1_RxISR( void )
|
||||
__interrupt void UART0_TraceRxISR( void )
|
||||
{
|
||||
SSR1_RIE = 0;
|
||||
vTaskResume( UART_TaskHandle );
|
||||
unsigned portCHAR ch;
|
||||
|
||||
ch = RDR0;
|
||||
xQueueSendFromISR( xQueue, &ch, pdFALSE );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue