n230: Initial checkin of firmware files

3 files changed, 57 insertions, 26 deletions

diff --git a/firmware/usrp3/x300/x300_debug.py b/firmware/usrp3/x300/x300_debug.py
index c9bcbb138..c518ba4e0 100755
--- a/firmware/usrp3/x300/x300_debug.py
+++ b/firmware/usrp3/x300/x300_debug.py
@@ -25,12 +25,18 @@ import struct
 ########################################################################
 # constants
 ########################################################################
-B250_FW_COMMS_UDP_PORT = 49152
+X300_FW_COMMS_UDP_PORT = 49152
 
-B250_FW_COMMS_FLAGS_ACK = 1
-B250_FW_COMMS_FLAGS_ERROR = 2
-B250_FW_COMMS_FLAGS_POKE32 = 4
-B250_FW_COMMS_FLAGS_PEEK32 = 8
+X300_FW_COMMS_FLAGS_ACK         = 0x00000001
+X300_FW_COMMS_FLAGS_POKE32      = 0x00000010
+X300_FW_COMMS_FLAGS_PEEK32      = 0x00000020
+
+X300_FW_COMMS_ERR_PKT_ERROR     = 0x80000000
+X300_FW_COMMS_ERR_CMD_ERROR     = 0x40000000
+X300_FW_COMMS_ERR_SIZE_ERROR    = 0x20000000
+
+X300_FW_COMMS_ID = 0x0000ACE3
+X300_FW_COMMS_MAX_DATA_WORDS    = 16
 
 #UDP_CTRL_PORT = 49183
 UDP_MAX_XFER_BYTES = 1024
@@ -39,7 +45,7 @@ UDP_TIMEOUT = 3
 
 #REG_ARGS_FMT = '!LLLLLB15x'
 #REG_IP_FMT = '!LLLL20x'
-REG_PEEK_POKE_FMT = '!LLLL'
+REG_PEEK_POKE_FMT = '!LLLLL'
 
 
 _seq = -1
@@ -52,12 +58,33 @@ def seq():
 ########################################################################
 # helper functions
 ########################################################################
-
-def unpack_reg_peek_poke_fmt(s):
-    return struct.unpack(REG_PEEK_POKE_FMT,s) #(flags, seq, addr, data)
+def fw_check_error(flags):
+    if flags & X300_FW_COMMS_ERR_PKT_ERROR == X300_FW_COMMS_ERR_PKT_ERROR:
+        raise Exception("The fiwmware operation returned a packet error")
+    if flags & X300_FW_COMMS_ERR_CMD_ERROR == X300_FW_COMMS_ERR_CMD_ERROR:
+        raise Exception("The fiwmware operation returned a command error")
+    if flags & X300_FW_COMMS_ERR_SIZE_ERROR == X300_FW_COMMS_ERR_SIZE_ERROR:
+        raise Exception("The fiwmware operation returned a size error")
 
 def pack_reg_peek_poke_fmt(flags, seq, addr, data):
-    return struct.pack(REG_PEEK_POKE_FMT, flags, seq, addr, data);
+    num_words = 1
+    data_arr = [data]
+    buf = bytes()
+    buf = struct.pack('!LLLLL', X300_FW_COMMS_ID, flags, seq, num_words, addr)
+    for i in range(X300_FW_COMMS_MAX_DATA_WORDS):
+        if (i < num_words):
+            buf += struct.pack('!L', data_arr[i])
+        else:
+            buf += struct.pack('!L', 0)
+    return buf
+
+def unpack_reg_peek_poke_fmt(buf):
+    (id, flags, seq, num_words, addr) = struct.unpack_from('!LLLLL', buf)
+    fw_check_error(flags)
+    data = []
+    for i in xrange(20, len(buf), 4):
+        data.append(struct.unpack('!L', buf[i:i+4])[0])
+    return (flags, seq, addr, data[0])
 
 ########################################################################
 # Burner class, holds a socket and send/recv routines
@@ -66,7 +93,7 @@ class ctrl_socket(object):
     def __init__(self, addr):
         self._sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self._sock.settimeout(UDP_TIMEOUT)
-        self._sock.connect((addr, B250_FW_COMMS_UDP_PORT))
+        self._sock.connect((addr, X300_FW_COMMS_UDP_PORT))
         self.set_callbacks(lambda *a: None, lambda *a: None)
         #self.init_update() #check that the device is there
 
@@ -92,11 +119,10 @@ class ctrl_socket(object):
         for in_prt in range (0, 8):
             print("%s |" % ports[in_prt]),
             for out_prt in range (0, 8):
-                out_pkt = pack_reg_peek_poke_fmt(B250_FW_COMMS_FLAGS_PEEK32|B250_FW_COMMS_FLAGS_ACK, seq(), 0xA000+256+((in_prt*8+out_prt)*4), 0)
+                out_pkt = pack_reg_peek_poke_fmt(X300_FW_COMMS_FLAGS_PEEK32|X300_FW_COMMS_FLAGS_ACK, seq(), 0xA000+256+((in_prt*8+out_prt)*4), 0)
                 in_pkt = self.send_and_recv(out_pkt)
                 (flags, rxseq, addr, data) = unpack_reg_peek_poke_fmt(in_pkt)
-                if flags & B250_FW_COMMS_FLAGS_ERROR == B250_FW_COMMS_FLAGS_ERROR:
-                    raise Exception("B250 peek returns error code")
+                fw_check_error(flags)
                 print("%10d  " % (data)),
             print
         print
@@ -105,19 +131,17 @@ class ctrl_socket(object):
 
 
     def peek(self,peek_addr):
-        out_pkt = pack_reg_peek_poke_fmt(B250_FW_COMMS_FLAGS_PEEK32|B250_FW_COMMS_FLAGS_ACK, seq(), peek_addr, 0)
+        out_pkt = pack_reg_peek_poke_fmt(X300_FW_COMMS_FLAGS_PEEK32|X300_FW_COMMS_FLAGS_ACK, seq(), peek_addr, 0)
         in_pkt = self.send_and_recv(out_pkt)
         (flags, rxseq, addr, data) = unpack_reg_peek_poke_fmt(in_pkt)
-        if flags & B250_FW_COMMS_FLAGS_ERROR == B250_FW_COMMS_FLAGS_ERROR:
-            raise Exception("B250 peek of address %d returns error code" % (addr))
+        fw_check_error(flags)
         print("PEEK of address %d(0x%x) reads %d(0x%x)" % (addr,addr,data,data))
 
     def poke(self,poke_addr,poke_data):
-        out_pkt = pack_reg_peek_poke_fmt(B250_FW_COMMS_FLAGS_POKE32|B250_FW_COMMS_FLAGS_ACK, seq(), poke_addr, poke_data)
+        out_pkt = pack_reg_peek_poke_fmt(X300_FW_COMMS_FLAGS_POKE32|X300_FW_COMMS_FLAGS_ACK, seq(), poke_addr, poke_data)
         in_pkt = self.send_and_recv(out_pkt)
         (flags, rxseq, addr, data) = unpack_reg_peek_poke_fmt(in_pkt)
-        if flags & B250_FW_COMMS_FLAGS_ERROR == B250_FW_COMMS_FLAGS_ERROR:
-            raise Exception("B250 peek of address %d returns error code" % (addr))
+        fw_check_error(flags)
         print("POKE of address %d(0x%x) with %d(0x%x)" % (poke_addr,poke_addr,poke_data,poke_data)  )
 
 
@@ -126,12 +150,12 @@ class ctrl_socket(object):
 ########################################################################
 def get_options():
     parser = optparse.OptionParser()
-    parser.add_option("--addr", type="string",                 help="USRP-N2XX device address",       default='')
-    parser.add_option("--list", action="store_true",           help="list possible network devices", default=False)
+    parser.add_option("--addr", type="string",              help="USRP-X300 device address",       default='')
+    parser.add_option("--list", action="store_true",        help="list possible network devices", default=False)
     parser.add_option("--peek", type="int",                 help="Read from memory map",     default=None)
     parser.add_option("--poke", type="int",                 help="Write to memory map",     default=None)
     parser.add_option("--data", type="int",                 help="Data for poke",     default=None)
-    parser.add_option("--stats", action="store_true",           help="Display SuperMIMO Network Stats", default=False)
+    parser.add_option("--stats", action="store_true",        help="Display SuperMIMO Network Stats", default=False)
     (options, args) = parser.parse_args()
 
     return options
diff --git a/firmware/usrp3/x300/x300_init.c b/firmware/usrp3/x300/x300_init.c
index ef97412a2..97b20032b 100644
--- a/firmware/usrp3/x300/x300_init.c
+++ b/firmware/usrp3/x300/x300_init.c
@@ -1,7 +1,7 @@
 #include "x300_init.h"
 #include "x300_defs.h"
 #include "ethernet.h"
-#include "mdelay.h"
+#include "cron.h"
 #include <wb_utils.h>
 #include <wb_uart.h>
 #include <wb_i2c.h>
@@ -121,6 +121,11 @@ static void putc(void *p, char c)
 #endif
 }
 
+static uint32_t get_counter_val()
+{
+    return wb_peek32(SR_ADDR(RB0_BASE, RB_COUNTER));
+}
+
 void x300_init(void)
 {
     //first - uart
@@ -136,6 +141,9 @@ void x300_init(void)
     UHD_FW_TRACE_FSTR(INFO, "-- FPGA Compat Number: %u.%u", (fpga_compat>>16), (fpga_compat&0xFFFF));
     UHD_FW_TRACE_FSTR(INFO, "-- Clock Frequency: %u MHz", (CPU_CLOCK/1000000));
 
+    //Initialize cron
+    cron_init(get_counter_val, CPU_CLOCK);
+
     //i2c rate init
     wb_i2c_init(I2C0_BASE, CPU_CLOCK);
     wb_i2c_init(I2C1_BASE, CPU_CLOCK);
@@ -163,7 +171,7 @@ void x300_init(void)
     }
 
     // For eth interfaces, initialize the PHY's
-    mdelay(100);
+    sleep_ms(100);
     ethernet_init(0);
     ethernet_init(1);
 }
diff --git a/firmware/usrp3/x300/x300_main.c b/firmware/usrp3/x300/x300_main.c
index 3b812a2c4..44ed10aa8 100644
--- a/firmware/usrp3/x300/x300_main.c
+++ b/firmware/usrp3/x300/x300_main.c
@@ -6,7 +6,6 @@
 #include "xge_phy.h"
 #include "ethernet.h"
 #include "chinch.h"
-#include "mdelay.h"
 
 #include <wb_utils.h>
 #include <wb_uart.h>