master/slave_config.c
branchstable-1.5
changeset 2449 5db725cc40f9
parent 2443 2c3ccdde3919
child 2459 8c7e674aa5d6
--- a/master/slave_config.c	Tue Nov 20 14:53:36 2012 +0100
+++ b/master/slave_config.c	Thu Nov 29 10:15:40 2012 +0100
@@ -79,10 +79,10 @@
 
     sc->used_fmmus = 0;
     sc->dc_assign_activate = 0x0000;
-    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;
+    sc->dc_sync[0].cycle_time = 0U;
+    sc->dc_sync[1].cycle_time = 0;
+    sc->dc_sync[0].shift_time = 0U;
+    sc->dc_sync[1].shift_time = 0;
 
     INIT_LIST_HEAD(&sc->sdo_configs);
     INIT_LIST_HEAD(&sc->sdo_requests);
@@ -771,12 +771,12 @@
 /*****************************************************************************/
 
 void ecrt_slave_config_dc(ec_slave_config_t *sc, uint16_t assign_activate,
-        uint32_t sync0_cycle_time, uint32_t sync0_shift_time,
-        uint32_t sync1_cycle_time, uint32_t sync1_shift_time)
+        uint32_t sync0_cycle_time, int32_t sync0_shift_time,
+        uint32_t sync1_cycle_time, int32_t sync1_shift_time)
 {
     EC_CONFIG_DBG(sc, 1, "%s(sc = 0x%p, assign_activate = 0x%04X,"
-            " sync0_cycle = %u, sync0_shift = %u,"
-            " sync1_cycle = %u, sync1_shift = %u\n",
+            " sync0_cycle = %u, sync0_shift = %i,"
+            " sync1_cycle = %u, sync1_shift = %i\n",
             __func__, sc, assign_activate, sync0_cycle_time, sync0_shift_time,
             sync1_cycle_time, sync1_shift_time);