Reorganized firmware/ subdirectory (x300->usrp3, zpu->usrp2)

1 files changed, 0 insertions, 100 deletions

diff --git a/firmware/zpu/lib/pkt_ctrl.c b/firmware/zpu/lib/pkt_ctrl.c
deleted file mode 100644
index 2bbe2f843..000000000
--- a/firmware/zpu/lib/pkt_ctrl.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2010-2011 Ettus Research LLC
- *
- * 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/>.
- */
-
-#include "pkt_ctrl.h"
-#include "memory_map.h"
-#include <nonstdio.h>
-
-//status signals from WB into PR
-#define CPU_STAT_RD_DONE (1 << 0)
-#define CPU_STAT_RD_EROR (1 << 1)
-#define CPU_STAT_RD_IDLE (1 << 2)
-
-//status signals from PR into WB
-#define CPU_STAT_WR_DONE (1 << 4)
-#define CPU_STAT_WR_EROR (1 << 5)
-#define CPU_STAT_WR_IDLE (1 << 6)
-
-//control signals from WB into PR
-#define CPU_CTRL_RD_CLEAR (1 << 0)
-#define CPU_CTRL_RD_START (1 << 1)
-
-//control signals from PR into WB
-#define CPU_CTRL_WR_CLEAR (1 << 2)
-#define CPU_CTRL_WR_START (1 << 3)
-
-void pkt_ctrl_program_inspector(
-    const struct ip_addr *ip_addr, uint16_t data_port
-){
-    router_ctrl->ip_addr = ip_addr->addr;
-    router_ctrl->data_ports = data_port;
-}
-
-void pkt_ctrl_set_routing_mode(pkt_ctrl_routing_mode_t mode){
-    //About to change the mode; ensure that we are accepting packets.
-    //The plumbing will not switch if it cannot pass an end of packet.
-    pkt_ctrl_release_incoming_buffer();
-
-    //Change the mode; this switches the valves and crossbars.
-    router_ctrl->mode_ctrl = mode;
-}
-
-static inline void cpu_stat_wait_for(int bm){
-    while((router_status->status & bm) == 0){
-        /* NOP */
-    }
-}
-
-void *pkt_ctrl_claim_incoming_buffer(size_t *num_lines){
-    uint32_t status = router_status->status;
-
-    //if done: clear the read and return the buffer
-    if (status & CPU_STAT_RD_DONE){
-        *num_lines = (router_status->status >> 16) & 0xffff;
-        return ((uint32_t *) ROUTER_RAM_BASE);
-    }
-
-    //if error: drop the packet and start a new read
-    if (status & CPU_STAT_RD_EROR){
-        putstr("E");
-        pkt_ctrl_release_incoming_buffer();
-    }
-
-    //otherwise null for nothing ready
-    return NULL;
-}
-
-void pkt_ctrl_release_incoming_buffer(void){
-    //clear, wait for idle, and start a new read
-    router_ctrl->iface_ctrl = CPU_CTRL_RD_CLEAR;
-    cpu_stat_wait_for(CPU_STAT_RD_IDLE);
-    router_ctrl->iface_ctrl = CPU_CTRL_RD_START;
-}
-
-void *pkt_ctrl_claim_outgoing_buffer(void){
-    //wait for idle and return the buffer
-    cpu_stat_wait_for(CPU_STAT_WR_IDLE);
-    return ((uint32_t *) ROUTER_RAM_BASE);
-}
-
-void pkt_ctrl_commit_outgoing_buffer(size_t num_lines){
-    //start a new write with the given length
-    router_ctrl->iface_ctrl = ((num_lines & 0xffff) << 16) | CPU_CTRL_WR_START;
-    //wait for the write to become done
-    cpu_stat_wait_for(CPU_STAT_WR_DONE);
-    router_ctrl->iface_ctrl = CPU_CTRL_WR_CLEAR;
-}