diff options
| author | mbalmer <mbalmer@NetBSD.org> | 2009-08-03 12:42:45 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@NetBSD.org> | 2009-08-03 12:42:45 +0000 |
| commit | e1a16b3665f764fa77bb67033d5d812c07bbb808 (patch) | |
| tree | 15f2a6c6157bd4dd366bbf47f093f15ead425c90 /sys/dev | |
| parent | dd4c27f39b1d433492b34ca04c73c8b5a2e7e99b (diff) | |
A better match routine that checks also the number of pins instead
of checking the pins in the attach routine; malconfigured devices will
no longer attach. While here, replace some printf uses by aprint_....
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/gpio/gpioow.c | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/sys/dev/gpio/gpioow.c b/sys/dev/gpio/gpioow.c index 3999c9cfcef..e2136865e9e 100644 --- a/sys/dev/gpio/gpioow.c +++ b/sys/dev/gpio/gpioow.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpioow.c,v 1.7 2009/07/25 16:17:10 mbalmer Exp $ */ +/* $NetBSD: gpioow.c,v 1.8 2009/08/03 12:42:45 mbalmer Exp $ */ /* $OpenBSD: gpioow.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.7 2009/07/25 16:17:10 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.8 2009/08/03 12:42:45 mbalmer Exp $"); /* * 1-Wire bus bit-banging through GPIO pin. @@ -79,10 +79,19 @@ gpioow_match(device_t parent, cfdata_t cf, { struct gpio_attach_args *ga = aux; + if (strcmp(ga->ga_dvname, cf->cf_name)) + return 0; + if (ga->ga_offset == -1) return 0; - return strcmp(ga->ga_dvname, cf->cf_name) == 0; + /* Check that we have enough pins */ + if (gpio_npins(ga->ga_mask) != GPIOOW_NPINS) { + aprint_debug("%s: invalid pin mask 0x%02x/n", cf->cf_name, + ga->ga_mask); + return 0; + } + return 1; } void @@ -93,47 +102,41 @@ gpioow_attach(device_t parent, device_t self, void *aux) struct onewirebus_attach_args oba; int caps; - /* Check that we have enough pins */ - if (gpio_npins(ga->ga_mask) != GPIOOW_NPINS) { - printf(": invalid pin mask 0x%02x\n", ga->ga_mask); - return; - } - /* Map pins */ sc->sc_gpio = ga->ga_gpio; sc->sc_map.pm_map = sc->__map; if (gpio_pin_map(sc->sc_gpio, ga->ga_offset, ga->ga_mask, &sc->sc_map)) { - printf(": can't map pins\n"); + aprint_error(": can't map pins\n"); return; } /* Configure data pin */ caps = gpio_pin_caps(sc->sc_gpio, &sc->sc_map, GPIOOW_PIN_DATA); if (!(caps & GPIO_PIN_OUTPUT)) { - printf(": data pin is unable to drive output\n"); + aprint_error(": data pin is unable to drive output\n"); goto fail; } if (!(caps & GPIO_PIN_INPUT)) { - printf(": data pin is unable to read input\n"); + aprint_error(": data pin is unable to read input\n"); goto fail; } - printf(": DATA[%d]", sc->sc_map.pm_map[GPIOOW_PIN_DATA]); + aprint_normal(": DATA[%d]", sc->sc_map.pm_map[GPIOOW_PIN_DATA]); sc->sc_data = GPIO_PIN_OUTPUT; if (caps & GPIO_PIN_OPENDRAIN) { - printf(" open-drain"); + aprint_normal(" open-drain"); sc->sc_data |= GPIO_PIN_OPENDRAIN; } else if ((caps & GPIO_PIN_PUSHPULL) && (caps & GPIO_PIN_TRISTATE)) { - printf(" push-pull tri-state"); + aprint_normal(" push-pull tri-state"); sc->sc_data |= GPIO_PIN_PUSHPULL; } if (caps & GPIO_PIN_PULLUP) { - printf(" pull-up"); + aprint_normal(" pull-up"); sc->sc_data |= GPIO_PIN_PULLUP; } gpio_pin_ctl(sc->sc_gpio, &sc->sc_map, GPIOOW_PIN_DATA, sc->sc_data); - printf("\n"); + aprint_normal("\n"); /* Attach 1-Wire bus */ sc->sc_ow_bus.bus_cookie = sc; |
