Skip to content

W
White Rabbit Switch - Software
Commit 6354def9 authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

userspace/wrsw_hal: correct is_locked flag reporting, removed excessive debug messages

parent d4c55017
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
userspace/wrsw_hal/hal_exports.c
View file @ 6354def9
......@@ -23,7 +23,7 @@ int halexp_lock_cmd(const char *port_name, int command, int priority)
{
int rval;
TRACE(TRACE_INFO, "halexp_lock_cmd: cmd=%d port=%s tics =%lld\n", command, port_name, shw_get_tics());
// TRACE(TRACE_INFO, "halexp_lock_cmd: cmd=%d port=%s tics =%lld\n", command, port_name, shw_get_tics());
switch(command)
{
......
userspace/wrsw_hal/hal_ports.c
View file @ 6354def9
......@@ -149,7 +149,7 @@ static int get_mac_address(const char *if_name, uint8_t *mac_addr)
mac_addr[2] = 0x30;
mac_addr[3] = ifr.ifr_hwaddr.sa_data[3];
mac_addr[4] = ifr.ifr_hwaddr.sa_data[4];
mac_addr[5] = (ifr.ifr_hwaddr.sa_data[5] & 0xc0) + (idx + 1);
mac_addr[5] = (ifr.ifr_hwaddr.sa_data[5] & 0xc0) + (idx + 2);
}
return 0;
......@@ -372,7 +372,7 @@ int hal_phase_shifter_busy()
{
int busy = rts_state.channels[rts_state.current_ref].flags & CHAN_SHIFTING ? 1 : 0;
TRACE(TRACE_INFO, "PSBusy %d, flags %x", busy, rts_state.channels[rts_state.current_ref].flags);
// TRACE(TRACE_INFO, "PSBusy %d, flags %x", busy, rts_state.channels[rts_state.current_ref].flags);
return busy;
}
......@@ -647,6 +647,9 @@ int hal_port_check_lock(const char *port_name)
if(!rts_state_valid)
return 0;
if(rts_state.delock_count > 0)
return 0;
return (rts_state.current_ref == p->hw_index &&
(rts_state.flags & RTS_DMTD_LOCKED) &&
(rts_state.flags & RTS_REF_LOCKED));
......@@ -672,7 +675,7 @@ int halexp_get_port_state(hexp_port_state_t *state, const char *port_name)
state->mode = p->mode;
state->up = (p->state != HAL_PORT_STATE_LINK_DOWN && p->state != HAL_PORT_STATE_DISABLED);
state->is_locked = p->lock_state == LOCK_STATE_LOCKED;
state->is_locked = p->locked; //lock_state == LOCK_STATE_LOCKED;
state->phase_val = p->phase_val;
state->phase_val_valid = p->phase_val_valid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment