diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-07-29 10:12:45 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-07-29 10:12:45 -0700 |
| commit | f39c4538a3ca25c79f6b793ee0b6448051dcd751 (patch) | |
| tree | d1bb5ccad239d8618a66e5c6a0eb14079c211429 /firmware/microblaze/usrp2p | |
| parent | f9cec099f9909bbdf7b9f1c20db9c81173a9b98d (diff) | |
| download | uhd-f39c4538a3ca25c79f6b793ee0b6448051dcd751.tar.gz uhd-f39c4538a3ca25c79f6b793ee0b6448051dcd751.tar.bz2 uhd-f39c4538a3ca25c79f6b793ee0b6448051dcd751.zip | |
Clock bugs, LED order.
Figured out cold-start problem with Matt's help -- the DCM wasn't being
reset. This also explains why USRP2 didn't like it when
clocks_mimo_config was omitted -- it was sneakily resetting the DCM
while enabling/disabling ref outputs.
Also re-did USRP2P LED order and genericized the LED settings so LED_D
is LED_D for both USRP2 and USRP2P.
Diffstat (limited to 'firmware/microblaze/usrp2p')
| -rw-r--r-- | firmware/microblaze/usrp2p/ethernet.c | 4 | ||||
| -rw-r--r-- | firmware/microblaze/usrp2p/memory_map.h | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/firmware/microblaze/usrp2p/ethernet.c b/firmware/microblaze/usrp2p/ethernet.c index 80c303153..660f28934 100644 --- a/firmware/microblaze/usrp2p/ethernet.c +++ b/firmware/microblaze/usrp2p/ethernet.c @@ -70,7 +70,7 @@ ed_link_up(int speed) ed_set_mac_speed(speed); //turn on link LED for USRP2P - hal_set_leds((1 << 0), (1 << 0)); + hal_set_leds(LED_RJ45, LED_RJ45); if (ed_callback) // fire link changed callback @@ -83,7 +83,7 @@ ed_link_down(void) // putstr("ed_link_down\n"); //turn off link LED for USRP2P - hal_set_leds(0, (1 << 0)); + hal_set_leds(0, LED_RJ45); if (ed_callback) // fire link changed callback (*ed_callback)(0); diff --git a/firmware/microblaze/usrp2p/memory_map.h b/firmware/microblaze/usrp2p/memory_map.h index fc0094e67..9c5b576d7 100644 --- a/firmware/microblaze/usrp2p/memory_map.h +++ b/firmware/microblaze/usrp2p/memory_map.h @@ -402,6 +402,10 @@ typedef struct { volatile uint32_t led_src; // HW or SW control for LEDs } output_regs_t; +#define CLK_RESET (1<<4) +#define CLK_ENABLE (1<<3) | (1<<2) +#define CLK_SEL (1<<1) | (1<<0) + #define SERDES_ENABLE 8 #define SERDES_PRBSEN 4 #define SERDES_LOOPEN 2 @@ -412,13 +416,13 @@ typedef struct { // crazy order that matches the labels on the case -#define LED_A (1 << 4) -#define LED_B (1 << 1) -#define LED_C (1 << 3) -#define LED_D (1 << 0) -#define LED_E (1 << 2) +#define LED_A (1 << 2) +#define LED_B (1 << 5) +#define LED_E (1 << 3) +#define LED_D (1 << 1) +#define LED_C (1 << 4) // LED_F // controlled by CPLD -#define LED_RJ45 (1 << 5) +#define LED_RJ45 (1 << 0) #define output_regs ((output_regs_t *) MISC_OUTPUT_BASE) |