Re: CVS commit: src/sys/arch/i386/pci

[Marc Balmer <marc%msys.ch@localhost>]

Am 17.09.2009 um 21:21 schrieb David Young:

> Module Name:    src
> Committed By:   dyoung
> Date:           Thu Sep 17 20:21:54 UTC 2009
>
> Modified Files:
>         src/sys/arch/i386/pci: elan520.c
>
> Log Message:
> As Jonathan Kollasch points out, elansc_attach() does not actually
> use gba after filling it out.  Delete it.

I am not sure if this is the right fix.  Does the gpio device still  
attach now?

Shouldn't there just be a

config_found_ia(self, "gpiobus", &gba, gpiobus_print);

call added?  Or how does the GPIO system get to know how much pins  
etc. this GPIO controller has?

Have you tested this on real hardware (e.g. a Soekris net4501)?

- Marc Balmer


> To generate a diff of this commit:
> cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/pci/elan520.c
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>
> Modified files:
>
> Index: src/sys/arch/i386/pci/elan520.c
> diff -u src/sys/arch/i386/pci/elan520.c:1.42 src/sys/arch/i386/pci/ 
> elan520.c:1.43
> --- src/sys/arch/i386/pci/elan520.c:1.42        Wed Apr 29 23:50:53 2009
> +++ src/sys/arch/i386/pci/elan520.c     Thu Sep 17 20:21:54 2009
> @@ -1,4 +1,4 @@
> -/*     $NetBSD: elan520.c,v 1.42 2009/04/29 23:50:53 dyoung Exp $      */
> +/*     $NetBSD: elan520.c,v 1.43 2009/09/17 20:21:54 dyoung Exp $      */
>
> /*-
>  * Copyright (c) 2002 The NetBSD Foundation, Inc.
> @@ -40,7 +40,7 @@
>
> #include <sys/cdefs.h>
>
> -__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.42 2009/04/29 23:50:53  
> dyoung Exp $");
> +__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.43 2009/09/17 20:21:54  
> dyoung Exp $");
>
> #include <sys/param.h>
> #include <sys/systm.h>
> @@ -1262,7 +1262,6 @@
>         uint16_t rev;
>         uint8_t cpuctl, picicr, ressta;
> #if NGPIO > 0
> -       struct gpiobus_attach_args gba;
>         int pin, reg, shift;
>         uint16_t data;
> #endif
> @@ -1387,10 +1386,6 @@
>         sc->sc_gpio_gc.gp_pin_write = elansc_gpio_pin_write;
>         sc->sc_gpio_gc.gp_pin_ctl = elansc_gpio_pin_ctl;
>
> -       gba.gba_gc = &sc->sc_gpio_gc;
> -       gba.gba_pins = sc->sc_gpio_pins;
> -       gba.gba_npins = ELANSC_PIO_NPINS;
> -
> #endif /* NGPIO */
>
>         elansc_rescan(sc->sc_dev, "elanparbus", NULL);