From d4cdf6ce5b4ac47f90436cff23dd65ef307851dc Mon Sep 17 00:00:00 2001 From: rtel Date: Tue, 28 Apr 2015 13:53:30 +0000 Subject: [PATCH] Finalise MSP43FR5969 IAR and CCS demos (hopefully). git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2349 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../Demo/Common/Minimal/EventGroupsDemo.c | 16 +- .../.cproject | 173 +++++++--- .../FreeRTOSConfig.h | 39 ++- .../RTOSDemo.ewp | 3 + .../ReadMe_Instructions.url | 5 + .../main.c | 2 + .../printf-stdarg.c | 312 ++++++++++++++++++ .../Source/portable/CCS/MSP430X/portmacro.h | 1 + .../Source/portable/IAR/MSP430X/portmacro.h | 1 + 9 files changed, 476 insertions(+), 76 deletions(-) create mode 100644 FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/ReadMe_Instructions.url create mode 100644 FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/printf-stdarg.c diff --git a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c index 50e7052e9..70108aa17 100644 --- a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c +++ b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c @@ -97,14 +97,14 @@ #define ebWAIT_BIT_TASK_PRIORITY ( tskIDLE_PRIORITY + 1 ) /* Generic bit definitions. */ -#define ebBIT_0 ( 0x01UL ) -#define ebBIT_1 ( 0x02UL ) -#define ebBIT_2 ( 0x04UL ) -#define ebBIT_3 ( 0x08UL ) -#define ebBIT_4 ( 0x10UL ) -#define ebBIT_5 ( 0x20UL ) -#define ebBIT_6 ( 0x40UL ) -#define ebBIT_7 ( 0x80UL ) +#define ebBIT_0 ( 0x01 ) +#define ebBIT_1 ( 0x02 ) +#define ebBIT_2 ( 0x04 ) +#define ebBIT_3 ( 0x08 ) +#define ebBIT_4 ( 0x10 ) +#define ebBIT_5 ( 0x20 ) +#define ebBIT_6 ( 0x40 ) +#define ebBIT_7 ( 0x80 ) /* Combinations of bits used in the demo. */ #define ebCOMBINED_BITS ( ebBIT_1 | ebBIT_5 | ebBIT_7 ) diff --git a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/.cproject b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/.cproject index 8366b953d..08d260757 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/.cproject +++ b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/.cproject @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + + + + + + + + + - - + + @@ -130,84 +139,140 @@ - - - - diff --git a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/FreeRTOSConfig.h b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/FreeRTOSConfig.h index f2f52e370..2aae9feb0 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/FreeRTOSConfig.h @@ -88,7 +88,7 @@ __persistent keyword to be used. See http://www.freertos.org/a00111.html#heap_4 #define configMAX_PRIORITIES ( 5 ) #define configCPU_CLOCK_HZ ( 8000000 ) #define configTICK_RATE_HZ ( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */ -#define configTOTAL_HEAP_SIZE ( 20 * 1024 ) +#define configTOTAL_HEAP_SIZE ( 14 * 1024 ) #define configMAX_TASK_NAME_LEN ( 15 ) #define configUSE_TRACE_FACILITY 1 #define configUSE_16_BIT_TICKS 0 @@ -103,12 +103,6 @@ __persistent keyword to be used. See http://www.freertos.org/a00111.html#heap_4 #define configNUM_THREAD_LOCAL_STORAGE_POINTERS 0 #define configENABLE_BACKWARD_COMPATIBILITY 0 -#if __DATA_MODEL__ == __DATA_MODEL_SMALL__ - #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 110 ) -#else - #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 80 ) -#endif - /* Hook function related definitions. */ #define configUSE_TICK_HOOK 1 #define configUSE_IDLE_HOOK 1 @@ -124,13 +118,6 @@ __persistent keyword to be used. See http://www.freertos.org/a00111.html#heap_4 /* Event group related definitions. */ #define configUSE_EVENT_GROUPS 0 -/* Prevent the following line being included from IAR asm files. */ -#ifndef __IAR_SYSTEMS_ASM__ - void vConfigureTimerForRunTimeStats( void ); - extern volatile uint32_t ulRunTimeCounterOverflows; - void vConfigureTimerForRunTimeStats( void ); -#endif - /* Run time stats gathering definitions. */ #define configGENERATE_RUN_TIME_STATS 1 #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vConfigureTimerForRunTimeStats() @@ -193,5 +180,29 @@ CLI. */ /* The baudrate used for the CLI. */ #define configCLI_BAUD_RATE 19200 +/* Compiler specifics below here. */ +/* Prevent the following line being included from IAR asm files. */ +#ifndef __IAR_SYSTEMS_ASM__ + void vConfigureTimerForRunTimeStats( void ); + extern volatile uint32_t ulRunTimeCounterOverflows; + void vConfigureTimerForRunTimeStats( void ); +#endif + +#ifdef __ICC430__ + /* Using the IAR pre-processor constants. */ + #if ( __DATA_MODEL__ == __DATA_MODEL_LARGE__ ) + #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 80 ) + #else + #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 130 ) + #endif +#else + /* Using the CCS pre-processor constants. */ + #ifdef __LARGE_DATA_MODEL__ + #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 80 ) + #else + #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 140 ) + #endif +#endif /* IAR_MSP */ + #endif /* FREERTOS_CONFIG_H */ diff --git a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/RTOSDemo.ewp b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/RTOSDemo.ewp index e3370d027..97c10d545 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/RTOSDemo.ewp +++ b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/RTOSDemo.ewp @@ -2483,6 +2483,9 @@ FreeRTOS_Source portable + + $PROJ_DIR$\..\..\Source\portable\IAR\MSP430X\data_model.h + $PROJ_DIR$\..\..\Source\portable\MemMang\heap_4.c diff --git a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/ReadMe_Instructions.url b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/ReadMe_Instructions.url new file mode 100644 index 000000000..abf36d7c3 --- /dev/null +++ b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/ReadMe_Instructions.url @@ -0,0 +1,5 @@ +[{000214A0-0000-0000-C000-000000000046}] +Prop3=19,2 +[InternetShortcut] +URL=http://www.freertos.org/MSP430FR5969_Free_RTOS_Demo.html +IDList= diff --git a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/main.c b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/main.c index e4503d50a..e725cf006 100644 --- a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/main.c +++ b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/main.c @@ -140,6 +140,8 @@ uint8_t ucHeap[ configTOTAL_HEAP_SIZE ] = { 0 }; int main( void ) { + /* See http://www.FreeRTOS.org/MSP430FR5969_Free_RTOS_Demo.html */ + /* Configure the hardware ready to run the demo. */ prvSetupHardware(); diff --git a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/printf-stdarg.c b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/printf-stdarg.c new file mode 100644 index 000000000..a25cab6ce --- /dev/null +++ b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/printf-stdarg.c @@ -0,0 +1,312 @@ +/* + 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) c + +#include + +static int tiny_print( char **out, const char *format, va_list args, unsigned int buflen ); + +static void printchar(char **str, int c, char *buflimit) +{ + //extern int putchar(int c); + + if (str) { + if( buflimit == ( char * ) 0 ) { + /* Limit of buffer not known, write charater to buffer. */ + **str = (char)c; + ++(*str); + } + else if( ( ( unsigned long ) *str ) < ( ( unsigned long ) buflimit ) ) { + /* Withing known limit of buffer, write character. */ + **str = (char)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, char *buflimit) +{ + 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, buflimit); + ++pc; + } + } + for ( ; *string ; ++string) { + printchar (out, *string, buflimit); + ++pc; + } + for ( ; width > 0; --width) { + printchar (out, padchar, buflimit); + ++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 *buflimit) +{ + char print_buf[PRINT_BUF_LEN]; + register char *s; + register int t, neg = 0, pc = 0; + register unsigned int u = (unsigned int)i; + + if (i == 0) { + print_buf[0] = '0'; + print_buf[1] = '\0'; + return prints (out, print_buf, width, pad, buflimit); + } + + if (sg && b == 10 && i < 0) { + neg = 1; + u = (unsigned int)-i; + } + + s = print_buf + PRINT_BUF_LEN-1; + *s = '\0'; + + while (u) { + t = (unsigned int)u % b; + if( t >= 10 ) + t += letbase - '0' - 10; + *--s = (char)(t + '0'); + u /= b; + } + + if (neg) { + if( width && (pad & PAD_ZERO) ) { + printchar (out, '-', buflimit); + ++pc; + --width; + } + else { + *--s = '-'; + } + } + + return pc + prints (out, s, width, pad, buflimit); +} + +static int tiny_print( char **out, const char *format, va_list args, unsigned int buflen ) +{ + register int width, pad; + register int pc = 0; + char scr[2], *buflimit; + + if( buflen == 0 ){ + buflimit = ( char * ) 0; + } + else { + /* Calculate the last valid buffer space, leaving space for the NULL + terminator. */ + buflimit = ( *out ) + ( buflen - 1 ); + } + + 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, buflimit); + continue; + } + if( *format == 'd' ) { + pc += printi (out, va_arg( args, int ), 10, 1, width, pad, 'a', buflimit); + continue; + } + if( *format == 'x' ) { + pc += printi (out, va_arg( args, int ), 16, 0, width, pad, 'a', buflimit); + continue; + } + if( *format == 'X' ) { + pc += printi (out, va_arg( args, int ), 16, 0, width, pad, 'A', buflimit); + continue; + } + if( *format == 'u' ) { + pc += printi (out, va_arg( args, int ), 10, 0, width, pad, 'a', buflimit); + 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, buflimit); + continue; + } + } + else { + out: + printchar (out, *format, buflimit); + ++pc; + } + } + if (out) **out = '\0'; + va_end( args ); + return pc; +} + +int printf(const char *format, ...) +{ + va_list args; + + va_start( args, format ); + return tiny_print( 0, format, args, 0 ); +} + +int sprintf(char *out, const char *format, ...) +{ + va_list args; + + va_start( args, format ); + return tiny_print( &out, format, args, 0 ); +} + + +int snprintf( char *buf, unsigned int count, const char *format, ... ) +{ + va_list args; + + ( void ) count; + + va_start( args, format ); + return tiny_print( &buf, format, args, count ); +} + + +#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) +{ + (void)i; + (void)n; + (void)c; + return 0; +} + diff --git a/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h b/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h index 63998b1b4..8206ec030 100644 --- a/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h +++ b/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h @@ -96,6 +96,7 @@ #define portSTACK_TYPE uint32_t #else #define portSTACK_TYPE uint16_t + #define portPOINTER_SIZE_TYPE uint16_t #endif typedef portSTACK_TYPE StackType_t; diff --git a/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h b/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h index e1e19c20d..f6ce18dfd 100644 --- a/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h +++ b/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h @@ -94,6 +94,7 @@ /* The stack type changes depending on the data model. */ #if( __DATA_MODEL__ == __DATA_MODEL_SMALL__ ) #define portSTACK_TYPE uint16_t + #define portPOINTER_SIZE_TYPE uint16_t #else #define portSTACK_TYPE uint32_t #endif -- 2.39.5