general: network operations are now per-instance

This commit moves the network operations inside the instance. It allows to have different operations for each instance, which will be useful in the future. For example, one ethernet card may have hardware timestamping and another may not. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

general: network operations are now per-instance
This commit moves the network operations inside the instance. It allows to have different operations for each instance, which will be useful in the future. For example, one ethernet card may have hardware timestamping and another may not. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
82de2e3a · Alessandro Rubini · 4220b51a · 82de2e3a · 82de2e3a · 82de2e3a
Commit 82de2e3a authored Mar 04, 2013 by Alessandro Rubini
12 changed files
--- a/arch-gnu-linux/main-loop.c
+++ b/arch-gnu-linux/main-loop.c
@@ -50,7 +50,7 @@ void posix_main_loop(struct pp_instance *ppi)
 		 * We got a packet. If it's not ours, continue consuming
 		 * the pending timeout
 		 */
-		i = pp_net_ops.recv(ppi, payload, sizeof(packet) - 16,
+		i = ppi->n_ops->recv(ppi, payload, sizeof(packet) - 16,
 				      &ppi->last_rcv_time);
 		ppi->last_rcv_time.seconds += DSPRO(ppi)->currentUtcOffset;

--- a/arch-gnu-linux/posix-socket.c
+++ b/arch-gnu-linux/posix-socket.c
@@ -475,7 +475,7 @@ int posix_net_check_pkt(struct pp_instance *ppi, int delay_ms)
 	return ret;
 }
-struct pp_network_operations pp_net_ops = {
+struct pp_network_operations posix_net_ops = {
 	.init = posix_net_init,
 	.exit = posix_net_exit,
 	.recv = posix_net_recv,

--- a/arch-gnu-linux/posix-startup.c
+++ b/arch-gnu-linux/posix-startup.c
@@ -46,6 +46,8 @@ int main(int argc, char **argv)
 	ppi->frgn_master = calloc(1, sizeof(*ppi->frgn_master));
 	ppi->arch_data = calloc(1, sizeof(struct posix_arch_data));
+	ppi->n_ops = &posix_net_ops;
 	if ((!ppi->defaultDS) || (!ppi->currentDS) || (!ppi->parentDS)
 	    || (!ppi->portDS) || (!ppi->timePropertiesDS)
 	    || (!ppi->net_path) || (!ppi->frgn_master) || (!ppi->arch_data)

--- a/arch-gnu-linux/posix.h
+++ b/arch-gnu-linux/posix.h
@@ -15,3 +15,5 @@ struct posix_arch_data {
 extern int posix_net_check_pkt(struct pp_instance *ppi, int delay_ms);
 extern void posix_main_loop(struct pp_instance *ppi);
+extern struct pp_network_operations posix_net_ops;
--- a/arch-wrpc/wrpc-socket.c
+++ b/arch-wrpc/wrpc-socket.c
@@ -122,7 +122,7 @@ static int wrpc_net_exit(struct pp_instance *ppi)
 	return 0;
 }
-struct pp_network_operations pp_net_ops = {
+struct pp_network_operations wrpc_net_ops = {
 	.init = wrpc_net_init,
 	.exit = wrpc_net_exit,
 	.recv = wrpc_net_recv,

--- a/include/ppsi/ppsi.h
+++ b/include/ppsi/ppsi.h
@@ -149,6 +149,9 @@ struct pp_instance {
 	struct pp_servo *servo;
 	unsigned long flags;		/* ppi-specific flags (diag mainly) */
+	/* Operations that may be different in each instance */
+	struct pp_network_operations *n_ops;
 	/* Data sets */
 	DSDefault *defaultDS;			/* page 65 */
 	DSCurrent *currentDS;			/* page 67 */
@@ -277,8 +280,6 @@ struct pp_network_operations {
 		    TimeInternal *t, int chtype, int use_pdelay_addr);
 };
-extern struct pp_network_operations pp_net_ops;
 /*
 * Time operations, like network operations above, are encapsulated.

--- a/lib-bare/bare-linux.h
+++ b/lib-bare/bare-linux.h
@@ -8,6 +8,8 @@
 extern void bare_main_loop(struct pp_instance *ppi);
+extern struct pp_network_operations bare_net_ops;
 /* syscalls */
 struct bare_sockaddr;

--- a/lib-bare/bare-socket.c
+++ b/lib-bare/bare-socket.c
@@ -146,7 +146,7 @@ static int bare_net_exit(struct pp_instance *ppi)
 	return sys_shutdown(NP(ppi)->ch[PP_NP_GEN].fd, SHUT_RDWR);
 }
-struct pp_network_operations pp_net_ops = {
+struct pp_network_operations bare_net_ops = {
 	.init = bare_net_init,
 	.exit = bare_net_exit,
 	.recv = bare_net_recv,

--- a/lib-bare/bare-startup.c
+++ b/lib-bare/bare-startup.c
@@ -48,6 +48,7 @@ int ppsi_main(int argc, char **argv)
 	ppi->servo       = &servo;
 	ppi->frgn_master = &frgn_master;
 	ppi->arch_data   = NULL;
+	ppi->n_ops       = &bare_net_ops;
 	/* This just llocates the stuff */
 	pp_open_instance(ppi, NULL);

--- a/lib-bare/main-loop.c
+++ b/lib-bare/main-loop.c
@@ -66,7 +66,7 @@ void bare_main_loop(struct pp_instance *ppi)
 		 *
 		 * FIXME: we don't know which socket to receive from
 		 */
-		i = pp_net_ops.recv(ppi, payload, sizeof(packet) - 16,
+		i = ppi->n_ops->recv(ppi, payload, sizeof(packet) - 16,
 				    &ppi->last_rcv_time);
 		ppi->last_rcv_time.seconds += DSPRO(ppi)->currentUtcOffset;

--- a/proto-standard/common-fun.h
+++ b/proto-standard/common-fun.h
@@ -40,7 +40,7 @@ int st_com_slave_handle_followup(struct pp_instance *ppi, unsigned char *buf,
 static inline int __send_and_log(struct pp_instance *ppi, int msglen,
 				 int msgtype, int chtype)
 {
-	if (pp_net_ops.send(ppi, ppi->buf_out, msglen,
+	if (ppi->n_ops->send(ppi, ppi->buf_out, msglen,
 			    &ppi->last_snt_time, chtype, 0) < msglen) {
 		if (pp_verbose_frames)
 			PP_PRINTF("%s(%d) Message can't be sent\n",

--- a/proto-standard/state-initializing.c
+++ b/proto-standard/state-initializing.c
@@ -19,9 +19,9 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	int ret = 0;
 	if (NP(ppi)->inited)
-		pp_net_ops.exit(ppi);
+		ppi->n_ops->exit(ppi);
-	if (pp_net_ops.init(ppi) < 0)
+	if (ppi->n_ops->init(ppi) < 0)
 		goto failure;
 	NP(ppi)->inited = 1;