--- a/master/slave_config.c Mon Dec 29 14:10:27 2008 +0000
+++ b/master/slave_config.c Mon Dec 29 15:19:16 2008 +0000
@@ -91,14 +91,14 @@
for (i = 0; i < EC_MAX_SYNC_MANAGERS; i++)
ec_sync_config_clear(&sc->sync_configs[i]);
- // free all Sdo configurations
+ // free all SDO configurations
list_for_each_entry_safe(req, next_req, &sc->sdo_configs, list) {
list_del(&req->list);
ec_sdo_request_clear(req);
kfree(req);
}
- // free all Sdo requests
+ // free all SDO requests
list_for_each_entry_safe(req, next_req, &sc->sdo_requests, list) {
list_del(&req->list);
ec_sdo_request_clear(req);
@@ -124,7 +124,7 @@
ec_slave_config_t *sc, /**< Slave configuration. */
ec_domain_t *domain, /**< Domain. */
uint8_t sync_index, /**< Sync manager index. */
- ec_direction_t dir /**< Pdo direction. */
+ ec_direction_t dir /**< PDO direction. */
)
{
unsigned int i;
@@ -226,7 +226,7 @@
/*****************************************************************************/
-/** Loads the default Pdo assignment from the slave object.
+/** Loads the default PDO assignment from the slave object.
*/
void ec_slave_config_load_default_sync_config(ec_slave_config_t *sc)
{
@@ -251,7 +251,7 @@
/*****************************************************************************/
-/** Loads the default mapping for a Pdo from the slave object.
+/** Loads the default mapping for a PDO from the slave object.
*/
void ec_slave_config_load_default_mapping(
const ec_slave_config_t *sc,
@@ -266,10 +266,10 @@
return;
if (sc->master->debug_level)
- EC_DBG("Loading default mapping for Pdo 0x%04X in config %u:%u.\n",
+ EC_DBG("Loading default mapping for PDO 0x%04X in config %u:%u.\n",
pdo->index, sc->alias, sc->position);
- // find Pdo in any sync manager (it could be reassigned later)
+ // find PDO in any sync manager (it could be reassigned later)
for (i = 0; i < sc->slave->sii.sync_count; i++) {
sync = &sc->slave->sii.syncs[i];
@@ -279,13 +279,13 @@
if (default_pdo->name) {
if (sc->master->debug_level)
- EC_DBG("Found Pdo name \"%s\".\n", default_pdo->name);
-
- // take Pdo name from assigned one
+ EC_DBG("Found PDO name \"%s\".\n", default_pdo->name);
+
+ // take PDO name from assigned one
ec_pdo_set_name(pdo, default_pdo->name);
}
- // copy entries (= default Pdo mapping)
+ // copy entries (= default PDO mapping)
if (ec_pdo_copy_entries(pdo, default_pdo))
return;
@@ -307,9 +307,9 @@
/*****************************************************************************/
-/** Get the number of Sdo configurations.
- *
- * \return Number of Sdo configurations.
+/** Get the number of SDO configurations.
+ *
+ * \return Number of SDO configurations.
*/
unsigned int ec_slave_config_sdo_count(
const ec_slave_config_t *sc /**< Slave configuration. */
@@ -327,7 +327,7 @@
/*****************************************************************************/
-/** Finds an Sdo configuration via its position in the list.
+/** Finds an SDO configuration via its position in the list.
*
* Const version.
*/
@@ -453,7 +453,7 @@
entry_bit_length) ? 0 : -1;
up(&sc->master->master_sem);
} else {
- EC_ERR("Pdo 0x%04X is not assigned in config %u:%u.\n",
+ EC_ERR("PDO 0x%04X is not assigned in config %u:%u.\n",
pdo_index, sc->alias, sc->position);
}
@@ -482,7 +482,7 @@
ec_pdo_clear_entries(pdo);
up(&sc->master->master_sem);
} else {
- EC_WARN("Pdo 0x%04X is not assigned in config %u:%u.\n",
+ EC_WARN("PDO 0x%04X is not assigned in config %u:%u.\n",
pdo_index, sc->alias, sc->position);
}
}
@@ -584,7 +584,7 @@
if (bit_position) {
*bit_position = bit_pos;
} else if (bit_pos) {
- EC_ERR("Pdo entry 0x%04X:%02X does not byte-align "
+ EC_ERR("PDO entry 0x%04X:%02X does not byte-align "
"in config %u:%u.\n", index, subindex,
sc->alias, sc->position);
return -3;
@@ -601,7 +601,7 @@
}
}
- EC_ERR("Pdo entry 0x%04X:%02X is not mapped in slave config %u:%u.\n",
+ EC_ERR("PDO entry 0x%04X:%02X is not mapped in slave config %u:%u.\n",
index, subindex, sc->alias, sc->position);
return -1;
}
@@ -627,7 +627,7 @@
if (!(req = (ec_sdo_request_t *)
kmalloc(sizeof(ec_sdo_request_t), GFP_KERNEL))) {
- EC_ERR("Failed to allocate memory for Sdo configuration!\n");
+ EC_ERR("Failed to allocate memory for SDO configuration!\n");
return -1;
}
@@ -709,7 +709,7 @@
if (!(req = (ec_sdo_request_t *)
kmalloc(sizeof(ec_sdo_request_t), GFP_KERNEL))) {
- EC_ERR("Failed to allocate Sdo request memory!\n");
+ EC_ERR("Failed to allocate SDO request memory!\n");
return NULL;
}