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
50
Issues
50
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
a52040a9
Commit
a52040a9
authored
Mar 18, 2013
by
Aurelio Colosimo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
servo moved to struct pp_globals
Signed-off-by:
Aurelio Colosimo
<
aurelio@aureliocolosimo.it
>
parent
16707d53
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
posix-startup.c
arch-gnu-linux/posix-startup.c
+1
-1
pp-instance.h
include/ppsi/pp-instance.h
+2
-1
ppsi.h
include/ppsi/ppsi.h
+1
-1
bare-startup.c
lib-bare/bare-startup.c
+1
-1
No files found.
arch-gnu-linux/posix-startup.c
View file @
a52040a9
...
...
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
ppi
->
parentDS
=
calloc
(
1
,
sizeof
(
*
ppi
->
parentDS
));
ppi
->
portDS
=
calloc
(
1
,
sizeof
(
*
ppi
->
portDS
));
ppi
->
timePropertiesDS
=
calloc
(
1
,
sizeof
(
*
ppi
->
timePropertiesDS
));
ppi
->
servo
=
calloc
(
1
,
sizeof
(
*
ppi
->
servo
));
GLBS
(
ppi
)
->
servo
=
calloc
(
1
,
sizeof
(
*
GLBS
(
ppi
)
->
servo
));
ppi
->
arch_data
=
calloc
(
1
,
sizeof
(
struct
posix_arch_data
));
ppi
->
n_ops
=
&
posix_net_ops
;
...
...
include/ppsi/pp-instance.h
View file @
a52040a9
...
...
@@ -134,7 +134,6 @@ struct pp_instance {
void
*
arch_data
;
/* if arch needs it */
void
*
ext_data
;
/* if protocol ext needs it */
struct
pp_runtime_opts
*
rt_opts
;
struct
pp_servo
*
servo
;
unsigned
long
flags
;
/* ppi-specific flags (diag mainly) */
/* Pointer to global instance owning this pp_instance*/
...
...
@@ -190,6 +189,8 @@ struct pp_globals {
Integer16
frgn_rec_i
;
Integer16
frgn_rec_best
;
struct
pp_frgn_master
frgn_master
[
PP_NR_FOREIGN_RECORDS
];
struct
pp_servo
*
servo
;
/* FIXME Here include all is common to many interfaces */
};
...
...
include/ppsi/ppsi.h
View file @
a52040a9
...
...
@@ -68,7 +68,7 @@ static inline struct pp_net_path *NP(struct pp_instance *ppi)
static
inline
struct
pp_servo
*
SRV
(
struct
pp_instance
*
ppi
)
{
return
ppi
->
servo
;
return
GLBS
(
ppi
)
->
servo
;
}
...
...
lib-bare/bare-startup.c
View file @
a52040a9
...
...
@@ -44,7 +44,7 @@ int ppsi_main(int argc, char **argv)
ppi
->
parentDS
=
&
parentDS
;
ppi
->
portDS
=
&
portDS
;
ppi
->
timePropertiesDS
=
&
timePropertiesDS
;
ppi
->
servo
=
&
servo
;
GLBS
(
ppi
)
->
servo
=
&
servo
;
ppi
->
arch_data
=
NULL
;
ppi
->
n_ops
=
&
bare_net_ops
;
ppi
->
t_ops
=
&
bare_time_ops
;
...
...
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