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

[eb]

Author: eb
Date: 2008-01-05 20:13:48 -0700 (Sat, 05 Jan 2008)
New Revision: 7366

Modified:
   usrp2/trunk/firmware/Makefile.common
   usrp2/trunk/firmware/apps/app_common.c
   usrp2/trunk/firmware/apps/test_i2c.c
   usrp2/trunk/firmware/lib/u2_init.c
Log:
i2c operations work better when you call i2c_init first ;)

Modified: usrp2/trunk/firmware/Makefile.common
===================================================================
--- usrp2/trunk/firmware/Makefile.common        2008-01-06 03:09:29 UTC (rev 
7365)
+++ usrp2/trunk/firmware/Makefile.common        2008-01-06 03:13:48 UTC (rev 
7366)
@@ -32,7 +32,7 @@
 
 
 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) -Wl,-defsym -Wl,_STACK_SIZE=1024
 AM_LDFLAGS = -Wl,-T$(LINKER_SCRIPT)
 
 

Modified: usrp2/trunk/firmware/apps/app_common.c
===================================================================
--- usrp2/trunk/firmware/apps/app_common.c      2008-01-06 03:09:29 UTC (rev 
7365)
+++ usrp2/trunk/firmware/apps/app_common.c      2008-01-06 03:13:48 UTC (rev 
7366)
@@ -32,8 +32,7 @@
 static void
 burn_mac_addr(const op_burn_mac_addr_t *p)
 {
-  bool ok = ethernet_set_mac_addr(&p->addr);
-  // FIXME generate a rely from new addr?
+  ethernet_set_mac_addr(&p->addr);
 }
 
 void

Modified: usrp2/trunk/firmware/apps/test_i2c.c
===================================================================
--- usrp2/trunk/firmware/apps/test_i2c.c        2008-01-06 03:09:29 UTC (rev 
7365)
+++ usrp2/trunk/firmware/apps/test_i2c.c        2008-01-06 03:13:48 UTC (rev 
7366)
@@ -59,9 +59,6 @@
 
   puts("test_i2c\n");
 
-  i2c_init();  // FIXME fold all inits into u2_init
-
-
   // try writing a non-existent device
   buf[0] = 0xA5;
   ok = i2c_write(not_dev_addr, buf, 1);

Modified: usrp2/trunk/firmware/lib/u2_init.c
===================================================================
--- usrp2/trunk/firmware/lib/u2_init.c  2008-01-06 03:09:29 UTC (rev 7365)
+++ usrp2/trunk/firmware/lib/u2_init.c  2008-01-06 03:13:48 UTC (rev 7366)
@@ -39,6 +39,8 @@
   hal_gpio_set_tx_mode(15, 0, GPIOM_INPUT);
   gpio_base->io  = 0x00000000;
 
+  hal_gpio_set_tx_mode(15, 15, GPIOM_FPGA_1);  // uart output on tx:15
+
   hal_io_init();
 
   // init spi, so that we can switch over to the high-speed clock
@@ -154,6 +156,7 @@
 
   pic_init();  // progammable interrupt controller
   bp_init();   // buffer pool
+  i2c_init();
 
   hal_enable_ints();