giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Precision (printf("%.Ns", text1)) not supported by all compilers, for example some versions of avrgcc and mspgcc.

This commit is contained in:
Niclas Finne 2012-05-16 11:23:03 +02:00
parent f2f6a7bd53
commit ec1d598148
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/serial-shell/serial-shell.c
View File

@ -32,8 +32,6 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
*
* $Id: serial-shell.c,v 1.5 2009/03/17 15:56:32 adamdunkels Exp $
*/ */
/** /**
@ -59,6 +57,7 @@ PROCESS(serial_shell_process, "Contiki serial shell");
void void
shell_default_output(const char *text1, int len1, const char *text2, int len2) shell_default_output(const char *text1, int len1, const char *text2, int len2)
{ {
int i;
if(text1 == NULL) { if(text1 == NULL) {
text1 = ""; text1 = "";
len1 = 0; len1 = 0;
@ -68,13 +67,15 @@ shell_default_output(const char *text1, int len1, const char *text2, int len2)
len2 = 0; len2 = 0;
} }
/* Workaround for absence of "%.*s" format in avr-libc */ /* Precision (printf("%.Ns", text1)) not supported on all platforms.
#if defined (__AVR__) putchar(c) not be supported on all platforms. */
printf("%s %s\r\n", text1, text2); for(i = 0; i < len1; i++) {
#else printf("%c", text1[i]);
printf("%.*s%.*s\r\n", len1, text1, len2, text2); }
#endif for(i = 0; i < len2; i++) {
printf("%c", text2[i]);
}
printf("\r\n");
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
@ -94,12 +95,12 @@ PROCESS_THREAD(serial_shell_process, ev, data)
PROCESS_BEGIN(); PROCESS_BEGIN();
shell_init(); shell_init();
while(1) { while(1) {
PROCESS_WAIT_EVENT_UNTIL(ev == serial_line_event_message && data != NULL); PROCESS_WAIT_EVENT_UNTIL(ev == serial_line_event_message && data != NULL);
shell_input(data, strlen(data)); shell_input(data, strlen(data));
} }
PROCESS_END(); PROCESS_END();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/