diff options
author | Michael Fiore <MFiore@multitech.com> | 2013-03-08 16:46:37 -0600 |
---|---|---|
committer | Michael Fiore <MFiore@multitech.com> | 2013-03-08 16:46:37 -0600 |
commit | e8cc7b256011c991b5a91b6d5bb07173705a8d35 (patch) | |
tree | 5b02f672ee8c00d8fb72055048fe4c2a2b97cb5d | |
parent | a14c27420ad1a2139c19c5504022e6f7d5c87bcb (diff) | |
parent | 1502278d3ebd04fcd7ebd1238e31f65fc7a5ff3f (diff) | |
download | cdp-io-controller-e8cc7b256011c991b5a91b6d5bb07173705a8d35.tar.gz cdp-io-controller-e8cc7b256011c991b5a91b6d5bb07173705a8d35.tar.bz2 cdp-io-controller-e8cc7b256011c991b5a91b6d5bb07173705a8d35.zip |
Merge branch 'master' of ssh://git.multitech.net/cdp-io-controller
-rw-r--r-- | io-module/mts_io.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/io-module/mts_io.c b/io-module/mts_io.c index ae2764d..3e08f4e 100644 --- a/io-module/mts_io.c +++ b/io-module/mts_io.c @@ -99,7 +99,6 @@ static struct gpio_pin *gpio_pins; static struct gpio_pin gpio_pins_mtcdp_0_0[] = { { .name = "ENIO", - .attr_name = "", .pin = AT91_PIN_PC15, .direction = GPIO_DIR_OUTPUT, .output_value = 1, @@ -177,7 +176,6 @@ static struct gpio_pin gpio_pins_mtcdp_0_0[] = { static struct gpio_pin gpio_pins_mtcdp_1_0[] = { { .name = "ENIO", - .attr_name = "", .pin = AT91_PIN_PC15, .direction = GPIO_DIR_OUTPUT, .output_value = 1, @@ -242,7 +240,6 @@ static struct gpio_pin gpio_pins_mtcdp_1_0[] = { }, { .name = "TXD1", - .attr_name = "", .pin = AT91_PIN_PB17, .direction = GPIO_DIR_INPUT, .output_value = 0, @@ -291,7 +288,6 @@ static struct gpio_pin gpio_pins_mtcdp_1_0[] = { static struct gpio_pin gpio_pins_mt100eocg_0_0[] = { { .name = "ENIO", - .attr_name = "", .pin = AT91_PIN_PC15, .direction = GPIO_DIR_OUTPUT, .output_value = 1, @@ -354,7 +350,6 @@ static struct gpio_pin gpio_pins_mt100eocg_0_0[] = { }, { .name = "TXD1", - .attr_name = "", .pin = AT91_PIN_PB17, .direction = GPIO_DIR_INPUT, .output_value = 0, @@ -801,7 +796,7 @@ struct gpio_pin *gpio_pin_by_name(const char *name) { struct gpio_pin *gpio_pin_by_attr_name(const char *name) { struct gpio_pin *pin; - for (pin = gpio_pins; *pin->attr_name; pin++) { + for (pin = gpio_pins; *pin->name; pin++) { if (!strcmp(pin->attr_name, name)) { return pin; } |