--- a/master/cdev.c	Tue May 05 10:01:55 2009 +0000
+++ b/master/cdev.c	Tue May 05 15:03:59 2009 +0000
@@ -1905,9 +1905,9 @@
 
 /*****************************************************************************/
 
-/** Sets the DC AssignActivate word.
- */
-int ec_cdev_ioctl_sc_dc_assign(
+/** Sets the DC AssignActivate word and the sync signal times.
+ */
+int ec_cdev_ioctl_sc_dc(
         ec_master_t *master, /**< EtherCAT master. */
         unsigned long arg, /**< ioctl() argument. */
         ec_cdev_priv_t *priv /**< Private data structure of file handle. */
@@ -1930,41 +1930,7 @@
         return -ENOENT;
     }
 
-    ecrt_slave_config_dc_assign_activate(sc, data.assign_activate);
-
-    up(&master->master_sem);
-
-    return 0;
-}
-
-/*****************************************************************************/
-
-/** Sets the DC cycle times.
- */
-int ec_cdev_ioctl_sc_dc_sync_signals(
-        ec_master_t *master, /**< EtherCAT master. */
-        unsigned long arg, /**< ioctl() argument. */
-        ec_cdev_priv_t *priv /**< Private data structure of file handle. */
-        )
-{
-    ec_ioctl_sc_dc_t data;
-    ec_slave_config_t *sc;
-
-	if (unlikely(!priv->requested))
-        return -EPERM;
-
-    if (copy_from_user(&data, (void __user *) arg, sizeof(data)))
-        return -EFAULT;
-
-    if (down_interruptible(&master->master_sem))
-        return -EINTR;
-
-    if (!(sc = ec_master_get_config(master, data.config_index))) {
-        up(&master->master_sem);
-        return -ENOENT;
-    }
-
-    ecrt_slave_config_dc_sync_signals(sc,
+    ecrt_slave_config_dc(sc, data.assign_activate,
             data.sync[0].cycle_time,
             data.sync[0].shift_time,
             data.sync[1].cycle_time,
@@ -3196,14 +3162,10 @@
             if (!(filp->f_mode & FMODE_WRITE))
 				return -EPERM;
 			return ec_cdev_ioctl_sc_reg_pdo_entry(master, arg, priv);
-        case EC_IOCTL_SC_DC_ASSIGN:
+        case EC_IOCTL_SC_DC:
             if (!(filp->f_mode & FMODE_WRITE))
 				return -EPERM;
-			return ec_cdev_ioctl_sc_dc_assign(master, arg, priv);
-        case EC_IOCTL_SC_DC_SYNC:
-            if (!(filp->f_mode & FMODE_WRITE))
-				return -EPERM;
-			return ec_cdev_ioctl_sc_dc_sync_signals(master, arg, priv);
+			return ec_cdev_ioctl_sc_dc(master, arg, priv);
         case EC_IOCTL_SC_SDO:
             if (!(filp->f_mode & FMODE_WRITE))
 				return -EPERM;