rename zaurus_reg.h to machine_reg and rename some of the internal fields

so that arm/xscale/... is not referring to zaurus specific defines.
ok miod kevlo, with some suggested changes from deraadt@

6 files changed, 26 insertions, 26 deletions

diff --git a/sys/arch/arm/xscale/pxa27x_udc.c b/sys/arch/arm/xscale/pxa27x_udc.c
index f29154bb07a..1090271b57f 100644
--- a/sys/arch/arm/xscale/pxa27x_udc.c
+++ b/sys/arch/arm/xscale/pxa27x_udc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa27x_udc.c,v 1.22 2007/06/14 06:55:10 mbalmer Exp $ */
+/*	$OpenBSD: pxa27x_udc.c,v 1.23 2008/11/25 14:55:44 drahn Exp $ */
 
 /*
  * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
@@ -42,7 +42,7 @@
 #define PXAUDC_EP0MAXP	16	/* XXX */
 #define PXAUDC_NEP	24	/* total number of endpoints */
 
-#include <machine/zaurus_reg.h>	/* XXX */
+#include <machine/machine_reg.h>	/* XXX */
 
 #include "usbf.h"
 
@@ -231,10 +231,10 @@ pxaudc_attach(struct device *parent, struct device *self, void *aux)
 
 	/* Establish device connect interrupt. */
 #if 0
-	sc->sc_conn_ih = pxa2x0_gpio_intr_establish(C3000_USB_DEVICE_PIN, /* XXX */
+	sc->sc_conn_ih = pxa2x0_gpio_intr_establish(PXA_USB_DEVICE_PIN, /* XXX */
 	    IST_EDGE_BOTH, IPL_USB, pxaudc_connect_intr, sc, "usbc");
 #endif
-	sc->sc_conn_ih = pxa2x0_gpio_intr_establish(C3000_USB_CONNECT_PIN,
+	sc->sc_conn_ih = pxa2x0_gpio_intr_establish(PXA_USB_CONNECT_PIN,
 	    IST_EDGE_BOTH, IPL_USB, pxaudc_connect_intr, sc, "usbc");
 	if (sc->sc_conn_ih == NULL) {
 		printf(": unable to establish connect interrupt\n");
@@ -318,28 +318,28 @@ pxaudc_power(int why, void *arg)
 int
 pxaudc_is_host(void)
 {
-	return (!pxa2x0_gpio_get_bit(C3000_USB_CONNECT_PIN) &&
-		!pxa2x0_gpio_get_bit(C3000_USB_DEVICE_PIN));
+	return (!pxa2x0_gpio_get_bit(PXA_USB_CONNECT_PIN) &&
+		!pxa2x0_gpio_get_bit(PXA_USB_DEVICE_PIN));
 }
 
 int
 pxaudc_is_device(void)
 {
-	return (pxa2x0_gpio_get_bit(C3000_USB_CONNECT_PIN) &&
-		pxa2x0_gpio_get_bit(C3000_USB_DEVICE_PIN));
+	return (pxa2x0_gpio_get_bit(PXA_USB_CONNECT_PIN) &&
+		pxa2x0_gpio_get_bit(PXA_USB_DEVICE_PIN));
 }
 
 void
 pxaudc_setup(struct pxaudc_softc *sc)
 {
 	pxa2x0_gpio_set_function(45, GPIO_OUT);
-	pxa2x0_gpio_set_function(C3000_USB_CONNECT_PIN, GPIO_IN); /* 41 */
+	pxa2x0_gpio_set_function(PXA_USB_CONNECT_PIN, GPIO_IN); /* 41 */
 	pxa2x0_gpio_set_function(40, GPIO_OUT);
 	pxa2x0_gpio_set_function(39, GPIO_IN);
 	pxa2x0_gpio_set_function(38, GPIO_IN);
 	pxa2x0_gpio_set_function(37, GPIO_OUT);
 	pxa2x0_gpio_set_function(36, GPIO_IN);
-	pxa2x0_gpio_set_function(C3000_USB_DEVICE_PIN, GPIO_IN); /* 35 */
+	pxa2x0_gpio_set_function(PXA_USB_DEVICE_PIN, GPIO_IN); /* 35 */
 	pxa2x0_gpio_set_function(34, GPIO_IN);
 	pxa2x0_gpio_set_function(89, GPIO_OUT);
 	pxa2x0_gpio_set_function(120, GPIO_OUT);
@@ -349,14 +349,14 @@ pxaudc_setup(struct pxaudc_softc *sc)
 void
 pxaudc_hide(struct pxaudc_softc *sc)
 {
-	pxa2x0_gpio_clear_bit(C3000_USB_PULLUP_PIN);
+	pxa2x0_gpio_clear_bit(PXA_USB_PULLUP_PIN);
 }
 
 /* Show us to the host. */
 void
 pxaudc_show(struct pxaudc_softc *sc)
 {
-	pxa2x0_gpio_set_bit(C3000_USB_PULLUP_PIN);
+	pxa2x0_gpio_set_bit(PXA_USB_PULLUP_PIN);
 }
 
 /*
@@ -791,8 +791,8 @@ pxaudc_connect_intr(void *v)
 	struct pxaudc_softc *sc = v;
 
 	DPRINTF(10,("pxaudc_connect_intr: connect=%d device=%d\n",
-	    pxa2x0_gpio_get_bit(C3000_USB_CONNECT_PIN),
-	    pxa2x0_gpio_get_bit(C3000_USB_DEVICE_PIN)));
+	    pxa2x0_gpio_get_bit(PXA_USB_CONNECT_PIN),
+	    pxa2x0_gpio_get_bit(PXA_USB_DEVICE_PIN)));
 
 	/* XXX only set a flag here */
 	if (pxaudc_is_host()) {
diff --git a/sys/arch/zaurus/dev/scoop_pcic.c b/sys/arch/zaurus/dev/scoop_pcic.c
index b663fc567a4..8f3bd018959 100644
--- a/sys/arch/zaurus/dev/scoop_pcic.c
+++ b/sys/arch/zaurus/dev/scoop_pcic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scoop_pcic.c,v 1.1 2005/07/01 23:51:55 uwe Exp $	*/
+/*	$OpenBSD: scoop_pcic.c,v 1.2 2008/11/25 14:55:44 drahn Exp $	*/
 
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -23,7 +23,7 @@
 #include <arch/arm/xscale/pxa2x0var.h>
 #include <arch/arm/xscale/pxapcicvar.h>
 
-#include <machine/zaurus_reg.h>
+#include <machine/machine_reg.h>
 #include <machine/zaurus_var.h>
 
 #include <zaurus/dev/zaurus_scoopreg.h>
diff --git a/sys/arch/zaurus/dev/zaurus_scoop.c b/sys/arch/zaurus/dev/zaurus_scoop.c
index cc321d57e14..78e057bb022 100644
--- a/sys/arch/zaurus/dev/zaurus_scoop.c
+++ b/sys/arch/zaurus/dev/zaurus_scoop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zaurus_scoop.c,v 1.17 2007/12/27 07:09:46 thib Exp $	*/
+/*	$OpenBSD: zaurus_scoop.c,v 1.18 2008/11/25 14:55:44 drahn Exp $	*/
 
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -29,7 +29,7 @@
 
 #include <arm/xscale/pxa2x0var.h>
 
-#include <machine/zaurus_reg.h>
+#include <machine/machine_reg.h>
 #include <machine/zaurus_var.h>
 
 #include <zaurus/dev/zaurus_scoopreg.h>
diff --git a/sys/arch/zaurus/include/zaurus_reg.h b/sys/arch/zaurus/include/machine_reg.h
index fd4e40eb3ac..67f5aada0ab 100644
--- a/sys/arch/zaurus/include/zaurus_reg.h
+++ b/sys/arch/zaurus/include/machine_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zaurus_reg.h,v 1.8 2006/11/25 18:10:29 uwe Exp $	*/
+/*	$OpenBSD: machine_reg.h,v 1.1 2008/11/25 14:55:44 drahn Exp $	*/
 /*	$NetBSD: lubbock_reg.h,v 1.1 2003/06/18 10:51:15 bsh Exp $ */
 
 /*
@@ -75,9 +75,9 @@
 #define C3000_RC_IRQ_PIN	13	/* remote control */
 #define C3000_CF0_IRQ_PIN	94
 #define C3000_CF1_IRQ_PIN	93
-#define C3000_USB_DEVICE_PIN	35	/* indicate connection type */
-#define C3000_USB_CONNECT_PIN	41	/* connection interrupt */
-#define C3000_USB_PULLUP_PIN	45	/* show/hide device presence */
+#define PXA_USB_DEVICE_PIN	35	/* indicate connection type */
+#define PXA_USB_CONNECT_PIN	41	/* connection interrupt */
+#define PXA_USB_PULLUP_PIN	45	/* show/hide device presence */
 #define GPIO_HP_IN_C3000	116	/* headphone jack */
 
 #endif /* _ZAURUS_REG_H */
diff --git a/sys/arch/zaurus/include/zaurus_var.h b/sys/arch/zaurus/include/zaurus_var.h
index 871d70bf858..a0a8c78bd6f 100644
--- a/sys/arch/zaurus/include/zaurus_var.h
+++ b/sys/arch/zaurus/include/zaurus_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zaurus_var.h,v 1.4 2005/07/01 23:56:47 uwe Exp $	*/
+/*	$OpenBSD: zaurus_var.h,v 1.5 2008/11/25 14:55:44 drahn Exp $	*/
 /*	$NetBSD: lubbock_var.h,v 1.1 2003/06/18 10:51:15 bsh Exp $ */
 
 /*
@@ -37,7 +37,7 @@
 #include <sys/device.h>
 
 #include <machine/bus.h>
-#include <machine/zaurus_reg.h>
+#include <machine/machine_reg.h>
 
 #ifdef _KERNEL
 
diff --git a/sys/arch/zaurus/zaurus/zaurus_machdep.c b/sys/arch/zaurus/zaurus/zaurus_machdep.c
index fe369b81a6f..38ee72873c1 100644
--- a/sys/arch/zaurus/zaurus/zaurus_machdep.c
+++ b/sys/arch/zaurus/zaurus/zaurus_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zaurus_machdep.c,v 1.29 2008/06/08 20:56:33 miod Exp $	*/
+/*	$OpenBSD: zaurus_machdep.c,v 1.30 2008/11/25 14:55:44 drahn Exp $	*/
 /*	$NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -150,7 +150,7 @@
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 #include <arm/sa11x0/sa1111_reg.h>
-#include <machine/zaurus_reg.h>
+#include <machine/machine_reg.h>
 #include <machine/zaurus_var.h>
 
 #include <zaurus/dev/zaurus_scoopreg.h>