--- a/master/slave_config.c Mon Jun 16 09:30:58 2008 +0000
+++ b/master/slave_config.c Tue Jun 17 09:44:46 2008 +0000
@@ -58,8 +58,7 @@
uint16_t alias, /**< Slave alias. */
uint16_t position, /**< Slave position. */
uint32_t vendor_id, /**< Expected vendor ID. */
- uint32_t product_code, /**< Expected product code. */
- uint32_t revision_number /**< Expected revision number. */
+ uint32_t product_code /**< Expected product code. */
)
{
ec_direction_t dir;
@@ -69,7 +68,6 @@
sc->position = position;
sc->vendor_id = vendor_id;
sc->product_code = product_code;
- sc->revision_number = revision_number;
sc->slave = NULL;
for (dir = EC_DIR_OUTPUT; dir <= EC_DIR_INPUT; dir++)
@@ -188,14 +186,12 @@
return -2;
}
if (slave->sii.vendor_id != sc->vendor_id
- || slave->sii.product_code != sc->product_code
- || slave->sii.revision_number != sc->revision_number) {
- EC_ERR("Slave %u has an invalid type (0x%08X/0x%08X/0x%08X) for"
- " configuration %u:%u (0x%08X/0x%08X/0x%08X).\n",
- slave->ring_position,
- slave->sii.vendor_id, slave->sii.product_code,
- slave->sii.revision_number, sc->alias, sc->position,
- sc->vendor_id, sc->product_code, sc->revision_number);
+ || slave->sii.product_code != sc->product_code) {
+ EC_ERR("Slave %u has an invalid type (0x%08X/0x%08X) for"
+ " configuration %u:%u (0x%08X/0x%08X).\n",
+ slave->ring_position, slave->sii.vendor_id,
+ slave->sii.product_code, sc->alias, sc->position,
+ sc->vendor_id, sc->product_code);
return -3;
}