Changeset 9150

Timestamp:

08/01/08 20:01:13

Author:

eb

Message:

work-in-progress

Files:

• usrp2/trunk/firmware/apps (modified) (1 prop)
• usrp2/trunk/firmware/apps/Makefile.am (modified) (3 diffs)
• usrp2/trunk/firmware/apps/app_common.c (deleted)
• usrp2/trunk/firmware/apps/app_common_v2.c (modified) (2 diffs)
• usrp2/trunk/firmware/apps/app_common_v2.h (modified) (1 diff)
• usrp2/trunk/firmware/apps/app_passthru.c (deleted)
• usrp2/trunk/firmware/apps/app_passthru.h (deleted)
• usrp2/trunk/firmware/apps/app_passthru_v2.c (copied) (copied from usrp2/trunk/firmware/apps/app_common_v2.c) (9 diffs)
• usrp2/trunk/firmware/apps/app_passthru_v2.h (copied) (copied from usrp2/trunk/firmware/apps/app_common_v2.h) (1 diff)
• usrp2/trunk/firmware/apps/eth_serdes.c (copied) (copied from usrp2/trunk/firmware/apps/txrx.c) (15 diffs)
• usrp2/trunk/firmware/apps/eth_to_serdes.c (deleted)
• usrp2/trunk/firmware/apps/serdes_txrx.c (copied) (copied from usrp2/trunk/firmware/apps/txrx.c) (8 diffs)
• usrp2/trunk/firmware/apps/txrx.c (modified) (1 diff)
• usrp2/trunk/firmware/lib/Makefile.am (modified) (1 diff)
• usrp2/trunk/firmware/lib/nonstdio.h (modified) (2 diffs)
• usrp2/trunk/firmware/lib/print_buffer.c (added)

usrp2/trunk/firmware/apps/Makefile.am

@@ -26 +26 @@
-        can_i_sub \
-        echo \
+        eth_serdes \
-        gen_eth_packets \
-        hello \
@@ -44 +45 @@
-        tx_standalone \
-        txrx \
+        serdes_txrx \
-        sd_gentest \
-        sd_bounce
@@ -54 +56 @@
-tx_only_v2_SOURCES = tx_only_v2.c app_common_v2.c
-txrx_SOURCES = txrx.c app_common_v2.c
-#eth_to_serdes_SOURCES = eth_to_serdes.c app_passthru
-#serdes_to_dsp_SOURCES = serdes_to_dsp.c app_common
+eth_serdes_SOURCES = eth_serdes.c app_passthru_v2
+serdes_txrx_SOURCES = serdes_txrx.c app_common_v2
-
-
-

usrp2/trunk/firmware/apps/app_common_v2.c

@@ -32 +32 @@
-
-volatile bool link_is_up = false;       // eth handler sets this
-
+
-
-// If this is non-zero, this dbsm could be writing to the ethernet
@@ -88 +88 @@
-  }
-
+  if (1){
+    printf("sending_reply to port %d, len = %d\n", cpu_tx_buf_dest_port, reply_len);
+    print_buffer(buffer_ram(CPU_TX_BUF), reply_len/4);
+  }
+
-  // fire it off
-PORT_ETH
+cpu_tx_buf_dest_port
-
-  // wait for it to complete (not long, it's a small pkt)

usrp2/trunk/firmware/apps/app_common_v2.h

@@ -34 +34 @@
-extern volatile bool link_is_up;        // eth handler sets this
-
-
-// If there's a dbsm that sends to the ethernet, put it's address here
-extern dbsm_t *ac_could_be_sending_to_eth;
-
+extern int cpu_tx_buf_dest_port;
-
-void set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t const *cmd_pkt);

usrp2/trunk/firmware/apps/app_passthru_v2.c

@@ -21 +21 @@
-#endif
-
-common
+passthru
-#include "buffer_pool.h"
-#include "memcpy_wa.h"
@@ -37 +37 @@
-dbsm_t *ac_could_be_sending_to_eth;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-void
@@ -122 +108 @@
-}
-
-
-static size_t
-config_tx_v2_cmd(const op_config_tx_v2_t *p,
-                 void *reply_payload, size_t reply_payload_space)
-{
-  op_config_tx_reply_v2_t *r = (op_config_tx_reply_v2_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;                                   // no room
-
-  struct tune_result    tune_result;
-  memset(&tune_result, 0, sizeof(tune_result));
-
-  bool ok = true;
-  
-  if (p->valid & CFGV_GAIN){
-    ok &= db_set_gain(tx_dboard, p->gain);
-  }
-
-  if (p->valid & CFGV_FREQ){
-    u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
-    bool tune_ok = db_tune(tx_dboard, f, &tune_result);
-    ok &= tune_ok;
-    print_tune_result("Tx", tune_ok, f, &tune_result);
-  }
-
-  if (p->valid & CFGV_INTERP_DECIM){
-    int interp = p->interp;
-    int hb1 = 0;
-    int hb2 = 0;
-
-    if (!(interp & 1)){
-      hb2 = 1;
-      interp = interp >> 1;
-    }
-
-    if (!(interp & 1)){
-      hb1 = 1;
-      interp = interp >> 1;
-    }
-    
-    if (p->interp < MIN_INTERP || p->interp > MAX_INTERP)
-      ok = false;
-    else {
-      dsp_tx_regs->interp_rate = (hb1<<9) | (hb2<<8) | interp;
-      // printf("Interp: %d, register %d\n", p->interp, (hb1<<9) | (hb2<<8) | interp);
-    }
-  }
-
-  if (p->valid & CFGV_SCALE_IQ){
-    dsp_tx_regs->scale_iq = p->scale_iq;
-  }
-
-  // Build reply subpacket
-
-  r->opcode = OP_CONFIG_TX_REPLY_V2;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-  r->inverted = tune_result.inverted;
-  r->baseband_freq_hi = u2_fxpt_freq_hi(tune_result.baseband_freq);
-  r->baseband_freq_lo = u2_fxpt_freq_lo(tune_result.baseband_freq);
-  r->duc_freq_hi = u2_fxpt_freq_hi(tune_result.dxc_freq);
-  r->duc_freq_lo = u2_fxpt_freq_lo(tune_result.dxc_freq);
-  r->residual_freq_hi = u2_fxpt_freq_hi(tune_result.residual_freq);
-  r->residual_freq_lo = u2_fxpt_freq_lo(tune_result.residual_freq);
-  return r->len;
-}
-
-static size_t
-config_rx_v2_cmd(const op_config_rx_v2_t *p, 
-                 void *reply_payload, size_t reply_payload_space)
-{
-  op_config_rx_reply_v2_t *r = (op_config_rx_reply_v2_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;                           // no room
-
-  struct tune_result    tune_result;
-  memset(&tune_result, 0, sizeof(tune_result));
-
-  bool ok = true;
-  
-  if (p->valid & CFGV_GAIN){
-    ok &= db_set_gain(rx_dboard, p->gain);
-  }
-
-  if (p->valid & CFGV_FREQ){
-    u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
-    bool tune_ok = db_tune(rx_dboard, f, &tune_result);
-    ok &= tune_ok;
-    print_tune_result("Rx", tune_ok, f, &tune_result);
-  }
-
-  if (p->valid & CFGV_INTERP_DECIM){
-    int decim = p->decim;
-    int hb1 = 0;
-    int hb2 = 0;
-    
-    if(!(decim & 1)) {
-      hb2 = 1;
-      decim = decim >> 1;
-    }
-    
-    if(!(decim & 1)) {
-      hb1 = 1;
-      decim = decim >> 1;
-    }
-    
-    if (decim < MIN_DECIM || decim > MAX_DECIM)
-      ok = false;
-    else {
-      dsp_rx_regs->decim_rate = (hb1<<9) | (hb2<<8) | decim;
-      // printf("Decim: %d, register %d\n", p->decim, (hb1<<9) | (hb2<<8) | decim);
-    }
-  }
-
-  if (p->valid & CFGV_SCALE_IQ){
-    dsp_rx_regs->scale_iq = p->scale_iq;
-  }
-
-  // Build reply subpacket
-
-  r->opcode = OP_CONFIG_RX_REPLY_V2;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-  r->inverted = tune_result.inverted;
-  r->baseband_freq_hi = u2_fxpt_freq_hi(tune_result.baseband_freq);
-  r->baseband_freq_lo = u2_fxpt_freq_lo(tune_result.baseband_freq);
-  r->ddc_freq_hi = u2_fxpt_freq_hi(tune_result.dxc_freq);
-  r->ddc_freq_lo = u2_fxpt_freq_lo(tune_result.dxc_freq);
-  r->residual_freq_hi = u2_fxpt_freq_hi(tune_result.residual_freq);
-  r->residual_freq_lo = u2_fxpt_freq_lo(tune_result.residual_freq);
-
-  return r->len;
-}
-
-static size_t
-read_time_cmd(const op_generic_t *p,
-              void *reply_payload, size_t reply_payload_space)
-{
-  op_read_time_reply_t *r = (op_read_time_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))         
-    return 0;                                   // no room
-
-  r->opcode = OP_READ_TIME_REPLY;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->time = timer_regs->time;
-
-  return r->len;
-}
-
-static size_t
-generic_reply(const op_generic_t *p,
-              void *reply_payload, size_t reply_payload_space,
-              bool ok)
-{
-  op_generic_t *r = (op_generic_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))         
-    return 0;                                   // no room
-
-  r->opcode = p->opcode | OP_REPLY_BIT;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-
-  return r->len;
-}
-
-static size_t
-add_eop(void *reply_payload, size_t reply_payload_space)
@@ -306 +123 @@
-}
-
-
+
-handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len)
-{
@@ -313 +130 @@
-  int reply_payload_space = sizeof(reply) - sizeof(u2_eth_packet_t);
-
+  bool handled_it = false;
+
-  // initialize reply
-  memset(reply, 0, sizeof(reply));
@@ -333 +152 @@
-    case OP_ID:
-      subpktlen = op_id_cmd(gp, reply_payload, reply_payload_space);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-      break;
-    }
@@ -392 +174 @@
-
-  send_reply(reply, reply_payload - reply);
+
+  return handled_it;
-}
-
@@ -419 +203 @@
-  switch (chan){
-  case CONTROL_CHAN:
-
-
+
-    break;
-
@@ -458 +241 @@
-  printf("\neth link changed: speed = %d\n", speed);
-}
-
-
-void
-print_tune_result(char *msg, bool tune_ok,
-                  u2_fxpt_freq_t target_freq, struct tune_result *r)
-{
-  printf("db_tune %s %s\n", msg, tune_ok ? "true" : "false");
-  putstr("  target_freq   "); print_fxpt_freq(target_freq); newline();
-  putstr("  baseband_freq "); print_fxpt_freq(r->baseband_freq); newline();
-  putstr("  dxc_freq      "); print_fxpt_freq(r->dxc_freq); newline();
-  putstr("  residual_freq "); print_fxpt_freq(r->residual_freq); newline();
-  printf("  inverted      %s\n", r->inverted ? "true" : "false");
-}

usrp2/trunk/firmware/apps/app_passthru_v2.h

@@ -50 +50 @@
-void link_changed_callback(int speed);
-
-
-
-
-
-
-
-
-
-
+
-
-#endif /* INCLUDED_APP_COMMON_H */

usrp2/trunk/firmware/apps/eth_serdes.c

@@ -31 +31 @@
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-common
+passthru
-#include "memcpy_wa.h"
+#include "clocks.h"
-#include <stddef.h>
-#include <stdlib.h>
@@ -46 +47 @@
-
-/*
-DSP pipelin
+serd
- *
- * Buffer 1 is used by the cpu to send frames to the host.
@@ -54 +55 @@
-//#define CPU_RX_BUF    0       // eth -> cpu
-
-dsp rx
-dsp rx
-dsp tx
-dsp tx
+serdes
+serdes
+serdes
+serdes
-
-/*
- * ================================================================
-DSP TX double buffering state machine (eth -> dsp
+serdes double buffering state machine (eth -> serdes
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4)
-
-// Receive from ethernet
@@ -77 +74 @@
-};
-
-DSP Tx
+serdes
-buf_cmd_args_t dsp_tx_send_args = {
-DSP
-DSP_TX_FIRST_LINE,   // starts just past transport header
+SERDES
+0,
-  0                     // filled in from last_line register
-};
@@ -87 +84 @@
-
-/*
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-buf_cmd_args_t dsp_rx_recv_args = {
-DSP
-DSP_RX_FIRST_LINE
+SERDES
+0
-  BP_LAST_LINE
-};
@@ -117 +110 @@
-
-
-// variables for streaming mode
-
-static bool         streaming_p = false;
-static unsigned int streaming_items_per_frame = 0;
-static int          streaming_frame_count = 0;
-#define FRAMES_PER_CMD  1000
-
-
-// ----------------------------------------------------------------
-
-
-static void
-restart_streaming(void)
-{
-  // setup RX DSP regs
-  dsp_rx_regs->clear_state = 1;                 // reset
-
-  streaming_p = true;
-  streaming_frame_count = FRAMES_PER_CMD;
-
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-              streaming_items_per_frame,
-              1, 1);                    // set "chain" bit
-
-  // kick off the state machine
-  dbsm_start(&dsp_rx_sm);
-
-  dsp_rx_regs->rx_time = 0;             // enqueue first of two commands
-
-  // make sure this one and the rest have the "now" and "chain" bits set.
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-              streaming_items_per_frame,
-              1, 1);                            
-
-  dsp_rx_regs->rx_time = 0;             // enqueue second command
-}
-
-void
-start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p)
-{
-  host_mac_addr = *host;        // remember who we're sending to
-
-  /*
-   * Construct  ethernet header and word0 and preload into two buffers
-   */
-  u2_eth_packet_t       pkt;
-  memset(&pkt, 0, sizeof(pkt));
-  pkt.ehdr.dst = *host;
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  u2p_set_word0(&pkt.fixed, 0, 0);
-  // DSP RX will fill in timestamp
-
-  memcpy_wa(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wa(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
-
-
-  if (FW_SETS_SEQNO)
-    fw_seqno = 0;
-
-  streaming_items_per_frame = p->items_per_frame;
-  restart_streaming();
-}
-
-
-void
-stop_rx_cmd(void)
-{
-  streaming_p = false;
-  dsp_rx_regs->clear_state = 1; // flush cmd queue
-  bp_clear_buf(DSP_RX_BUF_0);
-  bp_clear_buf(DSP_RX_BUF_1);
-}
-
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  int tx_scale = 256;
-  int interp = 32;
-
-  // setup some defaults
-
-  dsp_tx_regs->freq = 0;
-  dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
-  dsp_tx_regs->interp_rate = interp;
-}
-
-
@@ -220 +122 @@
- * but it should work.
- */
+
-bool 
-fw_sets_seqno_inspector(dbsm_t *sm, int buf_this)       // returns false
-{
-  uint32_t *p = buffer_ram(buf_this);
+  uint32_t last_line = buffer_pool_status->last_line[buf_this] - sm->last_line_adj;
+  printf("fw_sets_seqno_inspector: buf_this = %d, last_line = %d\n",
+         buf_this, last_line);
+
+  print_buffer(p, (last_line + 1));
+
+#if 0
+  uint32_t *p = buffer_ram(buf_this);
-  uint32_t seqno = fw_seqno++;
-
@@ -230 +141 @@
-  t = (t & 0xffff00ff) | ((seqno & 0xff) << 8);
-  p[4] = t;
-
-
-
-
-
-
+
-
-  return false;         // we didn't handle the packet
@@ -247 +153 @@
-  uint32_t  status = buffer_pool_status->status;
-
+  if (status & ~BPS_IDLE_ALL){
+    putstr("status = ");
+    puthex32_nl(status);
+  }
+    
-  dbsm_process_status(&dsp_tx_sm, status);
-  dbsm_process_status(&dsp_rx_sm, status);
@@ -256 +167 @@
-  u2_init();
-
-TxRx
+eth <-> serdes
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
+  clocks_mimo_config(MC_WE_LOCK_TO_SMA | MC_PROVIDE_CLK_TO_MIMO);
-
-#if 0
@@ -268 +180 @@
-#endif
-
+#if 1
-  output_regs->debug_mux_ctrl = 1;
-#if 0
-  hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
@@ -277 +189 @@
-
-
-DSP Tx
+serdes
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
@@ -284 +196 @@
-
-
-DSP RX -> E
+serdes -> e
-
-  if (FW_SETS_SEQNO){
@@ -301 +213 @@
-
-
-  // program tx registers
-  setup_tx();
-
-  // kick off the state machine
-  dbsm_start(&dsp_tx_sm);
-
-
+//
-
-  while(1){
@@ -314 +223 @@
-
-    buffer_irq_handler(0);
-
-    int pending = pic_regs->pending;            // poll for under or overrun
-
-    if (pending & PIC_UNDERRUN_INT){
-      dbsm_handle_tx_underrun(&dsp_tx_sm);
-      pic_regs->pending = PIC_UNDERRUN_INT;     // clear interrupt
-      putchar('U');
-    }
-
-    if (pending & PIC_OVERRUN_INT){
-      dbsm_handle_rx_overrun(&dsp_rx_sm);
-      pic_regs->pending = PIC_OVERRUN_INT;      // clear pending interrupt
-
-      // FIXME Figure out how to handle this robustly.
-      // Any buffers that are emptying should be allowed to drain...
-
-      if (streaming_p){
-        // restart_streaming();
-        // FIXME report error
-      }
-      else {
-        // FIXME report error
-      }
-      putchar('O');
-    }
-  }
-}

usrp2/trunk/firmware/apps/serdes_txrx.c

@@ -33 +33 @@
-#include "app_common_v2.h"
-#include "memcpy_wa.h"
+#include "clocks.h"
-#include <stddef.h>
-#include <stdlib.h>
@@ -46 +47 @@
-
-/*
-ethernet
+serdes
- *
- * Buffer 1 is used by the cpu to send frames to the host.
-eth
-eth to DSP Tx  eth
+serdes
+serdes to DSP Tx
- */
-//#define CPU_RX_BUF    0       // eth -> cpu
-
-eth
-eth
-eth
-eth
-
-
-
-eth
-
+serdes
+serdes
+serdes
+serdes
+
+
+==
+serdes
+==
- */
-
@@ -70 +71 @@
-#define DSP_TX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4)
-
-ethernet
+serdes
-buf_cmd_args_t dsp_tx_recv_args = {
-ETH
+SERDES
-  0,
-  BP_LAST_LINE
@@ -87 +88 @@
-
-/*
-
-eth
-
+=
+serdes
+=
- */
-
@@ -103 +104 @@
-};
-
-ETH
+serdes
-buf_cmd_args_t dsp_rx_send_args = {
-ETH
+SERDES
-  0,            // starts with ethernet header in line 0
-  0,            // filled in from list_line register
@@ -256 +257 @@
-  u2_init();
-
-
+
+
+
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
+  clocks_mimo_config(MC_WE_LOCK_TO_MIMO);
-
-#if 0
@@ -268 +272 @@
-#endif
-
+#if 1
-  output_regs->debug_mux_ctrl = 1;
-
-
-
+
+
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0xffff, 0xffff);
-  hal_gpio_set_ddr(GPIO_RX_BANK, 0xffff, 0xffff);
@@ -307 +311 @@
-  dbsm_start(&dsp_tx_sm);
-
-
+//
-
-  while(1){

usrp2/trunk/firmware/apps/txrx.c

@@ -307 +307 @@
-  dbsm_start(&dsp_tx_sm);
-
-
+//
-
-  while(1){

usrp2/trunk/firmware/lib/Makefile.am

@@ -48 +48 @@
-        print_rmon_regs.c \
-        print_fxpt.c \
+        print_buffer.c \
-        printf.c \
-        spi.c \

usrp2/trunk/firmware/lib/nonstdio.h

@@ -22 +22 @@
-#include <stdio.h>
-#include <usrp2_types.h>
+#include <stddef.h>
-
-void putstr(const char *s);             // cf puts, no added newline
@@ -41 +42 @@
-void print_uint64(uint64_t v);
-
+void print_buffer(uint32_t *buf, size_t n);
+
-#endif /* INCLUDED_NONSTDIO_H */