Commit 521ba963 authored by Pietro Fezzardi's avatar Pietro Fezzardi

general: pp_open_globals renamed to pp_init globals

parent ff6d47bb
...@@ -30,7 +30,7 @@ include time-bare/Makefile ...@@ -30,7 +30,7 @@ include time-bare/Makefile
all: $(TARGET) all: $(TARGET)
# to build the target, we need -lstd again, in case we call functions that # to build the target, we need -lstd again, in case we call functions that
# were not selected yet (e.g., pp_open_globals() ). # were not selected yet (e.g., pp_init_globals() ).
$(TARGET): $(TARGET).o $(TARGET): $(TARGET).o
$(CC) -Wl,-Map,$(TARGET).map2 $(ARCH_LDFLAGS) -o $@ $(TARGET).o $(CC) -Wl,-Map,$(TARGET).map2 $(ARCH_LDFLAGS) -o $@ $(TARGET).o
...@@ -34,7 +34,7 @@ $(LIBARCH): $(OBJ-libarch) ...@@ -34,7 +34,7 @@ $(LIBARCH): $(OBJ-libarch)
all: $(TARGET) all: $(TARGET)
# to build the target, we need -lstd again, in case we call functions that # to build the target, we need -lstd again, in case we call functions that
# were not selected yet (e.g., pp_open_globals() ). # were not selected yet (e.g., pp_init_globals() ).
$(TARGET): $(TARGET).o $(TARGET): $(TARGET).o
$(CC) -Wl,-Map,$(TARGET).map2 $(ARCH_LDFLAGS) -o $@ $(TARGET).o $(CC) -Wl,-Map,$(TARGET).map2 $(ARCH_LDFLAGS) -o $@ $(TARGET).o
...@@ -27,7 +27,7 @@ CFLAGS += -Itime-unix ...@@ -27,7 +27,7 @@ CFLAGS += -Itime-unix
all: $(TARGET) all: $(TARGET)
# to build the target, we need -lstd again, in case we call functions that # to build the target, we need -lstd again, in case we call functions that
# were not selected yet (e.g., pp_open_globals() ). # were not selected yet (e.g., pp_init_globals() ).
$(TARGET): $(TARGET).o $(TARGET): $(TARGET).o
$(CC) -Wl,-Map,$(TARGET).map2 -o $@ $(TARGET).o -lrt $(CC) -Wl,-Map,$(TARGET).map2 -o $@ $(TARGET).o -lrt
...@@ -101,7 +101,7 @@ int main(int argc, char **argv) ...@@ -101,7 +101,7 @@ int main(int argc, char **argv)
exit(__LINE__); exit(__LINE__);
} }
pp_open_globals(ppg, &__pp_default_rt_opts); pp_init_globals(ppg, &__pp_default_rt_opts);
unix_main_loop(ppg); unix_main_loop(ppg);
return 0; /* never reached */ return 0; /* never reached */
......
...@@ -181,7 +181,7 @@ int wrc_ptp_start() ...@@ -181,7 +181,7 @@ int wrc_ptp_start()
{ {
struct pp_instance *ppi = &ppi_static; struct pp_instance *ppi = &ppi_static;
pp_open_globals(&ppg_static, &__pp_default_rt_opts); pp_init_globals(&ppg_static, &__pp_default_rt_opts);
/* Call the state machine. Being it in "Initializing" state, make /* Call the state machine. Being it in "Initializing" state, make
* ppsi initialize what is necessary */ * ppsi initialize what is necessary */
......
...@@ -38,7 +38,7 @@ OBJ-y += $(MINIPC_LIB) ...@@ -38,7 +38,7 @@ OBJ-y += $(MINIPC_LIB)
all: $(TARGET) all: $(TARGET)
# to build the target, we need -lstd again, in case we call functions that # to build the target, we need -lstd again, in case we call functions that
# were not selected yet (e.g., pp_open_globals() ). # were not selected yet (e.g., pp_init_globals() ).
$(TARGET): $(TARGET).o $(TARGET): $(TARGET).o
$(CC) -Wl,-Map,$(TARGET).map2 -o $@ $(TARGET).o -lrt $(CC) -Wl,-Map,$(TARGET).map2 -o $@ $(TARGET).o -lrt
...@@ -165,7 +165,7 @@ int main(int argc, char **argv) ...@@ -165,7 +165,7 @@ int main(int argc, char **argv)
} }
pp_open_globals(ppg, &__pp_default_rt_opts); pp_init_globals(ppg, &__pp_default_rt_opts);
wrs_main_loop(ppg); wrs_main_loop(ppg);
return 0; /* never reached */ return 0; /* never reached */
......
...@@ -251,7 +251,7 @@ static inline void pp_timeout_restart_annrec(struct pp_instance *ppi) ...@@ -251,7 +251,7 @@ static inline void pp_timeout_restart_annrec(struct pp_instance *ppi)
/* The channel for an instance must be created and possibly destroyed. */ /* The channel for an instance must be created and possibly destroyed. */
extern int pp_open_globals(struct pp_globals *ppg, struct pp_runtime_opts *opts); extern int pp_init_globals(struct pp_globals *ppg, struct pp_runtime_opts *opts);
extern int pp_close_globals(struct pp_globals *ppg); extern int pp_close_globals(struct pp_globals *ppg);
extern int pp_parse_cmdline(struct pp_globals *ppg, int argc, char **argv); extern int pp_parse_cmdline(struct pp_globals *ppg, int argc, char **argv);
......
...@@ -71,7 +71,7 @@ int ppsi_main(int argc, char **argv) ...@@ -71,7 +71,7 @@ int ppsi_main(int argc, char **argv)
return -1; return -1;
/* This just allocates the stuff */ /* This just allocates the stuff */
pp_open_globals(ppg, &__pp_default_rt_opts); pp_init_globals(ppg, &__pp_default_rt_opts);
/* The actual sockets are opened in state-initializing */ /* The actual sockets are opened in state-initializing */
bare_main_loop(ppi); bare_main_loop(ppi);
......
...@@ -40,7 +40,7 @@ struct pp_runtime_opts __pp_default_rt_opts = { ...@@ -40,7 +40,7 @@ struct pp_runtime_opts __pp_default_rt_opts = {
* state machine to the first state. * state machine to the first state.
*/ */
int pp_open_globals(struct pp_globals *ppg, struct pp_runtime_opts *pp_rt_opts) int pp_init_globals(struct pp_globals *ppg, struct pp_runtime_opts *pp_rt_opts)
{ {
/* /*
* Initialize default data set * Initialize default data set
......
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