Commit b07673a4 authored by Pietro Fezzardi's avatar Pietro Fezzardi Committed by Alessandro Rubini

arch-sim: refactorized net_ops

parent 7cd3719d
...@@ -124,6 +124,3 @@ static inline int pp_sim_is_slave(struct pp_instance *ppi) ...@@ -124,6 +124,3 @@ static inline int pp_sim_is_slave(struct pp_instance *ppi)
extern int sim_fast_forward_ns(struct pp_globals *ppg, int64_t ff_ns); extern int sim_fast_forward_ns(struct pp_globals *ppg, int64_t ff_ns);
extern int sim_set_global_DS(struct pp_instance *ppi); extern int sim_set_global_DS(struct pp_instance *ppi);
extern void sim_main_loop(struct pp_globals *ppg); extern void sim_main_loop(struct pp_globals *ppg);
extern struct pp_network_operations sim_master_net_ops;
extern struct pp_network_operations sim_slave_net_ops;
...@@ -154,13 +154,12 @@ int main(int argc, char **argv) ...@@ -154,13 +154,12 @@ int main(int argc, char **argv)
ppi->slave_only = 1; ppi->slave_only = 1;
} }
ppi->t_ops = &DEFAULT_TIME_OPS; ppi->t_ops = &DEFAULT_TIME_OPS;
ppi->n_ops = &DEFAULT_NET_OPS;
} }
sim_set_global_DS(ppi_master); sim_set_global_DS(ppi_master);
pp_init_globals(ppg, &sim_master_rt_opts); pp_init_globals(ppg, &sim_master_rt_opts);
ppi_master->n_ops = &sim_master_net_ops;
sim_set_global_DS(ppi_slave); sim_set_global_DS(ppi_slave);
pp_init_globals(ppg, &__pp_default_rt_opts); pp_init_globals(ppg, &__pp_default_rt_opts);
ppi_slave->n_ops = &sim_slave_net_ops;
sim_main_loop(ppg); sim_main_loop(ppg);
return 0; return 0;
......
...@@ -283,15 +283,7 @@ static int sim_net_init(struct pp_instance *ppi) ...@@ -283,15 +283,7 @@ static int sim_net_init(struct pp_instance *ppi)
return 0; return 0;
} }
struct pp_network_operations sim_master_net_ops = { struct pp_network_operations sim_net_ops = {
.init = sim_net_init,
.exit = sim_net_exit,
.recv = sim_net_recv,
.send = sim_net_send,
.check_packet = NULL,
};
struct pp_network_operations sim_slave_net_ops = {
.init = sim_net_init, .init = sim_net_init,
.exit = sim_net_exit, .exit = sim_net_exit,
.recv = sim_net_recv, .recv = sim_net_recv,
......
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