[Commit-gnuradio] r6960 - in usrp2/trunk/firmware: . apps lib

[eb]

Author: eb
Date: 2007-11-15 22:40:06 -0700 (Thu, 15 Nov 2007)
New Revision: 6960

Modified:
   usrp2/trunk/firmware/Makefile.common
   usrp2/trunk/firmware/apps/buf_ram_test.c
   usrp2/trunk/firmware/apps/hello.c
   usrp2/trunk/firmware/lib/hal_uart.c
Log:
buf_ram_test nows say PASS or FAIL

Modified: usrp2/trunk/firmware/Makefile.common
===================================================================
--- usrp2/trunk/firmware/Makefile.common        2007-11-16 03:27:41 UTC (rev 
6959)
+++ usrp2/trunk/firmware/Makefile.common        2007-11-16 05:40:06 UTC (rev 
6960)
@@ -25,7 +25,9 @@
 
 #AM_CFLAGS = -Wall -O2 -g -mxl-gp-opt -mxl-soft-div -mxl-soft-mul -msoft-float
 AM_CFLAGS = -Wall -O2 -g -mxl-soft-div -mxl-soft-mul -msoft-float
+#AM_CFLAGS = -Wall -O2 -g -mxl-soft-div -mno-xl-soft-mul -mxl-barrel-shift 
-msoft-float
 
+
 LINKER_SCRIPT = $(top_srcdir)/lib/microblaze.ld
 #AM_LDFLAGS = -Wl,-T$(LINKER_SCRIPT) -Wl,-defsym -Wl,_STACK_SIZE=4096
 AM_LDFLAGS = -Wl,-T$(LINKER_SCRIPT)

Modified: usrp2/trunk/firmware/apps/buf_ram_test.c
===================================================================
--- usrp2/trunk/firmware/apps/buf_ram_test.c    2007-11-16 03:27:41 UTC (rev 
6959)
+++ usrp2/trunk/firmware/apps/buf_ram_test.c    2007-11-16 05:40:06 UTC (rev 
6960)
@@ -115,10 +115,15 @@
   write_bufs();
   int nerrors = check_bufs();
 
-  if (nerrors == 0)
+  if (nerrors == 0){
     output_regs->leds = 0x3;           // leds on  -> PASS
-  else
+    hal_puts("PASS\n");
+  }
+  else {
     output_regs->leds = 0x0;           // leds off -> FAIL
+    hal_puts("FAIL\n");
+  }
 
+  hal_finish();
   return 0;
 }

Modified: usrp2/trunk/firmware/apps/hello.c
===================================================================
--- usrp2/trunk/firmware/apps/hello.c   2007-11-16 03:27:41 UTC (rev 6959)
+++ usrp2/trunk/firmware/apps/hello.c   2007-11-16 05:40:06 UTC (rev 6960)
@@ -23,7 +23,7 @@
 {
   u2_init();
 
-  hal_puts("Hello World\r\n");
+  hal_puts("Hello World\n");
 
   return 0;
 }

Modified: usrp2/trunk/firmware/lib/hal_uart.c
===================================================================
--- usrp2/trunk/firmware/lib/hal_uart.c 2007-11-16 03:27:41 UTC (rev 6959)
+++ usrp2/trunk/firmware/lib/hal_uart.c 2007-11-16 05:40:06 UTC (rev 6960)
@@ -92,6 +92,9 @@
 void
 hal_uart_putc(int ch)
 {
+  if (ch == '\n')              // FIXME for now map \n -> \r\n
+    hal_uart_putc('\r');
+
   while ((u->lsr & UART_LSR_THRE) == 0)         // wait for fifo to be empty
     ;