diff options
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/files.macppc | 10 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/macgpio.c (renamed from sys/arch/macppc/dev/gpio.c) | 36 |
4 files changed, 29 insertions, 29 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 0badb1e9c33..b6eb13152e4 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.82 2005/05/01 07:54:42 david Exp $g +# $OpenBSD: GENERIC,v 1.83 2005/05/04 02:24:17 drahn Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -122,8 +122,8 @@ bm* at macobio? # BMAC ethernet adb* at macobio? # Apple Desktop Bus apm0 at adb? # APM emulation wi* at macobio? # airport -gpio* at macobio? # GPIO, PMU interrupt router. -gpio* at gpio? # GPIO, PMU interrupt router. +macgpio* at macobio? # GPIO, PMU interrupt router. +macgpio* at macgpio? # GPIO, PMU interrupt router. aed* at adb? # ADB Event Device akbd* at adb? # ADB keyboard diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 025bfffbbdb..4d87668d196 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.47 2005/05/01 07:54:42 david Exp $ +# $OpenBSD: RAMDISK,v 1.48 2005/05/04 02:24:17 drahn Exp $ # # PPC GENERIC config file # @@ -110,8 +110,8 @@ bm* at macobio? # bmac ethernet #nvram* at macobio? # nvram adb* at macobio? # Apple Desktop Bus wi* at macobio? # Apple Airport 802.11DS -gpio* at macobio? # GPIO, PMU interrupt router. -gpio* at gpio? # GPIO, PMU interrupt router. +macgpio* at macobio? # GPIO, PMU interrupt router. +macgpio* at macgpio? # GPIO, PMU interrupt router. aed* at adb? # ADB Event Device akbd* at adb? # ADB keyboard wskbd* at akbd? mux 1 diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index debb94b3ece..993e8307068 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.24 2005/03/08 20:00:23 tdeval Exp $ +# $OpenBSD: files.macppc,v 1.25 2005/05/04 02:24:17 drahn Exp $ # # macppc-specific configuration info @@ -193,10 +193,10 @@ file arch/macppc/dev/snapper.c snapper #attach nvram at macobio #file arch/macppc/dev/nvram.c nvram needs-flag -device gpio {} -attach gpio at macobio with gpio_obio -attach gpio at gpio with gpio_gpio -file arch/macppc/dev/gpio.c gpio +device macgpio {} +attach macgpio at macobio with macgpio +attach macgpio at macgpio with macgpio_gpio +file arch/macppc/dev/macgpio.c macgpio attach wdc at mediabay, macobio, kauaiata with wdc_obio file arch/macppc/dev/wdc_obio.c wdc_obio diff --git a/sys/arch/macppc/dev/gpio.c b/sys/arch/macppc/dev/macgpio.c index db4bb579f59..cabdb7beca2 100644 --- a/sys/arch/macppc/dev/gpio.c +++ b/sys/arch/macppc/dev/macgpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gpio.c,v 1.1 2001/09/01 15:50:00 drahn Exp $ */ +/* $OpenBSD: macgpio.c,v 1.1 2005/05/04 02:24:17 drahn Exp $ */ /* $NetBSD: gpio.c,v 1.2 2001/02/27 05:16:33 matt Exp $ */ /*- @@ -46,12 +46,12 @@ #include "adb.h" -static void gpio_obio_attach (struct device *, struct device *, void *); -static int gpio_obio_match (struct device *, void *, void *); -static int gpio_obio_print (void *aux, const char *gpio); +static void macgpio_attach (struct device *, struct device *, void *); +static int macgpio_match (struct device *, void *, void *); +static int macgpio_print (void *aux, const char *gpio); -static void gpio_gpio_attach (struct device *, struct device *, void *); -static int gpio_gpio_match (struct device *, void *, void *); +static void macgpio_gpio_attach (struct device *, struct device *, void *); +static int macgpio_gpio_match (struct device *, void *, void *); static int gpio_intr (void *); struct gpio_softc { @@ -59,20 +59,20 @@ struct gpio_softc { u_int8_t *sc_port; }; -struct cfattach gpio_obio_ca = { - sizeof(struct gpio_softc), gpio_obio_match, gpio_obio_attach +struct cfattach macgpio_ca = { + sizeof(struct gpio_softc), macgpio_match, macgpio_attach }; -struct cfattach gpio_gpio_ca = { - sizeof(struct gpio_softc), gpio_gpio_match, gpio_gpio_attach +struct cfattach macgpio_gpio_ca = { + sizeof(struct gpio_softc), macgpio_gpio_match, macgpio_gpio_attach }; -struct cfdriver gpio_cd = { - NULL, "gpio_obio", DV_DULL +struct cfdriver macgpio_cd = { + NULL, "macgpio", DV_DULL }; int -gpio_obio_match(struct device *parent, void *cf, void *aux) +macgpio_match(struct device *parent, void *cf, void *aux) { struct confargs *ca = aux; @@ -86,7 +86,7 @@ gpio_obio_match(struct device *parent, void *cf, void *aux) } void -gpio_obio_attach(struct device *parent, struct device *self, void *aux) +macgpio_attach(struct device *parent, struct device *self, void *aux) { struct gpio_softc *sc = (struct gpio_softc *)self; struct confargs *ca = aux, ca2; @@ -122,12 +122,12 @@ gpio_obio_attach(struct device *parent, struct device *self, void *aux) ca2.ca_reg = reg; ca2.ca_intr = intr; - config_found(self, &ca2, gpio_obio_print); + config_found(self, &ca2, macgpio_print); } } int -gpio_obio_print(void *aux, const char *gpio) +macgpio_print(void *aux, const char *gpio) { struct confargs *ca = aux; @@ -141,7 +141,7 @@ gpio_obio_print(void *aux, const char *gpio) } int -gpio_gpio_match(struct device *parent, void *cf, void *aux) +macgpio_gpio_match(struct device *parent, void *cf, void *aux) { struct confargs *ca = aux; @@ -155,7 +155,7 @@ gpio_gpio_match(struct device *parent, void *cf, void *aux) } void -gpio_gpio_attach(struct device *parent, struct device *self, void *aux) +macgpio_gpio_attach(struct device *parent, struct device *self, void *aux) { struct gpio_softc *sc = (struct gpio_softc *)self; struct confargs *ca = aux; |