diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-22 12:05:59 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-22 12:05:59 -0800 |
| commit | 94682e4b04d9304a2f39c192bf423c4ee9f38e69 (patch) | |
| tree | e5f4e41e4d43663605648ed6126e468f65f76611 /firmware | |
| parent | 4c3ba019003fea27577bcd91b2ff5f8cf0f4ac9b (diff) | |
| download | uhd-94682e4b04d9304a2f39c192bf423c4ee9f38e69.tar.gz uhd-94682e4b04d9304a2f39c192bf423c4ee9f38e69.tar.bz2 uhd-94682e4b04d9304a2f39c192bf423c4ee9f38e69.zip | |
usrp-n2xx: corrected memory map weirdness, disable verbose in net common
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/microblaze/lib/net_common.c | 2 | ||||
| -rw-r--r-- | firmware/microblaze/usrp2p/memory_map.h | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/firmware/microblaze/lib/net_common.c b/firmware/microblaze/lib/net_common.c index 637fc3dc1..a34ca615b 100644 --- a/firmware/microblaze/lib/net_common.c +++ b/firmware/microblaze/lib/net_common.c @@ -37,7 +37,7 @@ #include <string.h> #include "pkt_ctrl.h" -static const bool debug = true; +static const bool debug = false; static const eth_mac_addr_t BCAST_MAC_ADDR = {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}; diff --git a/firmware/microblaze/usrp2p/memory_map.h b/firmware/microblaze/usrp2p/memory_map.h index 659ded0b5..2b5ae57be 100644 --- a/firmware/microblaze/usrp2p/memory_map.h +++ b/firmware/microblaze/usrp2p/memory_map.h @@ -218,10 +218,6 @@ hwconfig_wishbone_divisor(void) #define MISC_OUTPUT_BASE 0x5000 -#define TX_PROTOCOL_ENGINE_BASE 0x5080 -#define RX_PROTOCOL_ENGINE_BASE 0x50C0 -#define BUFFER_POOL_CTRL_BASE 0x5100 -#define LAST_SETTING_REG 0x53FC // last valid setting register #define SR_MISC 0 #define SR_TX_PROT_ENG 32 @@ -251,7 +247,7 @@ typedef struct { volatile uint32_t cpu_inp_ctrl; } buffer_pool_ctrl_t; -#define buffer_pool_ctrl ((buffer_pool_ctrl_t *) BUFFER_POOL_CTRL_BASE) +#define buffer_pool_ctrl ((buffer_pool_ctrl_t *) _SR_ADDR(SR_BUFFER_POOL_CTRL)) // --- misc outputs --- @@ -544,7 +540,7 @@ typedef struct { volatile uint32_t seqno; // Write to init seqno. It autoincs on match } tx_proto_engine_regs_t; -#define tx_proto_engine ((tx_proto_engine_regs_t *) TX_PROTOCOL_ENGINE_BASE) +#define tx_proto_engine ((tx_proto_engine_regs_t *) _SR_ADDR(SR_TX_PROT_ENG)) /* * --- ethernet rx protocol engine regs (write only) --- @@ -571,7 +567,7 @@ typedef struct { volatile uint32_t ethertype_pad; // ethertype in high 16-bits } rx_proto_engine_regs_t; -#define rx_proto_engine ((rx_proto_engine_regs_t *) RX_PROTOCOL_ENGINE_BASE) +#define rx_proto_engine ((rx_proto_engine_regs_t *) _SR_ADDR(SR_RX_PROT_ENG)) |