diff options
Diffstat (limited to 'sys/arch/armv7/omap')
| -rw-r--r-- | sys/arch/armv7/omap/intc.c | 10 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omgpio.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/armv7/omap/intc.c b/sys/arch/armv7/omap/intc.c index 8c662a70f05..335f9e6794d 100644 --- a/sys/arch/armv7/omap/intc.c +++ b/sys/arch/armv7/omap/intc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.c,v 1.3 2014/07/12 18:44:41 tedu Exp $ */ +/* $OpenBSD: intc.c,v 1.4 2016/01/31 00:14:50 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -170,7 +170,7 @@ intc_attach(struct device *parent, struct device *self, void *args) intc_irq_handler); intc_setipl(IPL_HIGH); /* XXX ??? */ - enable_interrupts(I32_bit); + enable_interrupts(PSR_I); } void @@ -269,7 +269,7 @@ intc_setipl(int new) if (intc_attached == 0) return; - psw = disable_interrupts(I32_bit); + psw = disable_interrupts(PSR_I); #if 0 { volatile static int recursed = 0; @@ -342,7 +342,7 @@ intc_intr_establish(int irqno, int level, int (*func)(void *), if (irqno < 0 || irqno >= INTC_NUM_IRQ) panic("intc_intr_establish: bogus irqnumber %d: %s", irqno, name); - psw = disable_interrupts(I32_bit); + psw = disable_interrupts(PSR_I); /* no point in sleeping unless someone can free memory. */ ih = (struct intrhand *)malloc (sizeof *ih, M_DEVBUF, @@ -376,7 +376,7 @@ intc_intr_disestablish(void *cookie) int psw; struct intrhand *ih = cookie; int irqno = ih->ih_irq; - psw = disable_interrupts(I32_bit); + psw = disable_interrupts(PSR_I); TAILQ_REMOVE(&intc_handler[irqno].iq_list, ih, ih_list); if (ih->ih_name != NULL) evcount_detach(&ih->ih_count); diff --git a/sys/arch/armv7/omap/omgpio.c b/sys/arch/armv7/omap/omgpio.c index 3acf4deef6e..5df65bdc899 100644 --- a/sys/arch/armv7/omap/omgpio.c +++ b/sys/arch/armv7/omap/omgpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omgpio.c,v 1.5 2014/07/14 08:55:07 rapha Exp $ */ +/* $OpenBSD: omgpio.c,v 1.6 2016/01/31 00:14:50 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -621,7 +621,7 @@ omgpio_intr_establish(struct omgpio_softc *sc, unsigned int gpio, int level, int gpio, sc->sc_handlers[GPIO_PIN_TO_OFFSET(gpio)]->ih_name, name); - psw = disable_interrupts(I32_bit); + psw = disable_interrupts(PSR_I); /* no point in sleeping unless someone can free memory. */ ih = (struct intrhand *)malloc( sizeof *ih, M_DEVBUF, @@ -656,7 +656,7 @@ omgpio_intr_disestablish(struct omgpio_softc *sc, void *cookie) struct intrhand *ih = cookie; struct omgpio_softc *sc = omgpio_cd.cd_devs[GPIO_PIN_TO_INST(ih->ih_gpio)]; int gpio = ih->ih_gpio; - psw = disable_interrupts(I32_bit); + psw = disable_interrupts(PSR_I); ih = sc->sc_handlers[GPIO_PIN_TO_OFFSET(gpio)]; sc->sc_handlers[GPIO_PIN_TO_OFFSET(gpio)] = NULL; |