[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7196 - in usrp2/trunk: firmware/apps firmware/lib hos
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r7196 - in usrp2/trunk: firmware/apps firmware/lib host/apps host/lib |
|
Date: |
Sat, 15 Dec 2007 15:42:01 -0700 (MST) |
Author: eb
Date: 2007-12-15 15:42:01 -0700 (Sat, 15 Dec 2007)
New Revision: 7196
Added:
usrp2/trunk/firmware/apps/tx_only.c
usrp2/trunk/host/apps/gen_const.cc
usrp2/trunk/host/apps/tx_samples.cc
Modified:
usrp2/trunk/firmware/apps/Makefile.am
usrp2/trunk/firmware/apps/rx_only.c
usrp2/trunk/firmware/apps/tx_standalone.c
usrp2/trunk/firmware/lib/dbsm.c
usrp2/trunk/firmware/lib/dbsm.h
usrp2/trunk/host/apps/
usrp2/trunk/host/apps/Makefile.am
usrp2/trunk/host/apps/rx_samples.cc
usrp2/trunk/host/lib/usrp2_basic.cc
usrp2/trunk/host/lib/usrp2_basic.h
Log:
tx working over network
Modified: usrp2/trunk/firmware/apps/Makefile.am
===================================================================
--- usrp2/trunk/firmware/apps/Makefile.am 2007-12-15 17:26:44 UTC (rev
7195)
+++ usrp2/trunk/firmware/apps/Makefile.am 2007-12-15 22:42:01 UTC (rev
7196)
@@ -37,6 +37,7 @@
test_printf \
timer_test \
test_serdes \
+ tx_only \
tx_standalone
Modified: usrp2/trunk/firmware/apps/rx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/rx_only.c 2007-12-15 17:26:44 UTC (rev 7195)
+++ usrp2/trunk/firmware/apps/rx_only.c 2007-12-15 22:42:01 UTC (rev 7196)
@@ -66,7 +66,7 @@
// 4 lines of ethernet hdr + 1 line (word0)
// DSP Rx writes timestamp followed by nlines_per_frame of samples
#define DSP_RX_FIRST_LINE 5
-#define DSP_RX_SAMPLES_PER_FRAME 128
+#define DSP_RX_SAMPLES_PER_FRAME 100
#define DSP_RX_EXTRA_LINES 1 // writes timestamp
// receive from DSP
@@ -161,7 +161,7 @@
dsp_rx_regs->scale_iq = (1 << 16) | 1;
dsp_rx_regs->decim_rate = 63; // register gets N - 1
- uint32_t cmd = MK_RX_CMD(10000 * DSP_RX_SAMPLES_PER_FRAME,
DSP_RX_SAMPLES_PER_FRAME);
+ uint32_t cmd = MK_RX_CMD(1 * DSP_RX_SAMPLES_PER_FRAME,
DSP_RX_SAMPLES_PER_FRAME);
// printf("rx_command = "); puthex32_nl(cmd);
dsp_rx_regs->rx_command = cmd;
@@ -340,7 +340,9 @@
eth_driver_init();
// initialize double buffering state machine for DSP RX -> Ethernet
- dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0, &dsp_rx_recv_args, &dsp_rx_send_args);
+ dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
+ &dsp_rx_recv_args, &dsp_rx_send_args,
+ dbsm_nop_inspector);
// setup receive from ETH
Copied: usrp2/trunk/firmware/apps/tx_only.c (from rev 7191,
usrp2/trunk/firmware/apps/tx_standalone.c)
===================================================================
--- usrp2/trunk/firmware/apps/tx_only.c (rev 0)
+++ usrp2/trunk/firmware/apps/tx_only.c 2007-12-15 22:42:01 UTC (rev 7196)
@@ -0,0 +1,460 @@
+/*
+ * 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/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "u2_init.h"
+#include "memory_map.h"
+#include "spi.h"
+#include "hal_io.h"
+#include "buffer_pool.h"
+#include "pic.h"
+#include "bool.h"
+#include "eth_driver.h"
+#include "eth_mac.h"
+#include "nonstdio.h"
+#include "usrp2_eth_packet.h"
+#include "memcpy_wa.h"
+#include "dbsm.h"
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define _AL4 __attribute__((aligned (4)))
+
+#define USE_BUFFER_INTERRUPT 1 // 0 or 1
+
+
+static int timer_delta = MASTER_CLK_RATE/1000; // tick at 1kHz
+
+/*
+ * This program can respond to queries from the host
+ * and stream rx samples.
+ *
+ * Buffer 1 is used by the cpu to send frames to the host.
+ * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
+ * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx eth flow
+ */
+//#define CPU_RX_BUF 0 // eth -> cpu
+#define CPU_TX_BUF 1 // cpu -> eth
+
+#define DSP_RX_BUF_0 2 // dsp rx -> eth (double buffer)
+#define DSP_RX_BUF_1 3 // dsp rx -> eth
+#define DSP_TX_BUF_0 4 // eth -> dsp tx (double buffer)
+#define DSP_TX_BUF_1 5 // eth -> dsp tx
+
+
+/*
+ * ================================================================
+ * configure DSP RX double buffering state machine
+ * ================================================================
+ */
+
+#define LAST_LINE 255 // last line in buffer
+
+
+// 4 lines of ethernet hdr + 1 line (word0)
+// DSP Rx writes timestamp followed by nlines_per_frame of samples
+#define DSP_RX_FIRST_LINE 5
+#define DSP_RX_SAMPLES_PER_FRAME 128
+#define DSP_RX_EXTRA_LINES 1 // writes timestamp
+
+// Receive from DSP Rx
+buf_cmd_args_t dsp_rx_recv_args = {
+ PORT_DSP,
+ DSP_RX_FIRST_LINE,
+ LAST_LINE
+};
+
+// send to ethernet
+buf_cmd_args_t dsp_rx_send_args = {
+ PORT_ETH,
+ 0, // starts with ethernet header in line 0
+ 0, // filled in from last_line register
+};
+
+dbsm_t dsp_rx_sm; // the state machine
+
+/*
+ * ================================================================
+ * configure DSP TX double buffering state machine
+ * ================================================================
+ */
+
+// 4 lines of ethernet hdr + 2 lines (word0 + timestamp)
+// DSP Tx reads word0 (flags) + timestamp followed by samples
+
+#define DSP_TX_FIRST_LINE 4
+#define DSP_TX_SAMPLES_PER_FRAME 250 // not used except w/ debugging
+#define DSP_TX_EXTRA_LINES 2 // reads word0 +
timestamp
+
+// Receive from ethernet
+buf_cmd_args_t dsp_tx_recv_args = {
+ PORT_ETH,
+ 0,
+ LAST_LINE
+};
+
+// send to DSP Tx
+buf_cmd_args_t dsp_tx_send_args = {
+ PORT_DSP,
+ DSP_TX_FIRST_LINE, // starts just past ethernet header
+ 0 // filled in from last_line register
+};
+
+dbsm_t dsp_tx_sm; // the state machine
+
+
+// ----------------------------------------------------------------
+
+
+// The mac address of the host we're sending to.
+u2_mac_addr_t host_mac_addr;
+
+
+void link_changed_callback(int speed);
+static volatile bool link_is_up = false; // eth handler sets this
+
+
+void
+timer_irq_handler(unsigned irq)
+{
+ hal_set_timeout(timer_delta); // schedule next timeout
+}
+
+// Tx DSP underrun
+void
+underrun_irq_handler(unsigned irq)
+{
+ dsp_tx_regs->clear_state = 1;
+
+ dbsm_stop(&dsp_tx_sm);
+ dbsm_start(&dsp_tx_sm); // restart sm so we're listening to ethernet again
+
+ // FIXME anything else?
+
+ putstr("\nirq: underrun\n");
+}
+
+// Rx DSP overrun
+void
+overrun_irq_handler(unsigned irq)
+{
+ dsp_rx_regs->clear_state = 1;
+ bp_clear_buf(DSP_RX_BUF_0);
+ bp_clear_buf(DSP_RX_BUF_1);
+ dbsm_stop(&dsp_rx_sm);
+
+ // FIXME anything else?
+
+ putstr("\nirq: overrun\n");
+}
+
+
+static void
+start_rx_cmd(const u2_mac_addr_t *host)
+{
+ // printf("start_rx_cmd\n");
+ // hal_toggle_leds(0x2);
+
+ 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_wordaligned(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
+ memcpy_wordaligned(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
+
+
+ // setup RX DSP regs
+ dsp_rx_regs->clear_state = 1; // reset
+ dsp_rx_regs->freq = 0;
+ dsp_rx_regs->scale_iq = (1 << 16) | 1;
+ dsp_rx_regs->decim_rate = 63; // register gets N - 1
+
+ uint32_t cmd = MK_RX_CMD(10000 * DSP_RX_SAMPLES_PER_FRAME,
DSP_RX_SAMPLES_PER_FRAME);
+ // printf("rx_command = "); puthex32_nl(cmd);
+ dsp_rx_regs->rx_command = cmd;
+
+ // kick off the state machine
+ dbsm_start(&dsp_rx_sm);
+
+ // dsp_rx_regs->rx_time = 1; // timer_regs->time + 10000;
+ dsp_rx_regs->rx_time = T_NOW; // start NOW!
+
+ // FIXME need to arrange to add additional stuff to cmd queue
+}
+
+
+static void
+stop_rx_cmd(void)
+{
+ dsp_rx_regs->clear_state = 1; // FIXME need to 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;
+
+ // setup Tx DSP regs
+ dsp_tx_regs->clear_state = 1; // reset
+ dsp_tx_regs->freq = 408021893; // 9.5 MHz [2**32 * fc/fsample]
+ dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
+ dsp_tx_regs->interp_rate = 31; // register gets N - 1
+}
+
+#if 0
+static void
+stop_tx_cmd(void)
+{
+ dsp_tx_regs->clear_state = 1;
+ bp_clear_buf(DSP_TX_BUF_0);
+ bp_clear_buf(DSP_TX_BUF_1);
+}
+#endif
+
+
+static void
+set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t const *cmd_pkt)
+{
+ reply_pkt->ehdr.dst = cmd_pkt->ehdr.src;
+ reply_pkt->ehdr.ethertype = U2_ETHERTYPE;
+ reply_pkt->ehdr._pad = 0;
+ u2p_set_word0(&reply_pkt->fixed, 0, CONTROL_CHAN);
+ reply_pkt->fixed.timestamp = timer_regs->time;
+}
+
+static void
+handle_control_chan_frame(int bufno, u2_eth_packet_t *pkt, size_t len)
+{
+ static unsigned char payload[64] _AL4;
+ static unsigned char reply[sizeof(u2_eth_packet_t) + sizeof(u2_subpkt_t)]
_AL4;
+ unsigned char *s = &reply[sizeof(u2_eth_packet_t)];
+ size_t reply_len = 0;
+ int i;
+
+ // FIXME don't copy, we can byte address (read-only) in the buffer
+ // copy 64 bytes of payload into stack buffer
+ memcpy_wordaligned(payload,
+ (unsigned char *) buffer_ram(bufno) +
sizeof(u2_eth_packet_t),
+ sizeof(payload));
+
+ unsigned char *p = payload;
+ int opcode = p[0];
+
+ switch(opcode){
+ case OP_ID:
+ memset(reply, 0, sizeof(reply));
+ set_reply_hdr((u2_eth_packet_t *) reply, pkt);
+ {
+ op_id_reply_t *r = (op_id_reply_t *) s;
+ reply_len = sizeof(u2_eth_packet_t) + sizeof(op_id_reply_t);
+ if (reply_len < 64)
+ reply_len = 64;
+ r->opcode = OP_ID_REPLY;
+ r->len = sizeof(op_id_reply_t);
+ r->rid_mbz = 0; // FIXME
+ memcpy(&r->addr, eth_mac_addr(), 6);
+ r->hw_rev = 0x0000; // FIXME
+ for (i = 0; i < sizeof(r->serial_no); i++)
+ r->serial_no[i] = '0'; // FIXME
+
+ // r->fpga_md5sum = ; // FIXME
+ // r->sw_md5sum = ; // FIXME
+ }
+
+ // FIXME need to see if ethernet tx is busy
+
+ // copy reply into CPU_TX_BUF
+ memcpy_wordaligned(buffer_ram(CPU_TX_BUF), reply, reply_len);
+
+ bp_send_from_buf(CPU_TX_BUF, PORT_ETH, 1, 0, reply_len / 4);
+ break;
+
+ case OP_START_RX:
+ start_rx_cmd(&pkt->ehdr.src);
+ break;
+
+ case OP_STOP_RX:
+ stop_rx_cmd();
+ break;
+
+ default:
+ break;
+ }
+}
+
+
+/*
+ * Called when an ethernet packet is received.
+ * Return true if we handled it here, otherwise
+ * it'll be passed on to the DSP Tx pipe
+ */
+bool
+eth_pkt_inspector(dbsm_t *sm, int bufno)
+{
+ u2_eth_packet_t pkt;
+ size_t byte_len = (buffer_pool_status->last_line[bufno] - 1) * 4;
+
+ hal_toggle_leds(0x1);
+
+ // inspect rcvd frame and figure out what do do.
+
+ // FIXME don't copy it in
+ // copy first part of frame to stack buffer so we can byte address it
+ memcpy_wordaligned(&pkt, buffer_ram(bufno), sizeof(pkt));
+
+ if (pkt.ehdr.ethertype != U2_ETHERTYPE)
+ return true; // ignore, probably bogus PAUSE frame from MAC
+
+ int chan = u2p_chan(&pkt.fixed);
+ switch (chan){
+ case CONTROL_CHAN:
+ handle_control_chan_frame(bufno, &pkt, byte_len);
+ return true; // we handled the packet
+ break;
+
+ case 0:
+ default:
+ return false; // pass it on to Tx DSP
+ break;
+ }
+}
+
+void
+buffer_irq_handler(unsigned irq)
+{
+ hal_toggle_leds(0x2);
+
+ uint32_t status = buffer_pool_status->status;
+
+ if (status & BPS_ERROR_ALL){
+ // FIXME rare path, handle error conditions
+ }
+
+ dbsm_process_status(&dsp_tx_sm, status);
+
+ if (status & BPS_DONE(CPU_TX_BUF)){
+ bp_clear_buf(CPU_TX_BUF);
+ }
+}
+
+int
+main(void)
+{
+ u2_init();
+
+ // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
+ hal_gpio_set_tx_mode(15, 0, GPIOM_FPGA_1);
+ hal_gpio_set_rx_mode(15, 0, GPIOM_FPGA_1); // no printing...
+
+ putstr("\ntx_only\n");
+
+ // Control LEDs
+ hal_set_leds(0x0, 0x3);
+
+ if (USE_BUFFER_INTERRUPT)
+ pic_register_handler(IRQ_BUFFER, buffer_irq_handler);
+
+ pic_register_handler(IRQ_OVERRUN, overrun_irq_handler);
+ pic_register_handler(IRQ_UNDERRUN, underrun_irq_handler);
+
+ //pic_register_handler(IRQ_TIMER, timer_irq_handler);
+ //hal_set_timeout(timer_delta);
+
+ eth_driver_register_link_changed_callback(link_changed_callback);
+
+ eth_mac_init();
+ eth_driver_init();
+
+ // initialize double buffering state machine for ethernet -> DSP Tx
+
+ dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
+ &dsp_tx_recv_args, &dsp_tx_send_args,
+ eth_pkt_inspector);
+
+ // program tx registers
+ setup_tx();
+
+ // kick off the state machine
+ dbsm_start(&dsp_tx_sm);
+
+ while(1){
+ if (!USE_BUFFER_INTERRUPT)
+ buffer_irq_handler(0);
+ }
+}
+
+// ----------------------------------------------------------------
+
+// debugging output on tx pins
+#define LS_MASK 0xE0000
+#define LS_1000 0x80000
+#define LS_100 0x40000
+#define LS_10 0x20000
+
+/*
+ * Called when eth phy state changes (w/ interrupts disabled)
+ */
+void
+link_changed_callback(int speed)
+{
+ int v = 0;
+ switch(speed){
+ case 10:
+ v = LS_10;
+ link_is_up = true;
+ break;
+
+ case 100:
+ v = LS_100;
+ link_is_up = true;
+ break;
+
+ case 1000:
+ v = LS_100;
+ link_is_up = true;
+ break;
+
+ default:
+ v = 0;
+ link_is_up = false;
+ break;
+ }
+
+ hal_gpio_set_tx(v, LS_MASK); /* set debug bits on d'board */
+
+ // hal_set_leds(link_is_up ? 0x2 : 0x0, 0x2);
+
+ printf("\neth link changed: speed = %d\n", speed);
+}
Modified: usrp2/trunk/firmware/apps/tx_standalone.c
===================================================================
--- usrp2/trunk/firmware/apps/tx_standalone.c 2007-12-15 17:26:44 UTC (rev
7195)
+++ usrp2/trunk/firmware/apps/tx_standalone.c 2007-12-15 22:42:01 UTC (rev
7196)
@@ -437,9 +437,10 @@
eth_driver_init();
// initialize double buffering state machine for DSP RX -> Ethernet
- dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0, &dsp_rx_recv_args, &dsp_rx_send_args);
+ dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
+ &dsp_rx_recv_args, &dsp_rx_send_args,
+ dbsm_nop_inspector);
-
// setup receive from ETH
// bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, 255);
Modified: usrp2/trunk/firmware/lib/dbsm.c
===================================================================
--- usrp2/trunk/firmware/lib/dbsm.c 2007-12-15 17:26:44 UTC (rev 7195)
+++ usrp2/trunk/firmware/lib/dbsm.c 2007-12-15 22:42:01 UTC (rev 7196)
@@ -36,10 +36,16 @@
buffer_state_t buffer_state[NBUFFERS];
+bool
+dbsm_nop_inspector(dbsm_t *sm, int buf_this)
+{
+ return false;
+}
void
dbsm_init(dbsm_t *sm, int buf0,
- const buf_cmd_args_t *recv, const buf_cmd_args_t *send)
+ const buf_cmd_args_t *recv, const buf_cmd_args_t *send,
+ inspector_t inspect)
{
if (buf0 & 0x1) // must be even
abort();
@@ -52,6 +58,8 @@
sm->rx_idle = true;
sm->tx_idle = true;
+ sm->inspect = inspect;
+
buffer_state[sm->buf0] = BS_EMPTY;
buffer_state[sm->buf0 ^ 1] = BS_EMPTY;
}
@@ -89,8 +97,19 @@
buffer_state[sm->buf0 ^ 1] = BS_EMPTY;
}
+static void dbsm_process_helper(dbsm_t *sm, uint32_t status, int buf_this);
void
+dbsm_process_status(dbsm_t *sm, uint32_t status)
+{
+ if (!sm->running)
+ return;
+
+ dbsm_process_helper(sm, status, sm->buf0);
+ dbsm_process_helper(sm, status, sm->buf0 ^ 1);
+}
+
+ static void
dbsm_process_helper(dbsm_t *sm, uint32_t status, int buf_this)
{
int buf_other = buf_this ^ 1;
@@ -100,20 +119,33 @@
if (buffer_state[buf_this] == BS_FILLING){
buffer_state[buf_this] = BS_FULL;
- if(buffer_state[buf_other] == BS_EMPTY){
- bp_receive_to_buf(buf_other, sm->recv_args.port, 1,
+ //
+ // does s/w handle this packet?
+ //
+ if (sm->inspect(sm, buf_this)){
+ // s/w handled the packet; refill the buffer
+ bp_receive_to_buf(buf_this, sm->recv_args.port, 1,
sm->recv_args.first_line, sm->recv_args.last_line);
- buffer_state[buf_other] = BS_FILLING;
+ buffer_state[buf_this] = BS_FILLING;
}
- else
- sm->rx_idle = true;
- if (sm->tx_idle){
- sm->tx_idle = false;
- bp_send_from_buf(buf_this, sm->send_args.port, 1,
- sm->send_args.first_line,
- buffer_pool_status->last_line[buf_this] - 1);
- buffer_state[buf_this] = BS_EMPTYING;
+ else { // s/w didn't handle this; pass it on
+
+ if(buffer_state[buf_other] == BS_EMPTY){
+ bp_receive_to_buf(buf_other, sm->recv_args.port, 1,
+ sm->recv_args.first_line, sm->recv_args.last_line);
+ buffer_state[buf_other] = BS_FILLING;
+ }
+ else
+ sm->rx_idle = true;
+
+ if (sm->tx_idle){
+ sm->tx_idle = false;
+ bp_send_from_buf(buf_this, sm->send_args.port, 1,
+ sm->send_args.first_line,
+ buffer_pool_status->last_line[buf_this] - 1);
+ buffer_state[buf_this] = BS_EMPTYING;
+ }
}
}
else { // buffer was emptying
@@ -136,12 +168,3 @@
}
}
-void
-dbsm_process_status(dbsm_t *sm, uint32_t status)
-{
- if (!sm->running)
- return;
-
- dbsm_process_helper(sm, status, sm->buf0);
- dbsm_process_helper(sm, status, sm->buf0 ^ 1);
-}
Modified: usrp2/trunk/firmware/lib/dbsm.h
===================================================================
--- usrp2/trunk/firmware/lib/dbsm.h 2007-12-15 17:26:44 UTC (rev 7195)
+++ usrp2/trunk/firmware/lib/dbsm.h 2007-12-15 22:42:01 UTC (rev 7196)
@@ -23,7 +23,23 @@
*/
#include <stdint.h>
+#include "bool.h"
+struct _dbsm;
+typedef struct _dbsm dbsm_t;
+
+/*
+ * pointer to function that does packet inspection.
+ *
+ * If one of these returns true, it means that the s/w
+ * handled that packet, and that it should NOT be passed
+ * on to the normal destination port.
+ */
+typedef bool (*inspector_t)(dbsm_t *sm, int buf_this);
+
+bool dbsm_nop_inspector(dbsm_t *sm, int buf_this); // returns false
+
+
typedef struct
{
uint16_t port;
@@ -34,7 +50,7 @@
/*!
* double buffer state machine
*/
-typedef struct
+struct _dbsm
{
uint8_t buf0; // Must be even. This machine uses buf0 and buf0+1
uint8_t running;
@@ -42,11 +58,13 @@
uint8_t tx_idle;
buf_cmd_args_t recv_args;
buf_cmd_args_t send_args;
-
-} dbsm_t;
+ inspector_t inspect;
+};
void dbsm_init(dbsm_t *sm, int buf0,
- const buf_cmd_args_t *recv, const buf_cmd_args_t *send);
+ const buf_cmd_args_t *recv, const buf_cmd_args_t *send,
+ inspector_t inspect);
+
void dbsm_start(dbsm_t *sm);
void dbsm_stop(dbsm_t *sm);
void dbsm_process_status(dbsm_t *sm, uint32_t status);
Property changes on: usrp2/trunk/host/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
find_usrps
rx_samples
.libs
.deps
+ *-stamp
*.a
*.bin
*.dump
*.log
*.rom
.deps
.libs
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
find_usrps
rx_samples
tx_samples
gen_const
Modified: usrp2/trunk/host/apps/Makefile.am
===================================================================
--- usrp2/trunk/host/apps/Makefile.am 2007-12-15 17:26:44 UTC (rev 7195)
+++ usrp2/trunk/host/apps/Makefile.am 2007-12-15 22:42:01 UTC (rev 7196)
@@ -23,8 +23,13 @@
bin_PROGRAMS = \
find_usrps \
- rx_samples
+ rx_samples \
+ tx_samples \
+ gen_const
find_usrps_SOURCES = find_usrps.cc
rx_samples_SOURCES = rx_samples.cc
+tx_samples_SOURCES = tx_samples.cc
+gen_const_SOURCES = gen_const.cc
+
Added: usrp2/trunk/host/apps/gen_const.cc
===================================================================
--- usrp2/trunk/host/apps/gen_const.cc (rev 0)
+++ usrp2/trunk/host/apps/gen_const.cc 2007-12-15 22:42:01 UTC (rev 7196)
@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+int
+main(int argc, char **argv)
+{
+ if (argc != 3){
+ fprintf(stderr, "usage: %s i-val q-val\n", argv[0]);
+ return 1;
+ }
+
+ int i_val = strtol(argv[1], 0, 0);
+ int q_val = strtol(argv[2], 0, 0);
+
+ uint32_t sample;
+ sample = ((i_val & 0xffff) << 16) | (q_val & 0xffff);
+
+ while(1){
+ fwrite(&sample, sizeof(sample), 1, stdout);
+ }
+}
Property changes on: usrp2/trunk/host/apps/gen_const.cc
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: usrp2/trunk/host/apps/rx_samples.cc
===================================================================
--- usrp2/trunk/host/apps/rx_samples.cc 2007-12-15 17:26:44 UTC (rev 7195)
+++ usrp2/trunk/host/apps/rx_samples.cc 2007-12-15 22:42:01 UTC (rev 7196)
@@ -104,9 +104,8 @@
}
while (1){
- static const int MAX_SAMPLES = 2048/sizeof(uint32_t);
u2_eth_samples_t pkt;
- fcomplex c_samples[MAX_SAMPLES];
+ fcomplex c_samples[U2_MAX_SAMPLES];
// read samples
int n = u2->read_samples(which, &pkt);
Copied: usrp2/trunk/host/apps/tx_samples.cc (from rev 7188,
usrp2/trunk/host/apps/rx_samples.cc)
===================================================================
--- usrp2/trunk/host/apps/tx_samples.cc (rev 0)
+++ usrp2/trunk/host/apps/tx_samples.cc 2007-12-15 22:42:01 UTC (rev 7196)
@@ -0,0 +1,119 @@
+/* -*- c++ -*- */
+/*
+ * 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/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "usrp2_basic.h"
+#include <iostream>
+#include <complex>
+#include <getopt.h>
+
+#define T_NOW (-1)
+
+typedef std::complex<float> fcomplex;
+
+
+static void
+usage(const char *progname)
+{
+ fprintf(stderr, "usage: %s [-h] [-r] [-i <input_file>]\n",
+ progname);
+}
+
+int
+main(int argc, char **argv)
+{
+ int ch;
+ const char *input_filename = 0;
+ size_t nsamples_per_pkt = 250;
+ bool repeat = false;
+
+
+ while ((ch = getopt(argc, argv, "i:hr")) != EOF){
+ switch (ch){
+ case 'r':
+ repeat = true;
+ break;
+
+ case 'i':
+ input_filename = optarg;
+ break;
+
+ case 'h':
+ default:
+ usage(argv[0]);
+ exit(1);
+ }
+ }
+
+ FILE *fp = 0;
+ if (input_filename == 0)
+ fp = stdin;
+ else {
+ fp = fopen(input_filename, "rb");
+ if (fp == 0){
+ perror(input_filename);
+ return 1;
+ }
+ }
+
+ const char *interface = "eth0";
+ usrp2_basic *u2 = new usrp2_basic();
+
+ if (!u2->open(interface)){
+ std::cerr << "couldn't open " << interface << std::endl;
+ return 0;
+ }
+
+ std::vector<op_id_reply_t> r = u2->find_usrps();
+
+ for (size_t i = 0; i < r.size(); i++){
+ std::cout << r[i] << std::endl;
+ }
+
+ if (r.size() == 0){
+ std::cerr << "No USRP2 found.\n";
+ return 1;
+ }
+
+ u2_mac_addr_t which = r[0].addr; // pick the first one
+
+
+ u2_eth_samples_t pkt;
+ u2p_set_word0(&pkt.fixed, U2P_TX_IMMEDIATE | U2P_TX_START_OF_BURST, 0);
+ u2p_set_timestamp(&pkt.fixed, T_NOW);
+
+ while (1){
+
+ int r = fread(&pkt.samples, sizeof(uint32_t), nsamples_per_pkt, fp);
+
+ // fprintf(stderr, "fread -> %d\n", r);
+
+ if (r == 0){
+ if (!repeat)
+ break;
+ fseek(fp, 0, SEEK_SET);
+ }
+
+ if (!u2->write_samples(which, &pkt, r))
+ break;
+ }
+
+ return 0;
+}
Modified: usrp2/trunk/host/lib/usrp2_basic.cc
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.cc 2007-12-15 17:26:44 UTC (rev 7195)
+++ usrp2/trunk/host/lib/usrp2_basic.cc 2007-12-15 22:42:01 UTC (rev 7196)
@@ -248,6 +248,45 @@
// ------------------------------------------------------------------------
+bool
+usrp2_basic::write_raw_samples(const u2_mac_addr_t &which,
+ u2_eth_samples_t *pkt, size_t nsamples)
+{
+ if (nsamples > U2_MAX_SAMPLES)
+ return false;
+
+ // fill in ethernet header
+ pkt->ehdr.ethertype = htons(U2_ETHERTYPE);
+ pkt->ehdr._pad = 0;
+ pkt->ehdr.dst = which;
+ memcpy(&pkt->ehdr.src, d_ethernet->mac(), 6);
+
+ size_t len = sizeof(u2_eth_packet_t) + nsamples * sizeof(uint32_t);
+ int n = d_ethernet->write_packet(pkt, len);
+ if (n <= 0)
+ return false;
+
+ if ((size_t) n != len)
+ return false;
+
+ return true;
+}
+
+bool
+usrp2_basic::write_samples(const u2_mac_addr_t &which,
+ u2_eth_samples_t *pkt, size_t nsamples)
+{
+#ifndef WORDS_BIGENDIAN
+ for (size_t i = 0; i < nsamples; i++)
+ pkt->samples[i] = htonl(pkt->samples[i]);
+#endif
+
+ return write_raw_samples(which, pkt, nsamples);
+}
+
+
+// ------------------------------------------------------------------------
+
std::ostream& operator<<(std::ostream &os, const op_id_reply_t &x)
{
os << x.addr;
Modified: usrp2/trunk/host/lib/usrp2_basic.h
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.h 2007-12-15 17:26:44 UTC (rev 7195)
+++ usrp2/trunk/host/lib/usrp2_basic.h 2007-12-15 22:42:01 UTC (rev 7196)
@@ -68,6 +68,34 @@
int read_samples(const u2_mac_addr_t &which,
u2_eth_samples_t *pkt);
+ /*!
+ * \brief Write raw samples to USRP2.
+ *
+ * \param pkt contains the raw (non-endian corrected) samples
+ * \param nsamples to write
+ *
+ * Caller must fill in word0 and timestamp field of pkt,
+ * method fills in ethernet header.
+ *
+ * \returns true iff successful
+ */
+ bool write_raw_samples(const u2_mac_addr_t &which,
+ u2_eth_samples_t *pkt, size_t nsamples);
+
+ /*!
+ * \brief Write native-endian samples to USRP2.
+ *
+ * \param pkt contains native-endian samples.
+ * \param nsamples to write
+ *
+ * Caller must fill in word0 and timestamp field of pkt,
+ * method fills in ethernet header.
+ *
+ * \returns true iff successful
+ */
+ bool write_samples(const u2_mac_addr_t &which,
+ u2_eth_samples_t *pkt, size_t nsamples);
+
};
std::ostream& operator<<(std::ostream &os, const op_id_reply_t &x);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7196 - in usrp2/trunk: firmware/apps firmware/lib host/apps host/lib,
eb <=