From ca0f4f0be8c19533007e4284d1ccc47df0f1c6e3 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 29 Dec 2010 11:15:24 -0800 Subject: usrp2: remove ram macros from memory map, conditionally load fw update --- firmware/zpu/lib/pkt_ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/zpu/lib') 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){ -- cgit v1.2.3