Date: Mon, 21 Feb 2005 01:33:12 GMT From: John-Mark Gurney <jmg@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 71434 for review Message-ID: <200502210133.j1L1XCNb082111@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=71434 Change 71434 by jmg@jmg_carbon on 2005/02/21 01:32:48 the arm_(un)?mask_irqs only work on a single irq, name it such.. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/intr.c#5 edit .. //depot/projects/arm/src/sys/arm/ep93xx/ep93xx.c#4 edit .. //depot/projects/arm/src/sys/arm/include/intr.h#3 edit .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_irqhandler.c#3 edit .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq80321.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/intr.c#5 (text+ko) ==== @@ -67,7 +67,7 @@ struct arm_intr *intr = (struct arm_intr *)arg; intr->handler(intr->arg); - arm_unmask_irqs(intr->irq); + arm_unmask_irq(intr->irq); } void arm_handler_execute(void *, int); @@ -140,7 +140,7 @@ ih->ih_argument : frame); } } else if (ih) { - arm_mask_irqs(i); + arm_mask_irq(i); ithread_schedule(ithd); } } ==== //depot/projects/arm/src/sys/arm/ep93xx/ep93xx.c#4 (text+ko) ==== @@ -80,7 +80,7 @@ void -arm_unmask_irqs(int irq) +arm_unmask_irq(int irq) { KASSERT(irq < VIC_NIRQ * 2, ("irq %d is greater than max", irq)); @@ -95,7 +95,7 @@ } void -arm_mask_irqs(int irq) +arm_mask_irq(int irq) { KASSERT(irq < VIC_NIRQ * 2, ("irq %d is greater than max", irq)); @@ -234,7 +234,7 @@ BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, cookiep); - arm_unmask_irqs(ires->r_start); + arm_unmask_irq(ires->r_start); return (0); } ==== //depot/projects/arm/src/sys/arm/include/intr.h#3 (text+ko) ==== @@ -48,8 +48,8 @@ #include <machine/psl.h> int arm_get_next_irq(void); -void arm_mask_irqs(int); -void arm_unmask_irqs(int); +void arm_mask_irq(int); +void arm_unmask_irq(int); void set_splmasks(void); void arm_setup_irqhandler(const char *, void (*)(void*), void *, int, int, void **); ==== //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_irqhandler.c#3 (text+ko) ==== @@ -124,7 +124,7 @@ extern vm_offset_t saipic_base; void -arm_mask_irqs(int irq) +arm_mask_irq(int irq) { sa11x0_irq_mask &= ~(1 << irq); @@ -133,7 +133,7 @@ } void -arm_unmask_irqs(int irq) +arm_unmask_irq(int irq) { sa11x0_irq_mask |= (1 << irq); ==== //depot/projects/arm/src/sys/arm/xscale/i80321/iq80321.c#3 (text+ko) ==== @@ -263,14 +263,14 @@ } void -arm_mask_irqs(int nb) +arm_mask_irq(int nb) { intr_enabled &= ~(1 << nb); i80321_set_intrmask(); } void -arm_unmask_irqs(int nb) +arm_unmask_irq(int nb) { intr_enabled |= (1 << nb); i80321_set_intrmask();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502210133.j1L1XCNb082111>