Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

fix typo in the usage

Browse Source
This commit is contained in:
Mariano Alvira 2010-04-08 12:17:21 -04:00
parent e21e8f1a45
commit 18d898d967
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -76,7 +76,7 @@ $(MC1322X)/src/src.a: $(MC1322X)/src/src.a($(SRCOBJS))
%_$(BOARD).elf: $(OBJDIR)/%.o $(START) $(ISR) $(SRCOBJS) $(LINKERSCRIPT) $(LIBMC1322X)/libmc1322x.a $(OBJDIR)/board.a $(MC1322X)/src/src.a
$(CC) $(LDFLAGS) \
-L $(LIBMC1322X) -L $(MC1322X)/src -L $(OBJDIR) $< -o $@ $(START) $(MC1322X)/src/src.a --start-group $(OBJDIR)/board.a $(LIBMC1322X)/libmc1322x.a --end-group
-L $(LIBMC1322X) -L $(MC1322X)/src -L $(OBJDIR) $< -o $@ $(START) $(MC1322X)/src/src.a --start-group $(OBJDIR)/board.a $(LIBMC1322X)/libmc1322x.a -lm --end-group
%.srec: %.elf
$(OBJCOPY) ${OBJCFLAGS} -O srec $< $@

21
tests/printf.c
View File

@ -2,6 +2,7 @@
#include <board.h>
#include <stdio.h>
#include <math.h>
#include "tests.h"
#include "config.h"
@ -11,7 +12,22 @@
printf(#x); \
printf("): %d\n", sizeof(x)); \
} while(0)
FILE *stderr;
void __assert_fail(void) {
return;
}
int fputs(const char *s, FILE *stream) {
return 0;
}
size_t fwrite(const void *ptr, size_t size, size_t nmemb,
FILE *stream) {
return 0;
}
int main(void)
{
char *ptr = "Hello world!";
@ -45,6 +61,9 @@ int main(void)
printf("%d %s(s)", 0, "message");
printf("\n");
printf("%d %s(s) with %%\n", 0, "message");
printf("sqrt(5) * 100 = %d\n", (int) (sqrt(5)*100));
// 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);

2
tools/ftditools/bbmc.c
View File

@ -326,7 +326,7 @@ void usage(void)
printf( "Options:\n");
printf( " -i|--index specifiy which device to use (default 0)\n");
printf( " -v|--vendor set vendor id (default 0x0403)\n");
printf( " -p|--prodcut set vendor id (default 0x6010)\n");
printf( " -p|--product set vendor id (default 0x6010)\n");
}
int print_and_prompt( struct ftdi_device_list *devlist )