diff -r 399ef727bf62 -r e206f4485f60 master/cdev.c --- a/master/cdev.c Mon Dec 29 14:10:27 2008 +0000 +++ b/master/cdev.c Mon Dec 29 15:19:16 2008 +0000 @@ -268,7 +268,7 @@ /*****************************************************************************/ -/** Get slave sync manager Pdo information. +/** Get slave sync manager PDO information. */ int ec_cdev_ioctl_slave_sync_pdo( ec_master_t *master, /**< EtherCAT master. */ @@ -305,7 +305,7 @@ if (!(pdo = ec_pdo_list_find_pdo_by_pos_const( &sync->pdos, data.pdo_pos))) { up(&master->master_sem); - EC_ERR("Sync manager %u does not contain a Pdo with " + EC_ERR("Sync manager %u does not contain a PDO with " "position %u in slave %u!\n", data.sync_index, data.pdo_pos, data.slave_position); return -EINVAL; @@ -325,7 +325,7 @@ /*****************************************************************************/ -/** Get slave sync manager Pdo entry information. +/** Get slave sync manager PDO entry information. */ int ec_cdev_ioctl_slave_sync_pdo_entry( ec_master_t *master, /**< EtherCAT master. */ @@ -363,7 +363,7 @@ if (!(pdo = ec_pdo_list_find_pdo_by_pos_const( &sync->pdos, data.pdo_pos))) { up(&master->master_sem); - EC_ERR("Sync manager %u does not contain a Pdo with " + EC_ERR("Sync manager %u does not contain a PDO with " "position %u in slave %u!\n", data.sync_index, data.pdo_pos, data.slave_position); return -EINVAL; @@ -372,7 +372,7 @@ if (!(entry = ec_pdo_find_entry_by_pos_const( pdo, data.entry_pos))) { up(&master->master_sem); - EC_ERR("Pdo 0x%04X does not contain an entry with " + EC_ERR("PDO 0x%04X does not contain an entry with " "position %u in slave %u!\n", data.pdo_pos, data.entry_pos, data.slave_position); return -EINVAL; @@ -569,7 +569,7 @@ /*****************************************************************************/ -/** Get slave Sdo information. +/** Get slave SDO information. */ int ec_cdev_ioctl_slave_sdo( ec_master_t *master, /**< EtherCAT master. */ @@ -597,7 +597,7 @@ if (!(sdo = ec_slave_get_sdo_by_pos_const( slave, data.sdo_position))) { up(&master->master_sem); - EC_ERR("Sdo %u does not exist in slave %u!\n", + EC_ERR("SDO %u does not exist in slave %u!\n", data.sdo_position, data.slave_position); return -EINVAL; } @@ -616,7 +616,7 @@ /*****************************************************************************/ -/** Get slave Sdo entry information. +/** Get slave SDO entry information. */ int ec_cdev_ioctl_slave_sdo_entry( ec_master_t *master, /**< EtherCAT master. */ @@ -646,7 +646,7 @@ if (!(sdo = ec_slave_get_sdo_by_pos_const( slave, -data.sdo_spec))) { up(&master->master_sem); - EC_ERR("Sdo %u does not exist in slave %u!\n", + EC_ERR("SDO %u does not exist in slave %u!\n", -data.sdo_spec, data.slave_position); return -EINVAL; } @@ -654,7 +654,7 @@ if (!(sdo = ec_slave_get_sdo_const( slave, data.sdo_spec))) { up(&master->master_sem); - EC_ERR("Sdo 0x%04X does not exist in slave %u!\n", + EC_ERR("SDO 0x%04X does not exist in slave %u!\n", data.sdo_spec, data.slave_position); return -EINVAL; } @@ -663,7 +663,7 @@ if (!(entry = ec_sdo_get_entry_const( sdo, data.sdo_entry_subindex))) { up(&master->master_sem); - EC_ERR("Sdo entry 0x%04X:%02X does not exist " + EC_ERR("SDO entry 0x%04X:%02X does not exist " "in slave %u!\n", sdo->index, data.sdo_entry_subindex, data.slave_position); return -EINVAL; @@ -683,7 +683,7 @@ /*****************************************************************************/ -/** Upload Sdo. +/** Upload SDO. */ int ec_cdev_ioctl_slave_sdo_upload( ec_master_t *master, /**< EtherCAT master. */ @@ -768,7 +768,7 @@ /*****************************************************************************/ -/** Download Sdo. +/** Download SDO. */ int ec_cdev_ioctl_slave_sdo_download( ec_master_t *master, /**< EtherCAT master. */ @@ -1028,7 +1028,7 @@ /*****************************************************************************/ -/** Get slave configuration Pdo information. +/** Get slave configuration PDO information. */ int ec_cdev_ioctl_config_pdo( ec_master_t *master, /**< EtherCAT master. */ @@ -1064,7 +1064,7 @@ &sc->sync_configs[data.sync_index].pdos, data.pdo_pos))) { up(&master->master_sem); - EC_ERR("Invalid Pdo position!\n"); + EC_ERR("Invalid PDO position!\n"); return -EINVAL; } @@ -1082,7 +1082,7 @@ /*****************************************************************************/ -/** Get slave configuration Pdo entry information. +/** Get slave configuration PDO entry information. */ int ec_cdev_ioctl_config_pdo_entry( ec_master_t *master, /**< EtherCAT master. */ @@ -1119,7 +1119,7 @@ &sc->sync_configs[data.sync_index].pdos, data.pdo_pos))) { up(&master->master_sem); - EC_ERR("Invalid Pdo position!\n"); + EC_ERR("Invalid PDO position!\n"); return -EINVAL; } @@ -1145,7 +1145,7 @@ /*****************************************************************************/ -/** Get slave configuration Sdo information. +/** Get slave configuration SDO information. */ int ec_cdev_ioctl_config_sdo( ec_master_t *master, /**< EtherCAT master. */ @@ -1174,7 +1174,7 @@ if (!(req = ec_slave_config_get_sdo_by_pos_const( sc, data.sdo_pos))) { up(&master->master_sem); - EC_ERR("Invalid Sdo position!\n"); + EC_ERR("Invalid SDO position!\n"); return -EINVAL; }