equal
deleted
inserted
replaced
1313 return -1; |
1313 return -1; |
1314 } |
1314 } |
1315 domain_offset += domain->data_size; |
1315 domain_offset += domain->data_size; |
1316 } |
1316 } |
1317 |
1317 |
1318 master->allow_config = 1; // request the current configuration |
|
1319 master->allow_scan = 1; // allow re-scanning on topology change |
|
1320 |
|
1321 // restart EoE process and master thread with new locking |
1318 // restart EoE process and master thread with new locking |
1322 #ifdef EC_EOE |
1319 #ifdef EC_EOE |
1323 ec_master_eoe_stop(master); |
1320 ec_master_eoe_stop(master); |
1324 #endif |
1321 #endif |
1325 ec_master_thread_stop(master); |
1322 ec_master_thread_stop(master); |
1335 |
1332 |
1336 if (ec_master_thread_start(master, ec_master_operation_thread)) { |
1333 if (ec_master_thread_start(master, ec_master_operation_thread)) { |
1337 EC_ERR("Failed to start master thread!\n"); |
1334 EC_ERR("Failed to start master thread!\n"); |
1338 return -1; |
1335 return -1; |
1339 } |
1336 } |
1340 |
|
1341 #ifdef EC_EOE |
1337 #ifdef EC_EOE |
1342 ec_master_eoe_start(master); |
1338 ec_master_eoe_start(master); |
1343 #endif |
1339 #endif |
|
1340 |
|
1341 master->allow_config = 1; // request the current configuration |
|
1342 master->allow_scan = 1; // allow re-scanning on topology change |
1344 return 0; |
1343 return 0; |
1345 } |
1344 } |
1346 |
1345 |
1347 /*****************************************************************************/ |
1346 /*****************************************************************************/ |
1348 |
1347 |