projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.3.0' into upstream
[debian/gnuradio]
/
usrp2
/
firmware
/
apps
/
serdes_txrx.c
diff --git
a/usrp2/firmware/apps/serdes_txrx.c
b/usrp2/firmware/apps/serdes_txrx.c
index 1becc205ec52809ad604fa9502c73230936b69af..aa4a3f33cc3fed38bd89ec4e5933e9014de3b76d 100644
(file)
--- a/
usrp2/firmware/apps/serdes_txrx.c
+++ b/
usrp2/firmware/apps/serdes_txrx.c
@@
-152,7
+152,7
@@
restart_streaming(void)
dsp_rx_regs->rx_command =
MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
streaming_items_per_frame,
dsp_rx_regs->rx_command =
MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
streaming_items_per_frame,
- 1, 1);
+ 1, 1);
dsp_rx_regs->rx_time = 0; // enqueue second command
}
dsp_rx_regs->rx_time = 0; // enqueue second command
}
@@
-168,6
+168,7
@@
start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p)
u2_eth_packet_t pkt;
memset(&pkt, 0, sizeof(pkt));
pkt.ehdr.dst = *host;
u2_eth_packet_t pkt;
memset(&pkt, 0, sizeof(pkt));
pkt.ehdr.dst = *host;
+ pkt.ehdr.src = *ethernet_mac_addr();
pkt.ehdr.ethertype = U2_ETHERTYPE;
u2p_set_word0(&pkt.fixed, 0, 0);
// DSP RX will fill in timestamp
pkt.ehdr.ethertype = U2_ETHERTYPE;
u2p_set_word0(&pkt.fixed, 0, 0);
// DSP RX will fill in timestamp
@@
-183,6
+184,10
@@
start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p)
restart_streaming();
}
restart_streaming();
}
+void start_rx_streaming_at_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p, uint32_t time)
+{}
+void restart_streaming_at(uint32_t time)
+{}
void
stop_rx_cmd(void)
void
stop_rx_cmd(void)
@@
-221,7
+226,7
@@
setup_tx()
* that we didn't handle the packet. A bit of a kludge
* but it should work.
*/
* that we didn't handle the packet. A bit of a kludge
* but it should work.
*/
-bool
+bool
fw_sets_seqno_inspector(dbsm_t *sm, int buf_this) // returns false
{
uint32_t *p = buffer_ram(buf_this);
fw_sets_seqno_inspector(dbsm_t *sm, int buf_this) // returns false
{
uint32_t *p = buffer_ram(buf_this);
@@
-301,7
+306,7
@@
main(void)
//output_regs->flush_icache = 1;
//output_regs->flush_icache = 1;
-
+
// initialize double buffering state machine for DSP RX -> Ethernet
if (FW_SETS_SEQNO){
// initialize double buffering state machine for DSP RX -> Ethernet
if (FW_SETS_SEQNO){