diff -r 97c248dd1bd3 -r 1d30b96bb04f master/slave_config.c --- a/master/slave_config.c Mon May 04 12:13:24 2009 +0000 +++ b/master/slave_config.c Mon May 04 12:46:30 2009 +0000 @@ -75,10 +75,10 @@ sc->used_fmmus = 0; sc->dc_assign_activate = 0x0000; - sc->dc_sync_cycle_times[0] = 0x00000000; - sc->dc_sync_cycle_times[1] = 0x00000000; - sc->dc_sync_shift_times[0] = 0x00000000; - sc->dc_sync_shift_times[1] = 0x00000000; + sc->dc_sync[0].cycle_time = 0x00000000; + sc->dc_sync[1].cycle_time = 0x00000000; + sc->dc_sync[0].shift_time = 0x00000000; + sc->dc_sync[1].shift_time = 0x00000000; INIT_LIST_HEAD(&sc->sdo_configs); INIT_LIST_HEAD(&sc->sdo_requests); @@ -683,20 +683,14 @@ /*****************************************************************************/ -void ecrt_slave_config_dc_sync_cycle_times(ec_slave_config_t *sc, - uint32_t sync0_cycle_time, uint32_t sync1_cycle_time) -{ - sc->dc_sync_cycle_times[0] = sync0_cycle_time; - sc->dc_sync_cycle_times[1] = sync1_cycle_time; -} - -/*****************************************************************************/ - -void ecrt_slave_config_dc_sync_shift_times(ec_slave_config_t *sc, - uint32_t sync0_shift_time, uint32_t sync1_shift_time) -{ - sc->dc_sync_shift_times[0] = sync0_shift_time; - sc->dc_sync_shift_times[1] = sync1_shift_time; +void ecrt_slave_config_dc_sync_signals(ec_slave_config_t *sc, + uint32_t sync0_cycle_time, uint32_t sync0_shift_time, + uint32_t sync1_cycle_time, uint32_t sync1_shift_time) +{ + sc->dc_sync[0].cycle_time = sync0_cycle_time; + sc->dc_sync[0].shift_time = sync0_shift_time; + sc->dc_sync[1].cycle_time = sync1_cycle_time; + sc->dc_sync[1].shift_time = sync1_shift_time; } /*****************************************************************************/ @@ -914,8 +908,7 @@ EXPORT_SYMBOL(ecrt_slave_config_pdos); EXPORT_SYMBOL(ecrt_slave_config_reg_pdo_entry); EXPORT_SYMBOL(ecrt_slave_config_dc_assign_activate); -EXPORT_SYMBOL(ecrt_slave_config_dc_sync_cycle_times); -EXPORT_SYMBOL(ecrt_slave_config_dc_sync_shift_times); +EXPORT_SYMBOL(ecrt_slave_config_dc_sync_signals); EXPORT_SYMBOL(ecrt_slave_config_sdo); EXPORT_SYMBOL(ecrt_slave_config_sdo8); EXPORT_SYMBOL(ecrt_slave_config_sdo16);