Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Switch - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
86
Issues
86
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Switch - Software
Commits
6354def9
Commit
6354def9
authored
May 04, 2012
by
Tomasz Wlostowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
userspace/wrsw_hal: correct is_locked flag reporting, removed excessive debug messages
parent
d4c55017
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
hal_exports.c
userspace/wrsw_hal/hal_exports.c
+1
-1
hal_ports.c
userspace/wrsw_hal/hal_ports.c
+6
-3
No files found.
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
->
lock
ed
;
//lock
_state == LOCK_STATE_LOCKED;
state
->
phase_val
=
p
->
phase_val
;
state
->
phase_val_valid
=
p
->
phase_val_valid
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment