[Commit-gnuradio] r6967 - in usrp2/branches/developers/eb/u2-eb/firmware: apps lib

[eb]

Author: eb
Date: 2007-11-16 13:00:57 -0700 (Fri, 16 Nov 2007)
New Revision: 6967

Added:
   usrp2/branches/developers/eb/u2-eb/firmware/apps/test_i2c.c
Modified:
   usrp2/branches/developers/eb/u2-eb/firmware/apps/
   usrp2/branches/developers/eb/u2-eb/firmware/apps/Makefile.am
   usrp2/branches/developers/eb/u2-eb/firmware/lib/Makefile.am
   usrp2/branches/developers/eb/u2-eb/firmware/lib/eeprom.c
Log:
missing files


Property changes on: usrp2/branches/developers/eb/u2-eb/firmware/apps
___________________________________________________________________
Name: svn:ignore
   - *-stamp
*.a
*.bin
*.dump
*.log
*.rom
.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
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

   + *-stamp
*.a
*.bin
*.dump
*.log
*.rom
.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
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


Modified: usrp2/branches/developers/eb/u2-eb/firmware/apps/Makefile.am
===================================================================
--- usrp2/branches/developers/eb/u2-eb/firmware/apps/Makefile.am        
2007-11-16 19:51:28 UTC (rev 6966)
+++ usrp2/branches/developers/eb/u2-eb/firmware/apps/Makefile.am        
2007-11-16 20:00:57 UTC (rev 6967)
@@ -31,6 +31,7 @@
        ibs_tx_test \
        rcv_eth_packets \
        test1 \
+       test_i2c \
        test_phy_comm \
        test_printf \
        timer_test

Added: usrp2/branches/developers/eb/u2-eb/firmware/apps/test_i2c.c
===================================================================
--- usrp2/branches/developers/eb/u2-eb/firmware/apps/test_i2c.c                 
        (rev 0)
+++ usrp2/branches/developers/eb/u2-eb/firmware/apps/test_i2c.c 2007-11-16 
20:00:57 UTC (rev 6967)
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2007 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 <stdio.h>
+#include <stdint.h>
+#include <u2_init.h>           /* FIXME */
+#include <i2c.h>
+#include <usrp2_i2c_addr.h>
+#include <string.h>
+#include <hal_io.h>
+
+
+
+#define ASSERT_TRUE(x) \
+  do { \
+    if (!(x)){ \
+      printf("ASSERT_TRUE failed on line %d\n", __LINE__); \
+      nerrors++; \
+    } \
+  } while(0)
+
+#define ASSERT_FALSE(x) \
+  do { \
+    if (x){ \
+      printf("ASSERT_FALSE failed on line %d\n", __LINE__); \
+      nerrors++; \
+    } \
+  } while(0)
+
+
+#define BUFSIZE 128
+
+int
+main(void)
+{
+  int i;
+  bool ok;
+  int  nerrors = 0;
+  uint8_t buf[BUFSIZE];
+  int not_dev_addr = 0x35;     // no device with this address on the i2c bus.
+  int offset;
+  int len;
+  
+  u2_init();
+
+  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);
+  ASSERT_FALSE(ok);
+
+  // try read from non-existent device
+  buf[0] = 0;
+  ok = i2c_read(not_dev_addr, buf, 1);
+  ASSERT_FALSE(ok);
+
+  // try writing eeprom
+  offset = 31;
+  len = 8;
+  memset(buf, 0, sizeof(buf));
+  for (i = 0; i < len; i++)
+    buf[i] = i;
+  ok = eeprom_write(I2C_ADDR_BOOT, offset, buf, len);
+  ASSERT_TRUE(ok);
+
+  // now try to read it back
+  offset = 31;
+  len = 8;
+  memset(buf, 0, sizeof(buf));
+  ok = eeprom_read(I2C_ADDR_BOOT, offset, buf, len);
+  ASSERT_TRUE(ok);
+
+  // check result
+  for (i = 0; i < len; i++){
+    if (buf[i] != i){
+      printf("buf[%d] = %d, should be %d\n", i, buf[i], i);
+      nerrors++;
+    }
+  }
+  
+  if (nerrors == 0)
+    puts("PASSED\n");
+  else
+    puts("FAILED\n");
+
+  hal_finish();
+  return 0;
+}
+


Property changes on: usrp2/branches/developers/eb/u2-eb/firmware/apps/test_i2c.c
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: usrp2/branches/developers/eb/u2-eb/firmware/lib/Makefile.am
===================================================================
--- usrp2/branches/developers/eb/u2-eb/firmware/lib/Makefile.am 2007-11-16 
19:51:28 UTC (rev 6966)
+++ usrp2/branches/developers/eb/u2-eb/firmware/lib/Makefile.am 2007-11-16 
20:00:57 UTC (rev 6967)
@@ -22,6 +22,7 @@
 
 libu2fw_a_SOURCES = \
        buffer_pool.c \
+       eeprom.c \
        eth_driver.c \
        eth_mac.c \
        hal_io.c \

Modified: usrp2/branches/developers/eb/u2-eb/firmware/lib/eeprom.c
===================================================================
--- usrp2/branches/developers/eb/u2-eb/firmware/lib/eeprom.c    2007-11-16 
19:51:28 UTC (rev 6966)
+++ usrp2/branches/developers/eb/u2-eb/firmware/lib/eeprom.c    2007-11-16 
20:00:57 UTC (rev 6967)
@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "i2c.h"
+
 static const int EEPROM_PAGESIZE = 16;
 
 bool
@@ -33,7 +35,7 @@
     cmd[0] = eeprom_offset++;
     cmd[1] = *p++;
     bool r = i2c_write (i2c_addr, cmd, sizeof (cmd));
-    mdelay (10);               // delay 10ms worst case write time
+    // mdelay (10);            // FIXME put back in // delay 10ms worst case 
write time
     if (!r)
       return false;
   }
@@ -50,7 +52,7 @@
 
   unsigned char cmd[1];
   cmd[0] = eeprom_offset;
-  if (!i2c_write (udh, i2c_addr, cmd, sizeof (cmd)))
+  if (!i2c_write (i2c_addr, cmd, sizeof (cmd)))
     return false;
 
   while (len > 0){