PERFORCE change 115250 for review
Paolo Pisati
piso at FreeBSD.org
Fri Mar 2 15:26:42 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=115250
Change 115250 by piso at piso_newluxor on 2007/03/02 15:26:22
Reduce diff against HEAD.
Affected files ...
.. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#9 edit
.. //depot/projects/soc2006/intr_filter/arm/at91/at91.c#8 edit
.. //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#10 edit
.. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#5 edit
.. //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#4 edit
.. //depot/projects/soc2006/intr_filter/dev/zs/zs.c#5 edit
.. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#10 edit
.. //depot/projects/soc2006/intr_filter/powerpc/powermac/hrowpic.c#4 edit
.. //depot/projects/soc2006/intr_filter/sparc64/isa/isa.c#5 edit
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#5 edit
.. //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#5 edit
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#6 edit
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#5 edit
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#6 edit
Differences ...
==== //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#9 (text+ko) ====
@@ -227,7 +227,7 @@
if (pscnt == psdiv)
statclock(TRAPF_USERMODE(frame));
}
- return (flag ? FILTER_HANDLED : FILTER_STRAY);
+ return(flag ? FILTER_HANDLED : FILTER_STRAY);
}
#include "opt_ddb.h"
==== //depot/projects/soc2006/intr_filter/arm/at91/at91.c#8 (text) ====
@@ -550,8 +550,8 @@
if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && filt == NULL)
panic("All system interrupt ISRs must be type INTR_FAST");
- BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt,
- intr, arg, cookiep);
+ BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg,
+ cookiep);
bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR,
1 << rman_get_start(ires));
return (0);
==== //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#10 (text) ====
@@ -164,7 +164,7 @@
* it is likely to be used, and the extremely coarse nature time
* interval, I think this is the best solution.
*/
-static int
+static void
at91st_watchdog(void *argp, u_int cmd, int *error)
{
uint32_t wdog;
==== //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#5 (text+ko) ====
@@ -113,8 +113,8 @@
saved_cpsr = SetCPSR(I32_bit, I32_bit);
SetCPSR(I32_bit, saved_cpsr & I32_bit);
- BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt,
- intr, arg, cookiep);
+ BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg,
+ cookiep);
return (0);
}
==== //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#6 (text+ko) ====
@@ -1962,7 +1962,7 @@
*/
int
ppc_setup_intr(device_t bus, device_t child, struct resource *r, int flags,
- driver_filter_t *filt, void (*ihand)(void *), void *arg, void **cookiep)
+ driver_filter_t *filt, void (*ihand)(void *), void *arg, void **cookiep)
{
int error;
struct ppc_data *ppc = DEVTOSOFTC(bus);
==== //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/zs/z8530var.h,v 1.2 2004/06/16 09:47:02 phk Exp $
+ * $FreeBSD: src/sys/dev/zs/z8530var.h,v 1.3 2007/02/27 15:31:11 piso Exp $
*/
#ifndef _DEV_ZS_ZSVAR_H_
==== //depot/projects/soc2006/intr_filter/dev/zs/zs.c#5 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.36 2006/11/06 13:41:56 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.37 2007/02/27 15:31:11 piso Exp $");
/*-
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
@@ -218,9 +218,9 @@
needsoft |= zstty_intr(sc->sc_child[1], rr3);
if (needsoft) {
swi_sched(sc->sc_softih, 0);
- return(FILTER_HANDLED);
+ return (FILTER_HANDLED);
}
- return(FILTER_STRAY);
+ return (FILTER_STRAY);
}
static void
==== //depot/projects/soc2006/intr_filter/i386/isa/clock.c#10 (text+ko) ====
@@ -222,10 +222,8 @@
static int
rtcintr(struct trapframe *frame)
{
- int flag = 0;
while (rtcin(RTC_INTR) & RTCIR_PERIOD) {
- flag = 1;
if (profprocs != 0) {
if (--pscnt == 0)
pscnt = psdiv;
@@ -234,7 +232,7 @@
if (pscnt == psdiv)
statclock(TRAPF_USERMODE(frame));
}
- return (flag ? FILTER_HANDLED : FILTER_STRAY);
+ return (FILTER_HANDLED);
}
#include "opt_ddb.h"
==== //depot/projects/soc2006/intr_filter/powerpc/powermac/hrowpic.c#4 (text+ko) ====
@@ -80,7 +80,7 @@
u_long, u_int);
static int hrowpic_setup_intr(device_t, device_t,
struct resource *, int, driver_filter_t,
- driver_intr_t, void *, void **);
+ driver_intr_t, void *, void **);
static int hrowpic_teardown_intr(device_t, device_t,
struct resource *, void *);
static int hrowpic_release_intr(device_t dev, device_t, int,
@@ -241,8 +241,8 @@
if (error)
return (error);
- error = inthand_add(device_get_nameunit(child), start, filter, intr,
- arg, flags, cookiep);
+ error = inthand_add(device_get_nameunit(child), start, filt, intr, arg,
+ flags, cookiep);
if (!error) {
/*
==== //depot/projects/soc2006/intr_filter/sparc64/isa/isa.c#5 (text+ko) ====
@@ -386,9 +386,9 @@
}
int
-isa_setup_intr(device_t dev, device_t child, struct resource *irq, int flags,
- driver_filter_t *filter, driver_intr_t *intr, void *arg,
- void **cookiep)
+isa_setup_intr(device_t dev, device_t child,
+ struct resource *irq, int flags, driver_filter_t *filter,
+ driver_intr_t *intr, void *arg, void **cookiep)
{
/*
==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#5 (text+ko) ====
@@ -427,8 +427,8 @@
UPA_WRITE(sc, imr, 0x0, intrmap & ~INTMAP_V);
(void)UPA_READ(sc, imr, 0x0);
- error = bus_generic_setup_intr(dev, child, ires, flags, filt, func,
- arg, cookiep);
+ error = bus_generic_setup_intr(dev, child, ires, flags, filt, func, arg,
+ cookiep);
if (error != 0)
return (error);
UPA_WRITE(sc, imr, 0x0, INTMAP_ENABLE(intrmap, PCPU_GET(mid)));
==== //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#5 (text+ko) ====
@@ -80,8 +80,8 @@
void intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf,
void *iva);
-int inthand_add(const char *name, int vec, int (*filter)(void *),
- void (*handler)(void *), void *arg, int flags, void **cookiep);
+int inthand_add(const char *name, int vec, int (*filt)(void *),
+ void (*handler)(void *), void *arg, int flags, void **cookiep);
int inthand_remove(int vec, void *cookie);
void cpu_intrq_init(void);
==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#6 (text+ko) ====
@@ -390,8 +390,8 @@
goto fail;
}
- error = bus_setup_intr(dev, hvcn_irq, INTR_TYPE_TTY, NULL, hvcn_intr,
- hvcn_tp, hvcn_intrhand);
+ error = bus_setup_intr(dev, hvcn_irq, INTR_TYPE_TTY, NULL, hvcn_intr, hvcn_tp,
+ hvcn_intrhand);
if (error)
device_printf(dev, "couldn't set up irq\n");
==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#5 (text+ko) ====
@@ -306,7 +306,7 @@
static int
nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
- driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep)
+ driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep)
{
struct nexus_devinfo *ndi;
device_t ichild;
@@ -345,8 +345,8 @@
if ((error = rman_activate_resource(res)))
goto fail;
- error = inthand_add(device_get_nameunit(child), ihdl, filter,
- intr, arg, flags, cookiep);
+ error = inthand_add(device_get_nameunit(child), ihdl,
+ filt, intr, arg, flags, cookiep);
cpuid = 0;
if (hv_intr_settarget(ihdl, cpuid) != H_EOK) {
==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#6 (text+ko) ====
@@ -249,7 +249,7 @@
static int
vnex_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
- driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep)
+ driver_filter_t *filt,driver_intr_t *intr, void *arg, void **cookiep)
{
uint64_t reg, nreg;
@@ -297,8 +297,8 @@
if ((error = rman_activate_resource(res)))
goto fail;
- error = inthand_add(device_get_nameunit(child), ihdl, filter,
- intr, arg, flags, cookiep);
+ error = inthand_add(device_get_nameunit(child), ihdl,
+ filt, intr, arg, flags, cookiep);
printf("inthandler added\n");
fail:
More information about the p4-projects
mailing list