Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
PPSi
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
47
Issues
47
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
PPSi
Commits
314d8605
Commit
314d8605
authored
Nov 06, 2014
by
Alessandro Rubini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pp-instance: include the VLAN list
Signed-off-by:
Alessandro Rubini
<
rubini@gnudd.com
>
parent
09fe3233
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
4 deletions
+9
-4
sim-startup.c
arch-sim/sim-startup.c
+1
-0
unix-startup.c
arch-unix/unix-startup.c
+1
-0
wrc_ptp_ppsi.c
arch-wrpc/wrc_ptp_ppsi.c
+1
-0
wrs-startup.c
arch-wrs/wrs-startup.c
+1
-0
pp-instance.h
include/ppsi/pp-instance.h
+3
-1
bare-startup.c
lib-bare/bare-startup.c
+1
-0
wr-api.h
proto-ext-whiterabbit/wr-api.h
+1
-3
No files found.
arch-sim/sim-startup.c
View file @
314d8605
...
...
@@ -106,6 +106,7 @@ int main(int argc, char **argv)
for
(
i
=
0
;
i
<
ppg
->
max_links
;
i
++
)
{
ppi
=
INST
(
ppg
,
i
);
ppi
->
glbs
=
ppg
;
// must be done before using sim_set_global_DS
ppi
->
vlans_array_len
=
CONFIG_VLAN_ARRAY_SIZE
;
if
(
sim_ppi_init
(
ppi
,
i
))
return
-
1
;
}
...
...
arch-unix/unix-startup.c
View file @
314d8605
...
...
@@ -88,6 +88,7 @@ int main(int argc, char **argv)
NP
(
ppi
)
->
ch
[
PP_NP_GEN
].
fd
=
-
1
;
ppi
->
glbs
=
ppg
;
ppi
->
vlans_array_len
=
CONFIG_VLAN_ARRAY_SIZE
,
ppi
->
iface_name
=
ppi
->
cfg
.
iface_name
;
ppi
->
port_name
=
ppi
->
cfg
.
port_name
;
...
...
arch-wrpc/wrc_ptp_ppsi.c
View file @
314d8605
...
...
@@ -78,6 +78,7 @@ struct pp_instance ppi_static = {
.
portDS
=
&
portDS
,
.
n_ops
=
&
wrpc_net_ops
,
.
t_ops
=
&
wrpc_time_ops
,
.
vlans_array_len
=
CONFIG_VLAN_ARRAY_SIZE
,
.
proto
=
PP_DEFAULT_PROTO
,
.
iface_name
=
"wr1"
,
.
port_name
=
"wr1"
,
...
...
arch-wrs/wrs-startup.c
View file @
314d8605
...
...
@@ -203,6 +203,7 @@ int main(int argc, char **argv)
NP
(
ppi
)
->
ch
[
PP_NP_GEN
].
fd
=
-
1
;
ppi
->
glbs
=
ppg
;
ppi
->
vlans_array_len
=
CONFIG_VLAN_ARRAY_SIZE
;
ppi
->
iface_name
=
ppi
->
cfg
.
iface_name
;
ppi
->
port_name
=
ppi
->
cfg
.
port_name
;
ppi
->
portDS
=
calloc
(
1
,
sizeof
(
*
ppi
->
portDS
));
...
...
include/ppsi/pp-instance.h
View file @
314d8605
...
...
@@ -185,7 +185,9 @@ struct pp_instance {
char
*
iface_name
;
/* for direct actions on hardware */
char
*
port_name
;
/* for diagnostics, mainly */
int
port_idx
;
int
vlans_array_len
;
/* those looking at shared mem must check */
int
vlans
[
CONFIG_VLAN_ARRAY_SIZE
];
int
nvlans
;
/* according to configuration */
struct
pp_instance_cfg
cfg
;
unsigned
long
ptp_tx_count
;
...
...
lib-bare/bare-startup.c
View file @
314d8605
...
...
@@ -41,6 +41,7 @@ static struct pp_instance ppi_static = {
.
t_ops
=
&
bare_time_ops
,
.
iface_name
=
"eth0"
,
.
port_name
=
"eth0"
,
.
vlans_array_len
=
CONFIG_VLAN_ARRAY_SIZE
,
.
proto
=
PP_DEFAULT_PROTO
,
.
__tx_buffer
=
__tx_buffer
,
.
__rx_buffer
=
__rx_buffer
,
...
...
proto-ext-whiterabbit/wr-api.h
View file @
314d8605
...
...
@@ -12,9 +12,7 @@
#include <ppsi/lib.h>
#include "wr-constants.h"
#define WRS_PPSI_SHMEM_VERSION 6
/* added fields n_err_state, n_err_offset,
* n_err_rtt, n_err_deltas to
* wr_servo_state_t */
#define WRS_PPSI_SHMEM_VERSION 7
/* added vlans */
/*
* This structure is used as extension-specific data in the DSPort
...
...
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