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

[eb]

Author: eb
Date: 2008-09-10 17:50:19 -0600 (Wed, 10 Sep 2008)
New Revision: 9554

Added:
   gnuradio/trunk/usrp2/firmware/apps/set_hw_rev.c
Modified:
   gnuradio/trunk/usrp2/firmware/apps/
   gnuradio/trunk/usrp2/firmware/apps/Makefile.am
   gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
   gnuradio/trunk/usrp2/firmware/lib/u2_init.c
   gnuradio/trunk/usrp2/firmware/lib/u2_init.h
Log:
now reads h/w rev from eeprom.  f/w app set_hw_rev sets it


Property changes on: gnuradio/trunk/usrp2/firmware/apps
___________________________________________________________________
Name: svn:ignore
   - *-stamp
*.a
*.bin
*.dump
*.log
*.rom
*.map
.deps
Makefile
Makefile.in
aclocal.m4
autom4te.cache
blink_leds
blink_leds2
build
compile
config.h
config.h.in
config.log
config.status
configure
depcomp
echo
eth_test
gen_eth_packets
ibs_rx_test
ibs_tx_test
install-sh
libtool
ltmain.sh
missing
py-compile
rcv_eth_packets
run_tests.sh
stamp-h1
test1
test_phy_comm
timer_test
buf_ram_test
buf_ram_zero
hello
test_printf
test_spi
test_i2c
gen_pause_frames
test_serdes
rx_only
tx_only
tx_standalone
tx_drop
tx_drop2
tx_drop_rate_limited
test_lsdac
test_lsadc
read_dbids
test_db_spi
ramp_lsdac
eth_to_serdes
serdes_to_dsp
sd_gentest
sd_bounce
can_i_sub
tx_only_v2
rx_only_v2
txrx
eth_serdes
serdes_txrx

   + *-stamp
*.a
*.bin
*.dump
*.log
*.rom
*.map
.deps
Makefile
Makefile.in
aclocal.m4
autom4te.cache
blink_leds
blink_leds2
build
compile
config.h
config.h.in
config.log
config.status
configure
depcomp
echo
eth_test
gen_eth_packets
ibs_rx_test
ibs_tx_test
install-sh
libtool
ltmain.sh
missing
py-compile
rcv_eth_packets
run_tests.sh
stamp-h1
test1
test_phy_comm
timer_test
buf_ram_test
buf_ram_zero
hello
test_printf
test_spi
test_i2c
gen_pause_frames
test_serdes
rx_only
tx_only
tx_standalone
tx_drop
tx_drop2
tx_drop_rate_limited
test_lsdac
test_lsadc
read_dbids
test_db_spi
ramp_lsdac
eth_to_serdes
serdes_to_dsp
sd_gentest
sd_bounce
can_i_sub
tx_only_v2
rx_only_v2
txrx
eth_serdes
serdes_txrx
set_hw_rev


Modified: gnuradio/trunk/usrp2/firmware/apps/Makefile.am
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/Makefile.am      2008-09-10 21:41:07 UTC 
(rev 9553)
+++ gnuradio/trunk/usrp2/firmware/apps/Makefile.am      2008-09-10 23:50:19 UTC 
(rev 9554)
@@ -33,6 +33,7 @@
        rcv_eth_packets \
        rx_only_v2 \
        read_dbids \
+       set_hw_rev \
        test1 \
        test_db_spi \
        test_i2c \

Modified: gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2008-09-10 21:41:07 UTC 
(rev 9553)
+++ gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2008-09-10 23:50:19 UTC 
(rev 9554)
@@ -28,6 +28,7 @@
 #include "print_rmon_regs.h"
 #include "db.h"
 #include "clocks.h"
+#include "u2_init.h"
 #include <string.h>
 
 volatile bool link_is_up = false;      // eth handler sets this
@@ -117,7 +118,7 @@
   r->len = sizeof(op_id_reply_t);
   r->rid = p->rid;
   r->addr = *ethernet_mac_addr();
-  r->hw_rev = 0x0000;  // FIXME
+  r->hw_rev = (u2_hw_rev_major << 8) | u2_hw_rev_minor;
   // r->fpga_md5sum = ;        // FIXME
   // r->sw_md5sum = ;  // FIXME
 

Added: gnuradio/trunk/usrp2/firmware/apps/set_hw_rev.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/set_hw_rev.c                             
(rev 0)
+++ gnuradio/trunk/usrp2/firmware/apps/set_hw_rev.c     2008-09-10 23:50:19 UTC 
(rev 9554)
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <u2_init.h>
+#include <nonstdio.h>
+#include <i2c.h>
+#include <usrp2_i2c_addr.h>
+
+#define HW_REV_MAJOR 0
+#define HW_REV_MINOR 3
+
+int
+main(void)
+{
+  u2_init();
+
+  putstr("\nset_hw_rev\n");
+
+  bool ok = true;
+  unsigned char maj = HW_REV_MAJOR;
+  unsigned char min = HW_REV_MINOR;
+  ok = eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_MSB, &maj, 1);
+  ok &= eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_LSB, &min, 1);
+
+  if (ok)
+    printf("OK: set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
+  else
+    printf("FAILED to set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
+}


Property changes on: gnuradio/trunk/usrp2/firmware/apps/set_hw_rev.c
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: gnuradio/trunk/usrp2/firmware/lib/u2_init.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/u2_init.c 2008-09-10 21:41:07 UTC (rev 
9553)
+++ gnuradio/trunk/usrp2/firmware/lib/u2_init.c 2008-09-10 23:50:19 UTC (rev 
9554)
@@ -30,9 +30,21 @@
 #include "ad9777.h"
 #include "clocks.h"
 #include "db.h"
+#include "usrp2_i2c_addr.h"
 
 //#include "nonstdio.h"
 
+unsigned char u2_hw_rev_major;
+unsigned char u2_hw_rev_minor;
+
+static inline void
+get_hw_rev(void)
+{
+  bool ok = eeprom_read(I2C_ADDR_MBOARD, MBOARD_REV_LSB, &u2_hw_rev_minor, 1);
+  ok &= eeprom_read(I2C_ADDR_MBOARD, MBOARD_REV_MSB, &u2_hw_rev_major, 1);
+}
+
+
 /*
  * We ought to arrange for this to be called before main, but for now,
  * we require that the user's main call u2_init as the first thing...
@@ -85,6 +97,8 @@
   lsdac_init();            // low-speed DACs
   db_init();       // daughterboard init
   
+  get_hw_rev();
+
   hal_enable_ints();
 
   // flash all leds to let us know board is alive

Modified: gnuradio/trunk/usrp2/firmware/lib/u2_init.h
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/u2_init.h 2008-09-10 21:41:07 UTC (rev 
9553)
+++ gnuradio/trunk/usrp2/firmware/lib/u2_init.h 2008-09-10 23:50:19 UTC (rev 
9554)
@@ -18,6 +18,9 @@
 #ifndef INCLUDED_U2_INIT_H
 #define INCLUDED_U2_INIT_H
 
+extern unsigned char u2_hw_rev_major;
+extern unsigned char u2_hw_rev_minor;
+
 /*!
  * one-time init
  */