diff -r 97c248dd1bd3 -r 1d30b96bb04f lib/slave_config.c --- a/lib/slave_config.c Mon May 04 12:13:24 2009 +0000 +++ b/lib/slave_config.c Mon May 04 12:46:30 2009 +0000 @@ -259,32 +259,19 @@ /*****************************************************************************/ -void ecrt_slave_config_dc_sync_cycle_times(ec_slave_config_t *sc, - uint32_t sync0_cycle_time, uint32_t sync1_cycle_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) { ec_ioctl_sc_dc_t data; data.config_index = sc->index; - data.cycle[0] = sync0_cycle_time; - data.cycle[1] = sync1_cycle_time; - - if (ioctl(sc->master->fd, EC_IOCTL_SC_DC_CYCLE, &data) == -1) { - fprintf(stderr, "Failed to set assign_activate word.\n"); - } -} - -/*****************************************************************************/ - -void ecrt_slave_config_dc_sync_shift_times(ec_slave_config_t *sc, - uint32_t sync0_shift_time, uint32_t sync1_shift_time) -{ - ec_ioctl_sc_dc_t data; - - data.config_index = sc->index; - data.shift[0] = sync0_shift_time; - data.shift[1] = sync1_shift_time; - - if (ioctl(sc->master->fd, EC_IOCTL_SC_DC_SHIFT, &data) == -1) { + data.sync[0].cycle_time = sync0_cycle_time; + data.sync[0].shift_time = sync0_shift_time; + data.sync[1].cycle_time = sync1_cycle_time; + data.sync[1].shift_time = sync1_shift_time; + + if (ioctl(sc->master->fd, EC_IOCTL_SC_DC_SYNC, &data) == -1) { fprintf(stderr, "Failed to set assign_activate word.\n"); } }