diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2008-11-25 14:55:45 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2008-11-25 14:55:45 +0000 |
| commit | 8a47c75221bb2302bcd8a1fabaefcdbdc38a88dc (patch) | |
| tree | 36735937ff10303a7875644eb33bf4dda0f2a7a6 /sys/arch/arm | |
| parent | 8cc9da7e89093bd43854f0bdda07abb2fe9b8aec (diff) | |
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@
Diffstat (limited to 'sys/arch/arm')
| -rw-r--r-- | sys/arch/arm/xscale/pxa27x_udc.c | 28 |
1 files changed, 14 insertions, 14 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()) { |