more accssory card renamingHEADmaster

4 files changed, 20 insertions, 20 deletions

diff --git a/io-module/mtdc_gpiob.c b/io-module/mtdc_gpiob.c
index c207483..7cd38a8 100644
--- a/io-module/mtdc_gpiob.c
+++ b/io-module/mtdc_gpiob.c
@@ -10,7 +10,7 @@ struct gpio_pin *dc_gpio_pin_by_attr_name(const char *name) {
 	} else if (!strcmp(name, "dout-enable")) {
 		pin_attr_name = "dc-gpio3";
 	} else {
-		log_error("daughter card attribute %s not available", name);
+		log_error("accessory card attribute %s not available", name);
 		return NULL;
 	}
 
diff --git a/io-module/mtr2.c b/io-module/mtr2.c
index 2efc85d..6807088 100644
--- a/io-module/mtr2.c
+++ b/io-module/mtr2.c
@@ -440,7 +440,7 @@ static struct attribute *mtr2_platform_attributes[] = {
 
 	&dev_attr_board_temperature.attr,
 
-	/* extra space for the daughter card attributes */
+	/* extra space for the accessory card attributes */
 	NULL,	    // index 34
 	NULL,	    // index 35
 	NULL,	    // index 36
@@ -462,7 +462,7 @@ static struct attribute *mtr2_platform_attributes[] = {
 	NULL,
 };
 
-static struct attribute *mtr2_daughter_card_attributes[] = {
+static struct attribute *mtr2_accessory_card_attributes[] = {
 	&dev_attr_dc_din0.attr,
 	&dev_attr_dc_din1.attr,
 	&dev_attr_dc_din2.attr,
@@ -484,13 +484,13 @@ static struct attribute *mtr2_daughter_card_attributes[] = {
 	NULL,
 };
 
-static bool mtr2_add_daughter_card_attributes(void)
+static bool mtr2_add_accessory_card_attributes(void)
 {
 	size_t platform_attrs_size = sizeof(mtr2_platform_attributes) / sizeof(struct attribute *);
-	size_t daughter_card_attrs_size = sizeof(mtr2_daughter_card_attributes) / sizeof(struct attribute *);
+	size_t accessory_card_attrs_size = sizeof(mtr2_accessory_card_attributes) / sizeof(struct attribute *);
 	size_t platform_attrs_index;
-	size_t daughter_card_attrs_index;
-	size_t copy_length = daughter_card_attrs_size - 1; /* don't need to copy the NULL at the end */
+	size_t accessory_card_attrs_index;
+	size_t copy_length = accessory_card_attrs_size - 1; /* don't need to copy the NULL at the end */
 
 	for (platform_attrs_index = 0; platform_attrs_index < platform_attrs_size; platform_attrs_index++) {
 		if (! mtr2_platform_attributes[platform_attrs_index]) {
@@ -498,13 +498,13 @@ static bool mtr2_add_daughter_card_attributes(void)
 		}
 	}
 
-	if (platform_attrs_size < platform_attrs_index + daughter_card_attrs_size) {
-		log_error("not enough room for MTR2 daughter card attributes!");
+	if (platform_attrs_size < platform_attrs_index + accessory_card_attrs_size) {
+		log_error("not enough room for MTR2 accessory card attributes!");
 		return false;
 	}
 
-	for (daughter_card_attrs_index = 0; daughter_card_attrs_index < copy_length; daughter_card_attrs_index++, platform_attrs_index++) {
-		mtr2_platform_attributes[platform_attrs_index] = mtr2_daughter_card_attributes[daughter_card_attrs_index];
+	for (accessory_card_attrs_index = 0; accessory_card_attrs_index < copy_length; accessory_card_attrs_index++, platform_attrs_index++) {
+		mtr2_platform_attributes[platform_attrs_index] = mtr2_accessory_card_attributes[accessory_card_attrs_index];
 	}
 
 	return true;
diff --git a/io-module/mts_eeprom.h b/io-module/mts_eeprom.h
index d6c3bd3..811b380 100644
--- a/io-module/mts_eeprom.h
+++ b/io-module/mts_eeprom.h
@@ -23,7 +23,7 @@ struct mts_id_eeprom_layout {
 	uint8_t reserved[302];
 };
 
-/* daughter card EEPROM */
+/* daughter/accessory card EEPROM */
 struct mts_dc_eeprom_layout {
 	char vendor_id[32];
 	char product_id[32];
diff --git a/io-module/spi.c b/io-module/spi.c
index 2da3f05..74d81d2 100644
--- a/io-module/spi.c
+++ b/io-module/spi.c
@@ -599,8 +599,8 @@ static int mts_spi_dc_dout_probe(struct spi_device *spi)
 {
 	int tmp;
 
-	if (! has_daughter_card || mts_dc_product_id != MTDC_GPIOB_0_0) {
-		log_error("daughter card digital outputs not available");
+	if (! has_accessory_card || mts_dc_product_id != MTDC_GPIOB_0_0) {
+		log_error("accessory card digital outputs not available");
 		return -ENODEV;
 	}
 
@@ -645,8 +645,8 @@ static int mts_spi_dc_din_probe(struct spi_device *spi)
 {
 	int tmp;
 
-	if (! has_daughter_card || mts_dc_product_id != MTDC_GPIOB_0_0) {
-		log_error("daughter card digital inputs not available");
+	if (! has_accessory_card || mts_dc_product_id != MTDC_GPIOB_0_0) {
+		log_error("accessory card digital inputs not available");
 		return -ENODEV;
 	}
 
@@ -657,7 +657,7 @@ static int mts_spi_dc_din_probe(struct spi_device *spi)
 
 	tmp = spi_setup(spi);
 	if (tmp < 0) {
-		log_error("spi_setup daughter card din failed");
+		log_error("spi_setup accessory card din failed");
 		return tmp;
 	}
 
@@ -688,8 +688,8 @@ static int mts_spi_dc_adc_probe(struct spi_device *spi)
 {
 	int tmp;
 
-	if (! has_daughter_card || mts_dc_product_id != MTDC_GPIOB_0_0) {
-		log_error("daughter card analog to digital not available");
+	if (! has_accessory_card || mts_dc_product_id != MTDC_GPIOB_0_0) {
+		log_error("accessory card analog to digital not available");
 		return -ENODEV;
 	}
 
@@ -701,7 +701,7 @@ static int mts_spi_dc_adc_probe(struct spi_device *spi)
 
 	tmp = spi_setup(spi);
 	if (tmp < 0) {
-		log_error("spi_setup daughter card adc failed");
+		log_error("spi_setup accessory card adc failed");
 		return tmp;
 	}