pp_close_instance replaced by pp_close_globals

New function receives a struct pp_globals, coherently with pp_open_globals. Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>

pp_close_instance replaced by pp_close_globals
New function receives a struct pp_globals, coherently with pp_open_globals. Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>
f3bc0f5b · Aurelio Colosimo · c9e6a1ce · f3bc0f5b · f3bc0f5b · f3bc0f5b
Commit f3bc0f5b authored Apr 10, 2013 by Aurelio Colosimo
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

wrc_ptp_ppsi.c arch-wrpc/wrc_ptp_ppsi.c +1 -1

ppsi.h include/ppsi/ppsi.h +2 -2

open-close.c proto-standard/open-close.c +2 -2

No files found.
--- a/arch-wrpc/wrc_ptp_ppsi.c
+++ b/arch-wrpc/wrc_ptp_ppsi.c
@@ -164,7 +164,7 @@ int wrc_ptp_stop()
 {
 	ptp_enabled = 0;
 	wr_servo_reset();
-	pp_close_instance(&ppi_static);
+	pp_close_globals(&ppg_static);
 	return 0;
 }

--- a/include/ppsi/ppsi.h
+++ b/include/ppsi/ppsi.h
@@ -97,7 +97,7 @@ extern void pp_prepare_pointers(struct pp_instance *ppi);
 struct pp_ext_hooks {
 	int (*init)(struct pp_instance *ppg, unsigned char *pkt, int plen);
 	int (*open)(struct pp_globals *ppi, struct pp_runtime_opts *rt_opts);
-	int (*close)(struct pp_instance *ppi);
+	int (*close)(struct pp_globals *ppg);
 	int (*listening)(struct pp_instance *ppi, unsigned char *pkt, int plen);
 	int (*master_msg)(struct pp_instance *ppi, unsigned char *pkt,
 			  int plen, int msgtype);
@@ -221,7 +221,7 @@ static inline void pp_timeout_restart_annrec(struct pp_instance *ppi)
 extern int pp_open_globals(struct pp_globals *ppg,
 			    struct pp_runtime_opts *rt_opts);
-extern int pp_close_instance(struct pp_instance *ppi);
+extern int pp_close_globals(struct pp_globals *ppg);
 extern int pp_parse_cmdline(struct pp_instance *ppi, int argc, char **argv);

--- a/proto-standard/open-close.c
+++ b/proto-standard/open-close.c
@@ -70,9 +70,9 @@ int pp_open_globals(struct pp_globals *ppg, struct pp_runtime_opts *rt_opts)
 	return 0;
 }
-int pp_close_instance(struct pp_instance *ppi)
+int pp_close_globals(struct pp_globals *ppg)
 {
 	if (pp_hooks.close)
-		return pp_hooks.close(ppi);
+		return pp_hooks.close(ppg);
 	return 0;
 }