From 18d898d96731a94b21035862e4dbdc3688a55133 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Thu, 8 Apr 2010 12:17:21 -0400 Subject: [PATCH] fix typo in the usage --- Makefile.include | 2 +- tests/printf.c | 21 ++++++++++++++++++++- tools/ftditools/bbmc.c | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Makefile.include b/Makefile.include index 885e4a2d2..fc0ac6240 100644 --- a/Makefile.include +++ b/Makefile.include @@ -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 $< $@ diff --git a/tests/printf.c b/tests/printf.c index 0d43f061f..d09af1d41 100644 --- a/tests/printf.c +++ b/tests/printf.c @@ -2,6 +2,7 @@ #include #include +#include #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); diff --git a/tools/ftditools/bbmc.c b/tools/ftditools/bbmc.c index baa871280..6d2ad0d49 100644 --- a/tools/ftditools/bbmc.c +++ b/tools/ftditools/bbmc.c @@ -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 )