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

[eb]

Author: eb
Date: 2008-01-18 17:23:17 -0700 (Fri, 18 Jan 2008)
New Revision: 7470

Modified:
   usrp2/trunk/firmware/apps/test_lsadc.c
   usrp2/trunk/firmware/lib/u2_init.c
Log:
call lsadc_init from u2_init

Modified: usrp2/trunk/firmware/apps/test_lsadc.c
===================================================================
--- usrp2/trunk/firmware/apps/test_lsadc.c      2008-01-19 00:18:16 UTC (rev 
7469)
+++ usrp2/trunk/firmware/apps/test_lsadc.c      2008-01-19 00:23:17 UTC (rev 
7470)
@@ -27,8 +27,6 @@
 {
   u2_init();
 
-  lsadc_init();                        // FIXME move to u2_init
-
   puts("\ntest_lsadc");
 
   uint32_t r;

Modified: usrp2/trunk/firmware/lib/u2_init.c
===================================================================
--- usrp2/trunk/firmware/lib/u2_init.c  2008-01-19 00:18:16 UTC (rev 7469)
+++ usrp2/trunk/firmware/lib/u2_init.c  2008-01-19 00:23:17 UTC (rev 7470)
@@ -20,6 +20,7 @@
 #include "spi.h"
 #include "pic.h"
 #include "hal_io.h"
+#include "lsadc.h"
 #include "lsdac.h"
 #include "buffer_pool.h"
 #include "hal_uart.h"
@@ -158,7 +159,8 @@
   pic_init();  // progammable interrupt controller
   bp_init();   // buffer pool
   i2c_init();
-  lsdac_init();            // low speed dacs
+  lsadc_init();            // low-speed ADCs
+  lsdac_init();            // low-speed DACs
 
   hal_enable_ints();