equal
deleted
inserted
replaced
419 up(&master->device_sem); |
419 up(&master->device_sem); |
420 } |
420 } |
421 |
421 |
422 /*****************************************************************************/ |
422 /*****************************************************************************/ |
423 |
423 |
424 /** Opens the network device and makes the master enter IDLE mode. |
424 /** Opens the network device and makes the master enter IDLE phase. |
425 * |
425 * |
426 * \return 0 on success, else < 0 |
426 * \return 0 on success, else < 0 |
427 * \ingroup DeviceInterface |
427 * \ingroup DeviceInterface |
428 */ |
428 */ |
429 int ecdev_open(ec_device_t *device /**< EtherCAT device */) |
429 int ecdev_open(ec_device_t *device /**< EtherCAT device */) |
431 if (ec_device_open(device)) { |
431 if (ec_device_open(device)) { |
432 EC_ERR("Failed to open device!\n"); |
432 EC_ERR("Failed to open device!\n"); |
433 return -1; |
433 return -1; |
434 } |
434 } |
435 |
435 |
436 if (ec_master_enter_idle_mode(device->master)) { |
436 if (ec_master_enter_idle_phase(device->master)) { |
437 EC_ERR("Failed to enter idle mode!\n"); |
437 EC_ERR("Failed to enter IDLE phase!\n"); |
438 return -1; |
438 return -1; |
439 } |
439 } |
440 |
440 |
441 return 0; |
441 return 0; |
442 } |
442 } |
443 |
443 |
444 /*****************************************************************************/ |
444 /*****************************************************************************/ |
445 |
445 |
446 /** Makes the master leave IDLE mode and closes the network device. |
446 /** Makes the master leave IDLE phase and closes the network device. |
447 * |
447 * |
448 * \return 0 on success, else < 0 |
448 * \return 0 on success, else < 0 |
449 * \ingroup DeviceInterface |
449 * \ingroup DeviceInterface |
450 */ |
450 */ |
451 void ecdev_close(ec_device_t *device /**< EtherCAT device */) |
451 void ecdev_close(ec_device_t *device /**< EtherCAT device */) |
452 { |
452 { |
453 ec_master_leave_idle_mode(device->master); |
453 ec_master_leave_idle_phase(device->master); |
454 |
454 |
455 if (ec_device_close(device)) |
455 if (ec_device_close(device)) |
456 EC_WARN("Failed to close device!\n"); |
456 EC_WARN("Failed to close device!\n"); |
457 } |
457 } |
458 |
458 |