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
83
Issues
83
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
5f5e38bb
Commit
5f5e38bb
authored
Feb 15, 2016
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
userspace/tools: rename network interfaces from wrX to wriX+1 in wr_phytool
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
7c51549f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
6 deletions
+17
-6
wr_phytool.c
userspace/tools/wr_phytool.c
+17
-6
No files found.
userspace/tools/wr_phytool.c
View file @
5f5e38bb
...
@@ -297,7 +297,7 @@ void calc_trans(int ep, int argc, char *argv[])
...
@@ -297,7 +297,7 @@ void calc_trans(int ep, int argc, char *argv[])
if
(
argc
>=
3
)
if
(
argc
>=
3
)
f_log
=
fopen
(
argv
[
3
],
"wb"
);
f_log
=
fopen
(
argv
[
3
],
"wb"
);
snprintf
(
sock_addr
.
if_name
,
sizeof
(
sock_addr
.
if_name
),
"wr%d"
,
ep
);
snprintf
(
sock_addr
.
if_name
,
sizeof
(
sock_addr
.
if_name
),
"wr
i
%d"
,
ep
);
sock_addr
.
family
=
PTPD_SOCK_RAW_ETHERNET
;
// socket type
sock_addr
.
family
=
PTPD_SOCK_RAW_ETHERNET
;
// socket type
sock_addr
.
ethertype
=
12345
;
sock_addr
.
ethertype
=
12345
;
memset
(
sock_addr
.
mac
,
0xff
,
6
);
memset
(
sock_addr
.
mac
,
0xff
,
6
);
...
@@ -425,7 +425,7 @@ void pps_adjustment_test(int ep, int argc, char *argv[])
...
@@ -425,7 +425,7 @@ void pps_adjustment_test(int ep, int argc, char *argv[])
signal
(
SIGINT
,
sighandler
);
signal
(
SIGINT
,
sighandler
);
snprintf
(
sock_addr
.
if_name
,
sizeof
(
sock_addr
.
if_name
),
"wr%d"
,
ep
);
snprintf
(
sock_addr
.
if_name
,
sizeof
(
sock_addr
.
if_name
),
"wr
i
%d"
,
ep
);
sock_addr
.
family
=
PTPD_SOCK_RAW_ETHERNET
;
// socket type
sock_addr
.
family
=
PTPD_SOCK_RAW_ETHERNET
;
// socket type
sock_addr
.
ethertype
=
12345
;
sock_addr
.
ethertype
=
12345
;
memset
(
sock_addr
.
mac
,
0xff
,
6
);
memset
(
sock_addr
.
mac
,
0xff
,
6
);
...
@@ -468,6 +468,8 @@ void pps_adjustment_test(int ep, int argc, char *argv[])
...
@@ -468,6 +468,8 @@ void pps_adjustment_test(int ep, int argc, char *argv[])
void
rt_command
(
int
ep
,
int
argc
,
char
*
argv
[])
void
rt_command
(
int
ep
,
int
argc
,
char
*
argv
[])
{
{
/* ep is 0..17 */
struct
rts_pll_state
pstate
;
struct
rts_pll_state
pstate
;
int
i
;
int
i
;
...
@@ -476,7 +478,7 @@ void rt_command(int ep, int argc, char *argv[])
...
@@ -476,7 +478,7 @@ void rt_command(int ep, int argc, char *argv[])
if
(
rts_connect
(
NULL
)
<
0
)
if
(
rts_connect
(
NULL
)
<
0
)
{
{
printf
(
"Can't connect to the RT subsys
\n
"
);
printf
(
"Can't connect to the RT subsys
\n
"
);
return
;
exit
(
1
)
;
}
}
rts_get_state
(
&
pstate
);
rts_get_state
(
&
pstate
);
...
@@ -487,7 +489,8 @@ void rt_command(int ep, int argc, char *argv[])
...
@@ -487,7 +489,8 @@ void rt_command(int ep, int argc, char *argv[])
hal_nports_local
);
hal_nports_local
);
printf
(
"CurrentRef: %d Mode: %d Flags: %x
\n
"
,
pstate
.
current_ref
,
pstate
.
mode
,
pstate
.
flags
);
printf
(
"CurrentRef: %d Mode: %d Flags: %x
\n
"
,
pstate
.
current_ref
,
pstate
.
mode
,
pstate
.
flags
);
for
(
i
=
0
;
i
<
hal_nports_local
;
i
++
)
for
(
i
=
0
;
i
<
hal_nports_local
;
i
++
)
printf
(
"wr%-2d: setpoint: %-8dps current: %-8dps loopback: %-8dps flags: %x
\n
"
,
i
,
printf
(
"wri%-2d: setpoint: %-8dps current: %-8dps "
"loopback: %-8dps flags: %x
\n
"
,
i
+
1
,
pstate
.
channels
[
i
].
phase_setpoint
,
pstate
.
channels
[
i
].
phase_setpoint
,
pstate
.
channels
[
i
].
phase_current
,
pstate
.
channels
[
i
].
phase_current
,
pstate
.
channels
[
i
].
phase_loopback
,
pstate
.
channels
[
i
].
phase_loopback
,
...
@@ -514,7 +517,7 @@ void rt_command(int ep, int argc, char *argv[])
...
@@ -514,7 +517,7 @@ void rt_command(int ep, int argc, char *argv[])
}
}
else
if
(
!
strcmp
(
argv
[
3
],
"track"
))
else
if
(
!
strcmp
(
argv
[
3
],
"track"
))
{
{
printf
(
"Enabling ptracker @ port %d
\n
"
,
ep
);
printf
(
"Enabling ptracker @ port %d
(wri%d)
\n
"
,
ep
+
1
,
ep
+
1
);
rts_enable_ptracker
(
ep
,
1
);
rts_enable_ptracker
(
ep
,
1
);
}
}
...
@@ -580,6 +583,7 @@ struct {
...
@@ -580,6 +583,7 @@ struct {
int
main
(
int
argc
,
char
**
argv
)
int
main
(
int
argc
,
char
**
argv
)
{
{
int
i
;
int
i
;
int
ep
;
wrs_msg_init
(
1
,
argv
);
/* only use argv[0]: no cmdline */
wrs_msg_init
(
1
,
argv
);
/* only use argv[0]: no cmdline */
...
@@ -601,7 +605,14 @@ int main(int argc, char **argv)
...
@@ -601,7 +605,14 @@ int main(int argc, char **argv)
for
(
i
=
0
;
commands
[
i
].
cmd
;
i
++
)
for
(
i
=
0
;
commands
[
i
].
cmd
;
i
++
)
if
(
!
strcmp
(
commands
[
i
].
cmd
,
argv
[
2
]))
if
(
!
strcmp
(
commands
[
i
].
cmd
,
argv
[
2
]))
{
{
commands
[
i
].
func
(
atoi
(
argv
[
1
]),
argc
,
argv
);
/* first parameter is an enpoint number 1..18 */
ep
=
atoi
(
argv
[
1
])
-
1
;
if
(
ep
<
0
)
{
printf
(
"Wrong endpoint number %d
\n
"
,
ep
+
1
);
exit
(
1
);
}
/* pass endpoint as number 0..17 */
commands
[
i
].
func
(
ep
,
argc
,
argv
);
return
0
;
return
0
;
}
}
...
...
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