hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

usrp2: same change but to fw updater

Browse Source
This commit is contained in:
Josh Blum 2012-01-24 08:38:36 -08:00
parent d2e4354f78
commit cbeb4305b5
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/zpu/lib/memory_map.h
View File

@ -297,11 +297,7 @@ typedef struct {
// --- VITA RX CTRL regs ---
typedef struct {
// The following 3 are logically a single command register.
// They are clocked into the underlying fifo when time_ticks is written.
volatile uint32_t cmd; // {now, chain, num_samples(30)
volatile uint32_t time_secs;
volatile uint32_t time_ticks;
volatile uint32_t _pad[3];
volatile uint32_t clear;
} sr_rx_ctrl_t;

8
firmware/zpu/usrp2p/udp_fw_update.c
View File

@ -67,12 +67,8 @@ void handle_udp_fw_update_packet(struct socket_address src, struct socket_addres
update_data_out.id = USRP2_FW_UPDATE_ID_OHAI_OMG;
memcpy(&update_data_out.data.ip_addr, (void *)get_ip_addr(), sizeof(struct ip_addr));
//this is to stop streaming for the folks who think updating while streaming is a good idea
sr_rx_ctrl0->cmd = 1 << 31 | 1 << 28; //no samples now
sr_rx_ctrl0->time_secs = 0;
sr_rx_ctrl0->time_ticks = 0; //latch the command
sr_rx_ctrl1->cmd = 1 << 31 | 1 << 28; //no samples now
sr_rx_ctrl1->time_secs = 0;
sr_rx_ctrl1->time_ticks = 0; //latch the command
sr_rx_ctrl0->clear = 1;
sr_rx_ctrl1->clear = 1;
sr_tx_ctrl->cyc_per_up = 0;
break;