summaryrefslogtreecommitdiffstats
path: root/firmware/zpu/lib
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-12-29 11:15:24 -0800
committerJosh Blum <josh@joshknows.com>2010-12-29 11:15:24 -0800
commitca0f4f0be8c19533007e4284d1ccc47df0f1c6e3 (patch)
tree330cdf2e01d50dc7976fad31797041efde5a4d15 /firmware/zpu/lib
parentf56097198fad8423bba41a9c083abdc3b41f016a (diff)
downloaduhd-ca0f4f0be8c19533007e4284d1ccc47df0f1c6e3.tar.gz
uhd-ca0f4f0be8c19533007e4284d1ccc47df0f1c6e3.tar.bz2
uhd-ca0f4f0be8c19533007e4284d1ccc47df0f1c6e3.zip
usrp2: remove ram macros from memory map, conditionally load fw update
Diffstat (limited to 'firmware/zpu/lib')
-rw-r--r--firmware/zpu/lib/pkt_ctrl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/zpu/lib/pkt_ctrl.c b/firmware/zpu/lib/pkt_ctrl.c
index 96cf76356..df5851c35 100644
--- a/firmware/zpu/lib/pkt_ctrl.c
+++ b/firmware/zpu/lib/pkt_ctrl.c
@@ -70,7 +70,7 @@ void *pkt_ctrl_claim_incoming_buffer(size_t *num_lines){
//if done: clear the read and return the buffer
if (status & CPU_STAT_RD_DONE){
*num_lines = (router_status->status >> 16) & 0xffff;
- return router_ram(0);
+ return ((uint32_t *) ROUTER_RAM_BASE);
}
//if error: drop the packet and start a new read
@@ -99,7 +99,7 @@ void *pkt_ctrl_claim_outgoing_buffer(void){
}
//wait for idle and return the buffer
cpu_stat_wait_for(CPU_STAT_WR_IDLE);
- return router_ram(0);
+ return ((uint32_t *) ROUTER_RAM_BASE);
}
void pkt_ctrl_commit_outgoing_buffer(size_t num_lines){