summaryrefslogtreecommitdiff
path: root/sys/arch/hppa/gsc
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hppa/gsc')
-rw-r--r--sys/arch/hppa/gsc/com_gsc.c6
-rw-r--r--sys/arch/hppa/gsc/gscbus.c4
-rw-r--r--sys/arch/hppa/gsc/gscbusvar.h4
-rw-r--r--sys/arch/hppa/gsc/gsckbc.c7
-rw-r--r--sys/arch/hppa/gsc/harmony.c6
-rw-r--r--sys/arch/hppa/gsc/hil_gsc.c6
-rw-r--r--sys/arch/hppa/gsc/if_ie_gsc.c6
-rw-r--r--sys/arch/hppa/gsc/lpt_gsc.c6
-rw-r--r--sys/arch/hppa/gsc/osiop_gsc.c6
9 files changed, 25 insertions, 26 deletions
diff --git a/sys/arch/hppa/gsc/com_gsc.c b/sys/arch/hppa/gsc/com_gsc.c
index 900f66e7781..d7c18053445 100644
--- a/sys/arch/hppa/gsc/com_gsc.c
+++ b/sys/arch/hppa/gsc/com_gsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_gsc.c,v 1.17 2003/08/14 19:17:12 mickey Exp $ */
+/* $OpenBSD: com_gsc.c,v 1.18 2004/02/13 21:28:19 mickey Exp $ */
/*
* Copyright (c) 1998-2003 Michael Shalayeff
@@ -103,6 +103,6 @@ com_gsc_attach(parent, self, aux)
com_attach_subr(sc);
- sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent, IPL_TTY,
- ga->ga_irq, comintr, sc, sc->sc_dev.dv_xname);
+ sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent,
+ ga->ga_irq, IPL_TTY, comintr, sc, sc->sc_dev.dv_xname);
}
diff --git a/sys/arch/hppa/gsc/gscbus.c b/sys/arch/hppa/gsc/gscbus.c
index e6c51274e81..037089cfdd5 100644
--- a/sys/arch/hppa/gsc/gscbus.c
+++ b/sys/arch/hppa/gsc/gscbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gscbus.c,v 1.23 2003/08/07 19:47:33 mickey Exp $ */
+/* $OpenBSD: gscbus.c,v 1.24 2004/02/13 21:28:19 mickey Exp $ */
/*
* Copyright (c) 1998 Michael Shalayeff
@@ -144,7 +144,7 @@ gscprint(aux, pnp)
}
void *
-gsc_intr_establish(sc, pri, irq, handler, arg, name)
+gsc_intr_establish(sc, irq, pri, handler, arg, name)
struct gsc_softc *sc;
int pri;
int irq;
diff --git a/sys/arch/hppa/gsc/gscbusvar.h b/sys/arch/hppa/gsc/gscbusvar.h
index b361d090bf6..42238ed9009 100644
--- a/sys/arch/hppa/gsc/gscbusvar.h
+++ b/sys/arch/hppa/gsc/gscbusvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gscbusvar.h,v 1.11 2003/08/07 19:47:33 mickey Exp $ */
+/* $OpenBSD: gscbusvar.h,v 1.12 2004/02/13 21:28:19 mickey Exp $ */
/*
* Copyright (c) 1998-2003 Michael Shalayeff
@@ -59,7 +59,7 @@ struct gsc_softc {
struct hppa_bus_dma_tag sc_dmatag;
};
-void *gsc_intr_establish(struct gsc_softc *sc, int pri, int irq,
+void *gsc_intr_establish(struct gsc_softc *sc, int irq, int pri,
int (*handler)(void *v), void *arg, const char *name);
void gsc_intr_disestablish(struct gsc_softc *sc, void *v);
int gsc_intr(void *);
diff --git a/sys/arch/hppa/gsc/gsckbc.c b/sys/arch/hppa/gsc/gsckbc.c
index 312c98202cb..eb1ebc9b561 100644
--- a/sys/arch/hppa/gsc/gsckbc.c
+++ b/sys/arch/hppa/gsc/gsckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gsckbc.c,v 1.7 2003/08/07 20:46:01 mickey Exp $ */
+/* $OpenBSD: gsckbc.c,v 1.8 2004/02/13 21:28:19 mickey Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
* All rights reserved.
@@ -427,9 +427,8 @@ gsckbc_intr_establish(struct pckbc_softc *sc, pckbc_slot_t slot)
{
struct gsckbc_softc *gsc = (void *)sc;
- gsc->sc_ih = gsc_intr_establish(
- (struct gsc_softc *)sc->sc_dv.dv_parent,
- IPL_TTY, gsc->sc_irq, gsckbcintr, sc, sc->sc_dv.dv_xname);
+ gsc->sc_ih = gsc_intr_establish((struct gsc_softc *)sc->sc_dv.dv_parent,
+ gsc->sc_irq, IPL_TTY, gsckbcintr, sc, sc->sc_dv.dv_xname);
}
/*
diff --git a/sys/arch/hppa/gsc/harmony.c b/sys/arch/hppa/gsc/harmony.c
index 529c7b93ced..6a294c6b50a 100644
--- a/sys/arch/hppa/gsc/harmony.c
+++ b/sys/arch/hppa/gsc/harmony.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: harmony.c,v 1.22 2003/12/20 21:49:06 miod Exp $ */
+/* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */
/*
* Copyright (c) 2003 Jason L. Wright (jason@thought.net)
@@ -232,8 +232,8 @@ harmony_attach(parent, self, aux)
offsetof(struct harmony_empty, playback[0][0]),
PLAYBACK_EMPTYS * HARMONY_BUFSIZE, BUS_DMASYNC_PREWRITE);
- (void)gsc_intr_establish((struct gsc_softc *)parent,
- IPL_AUDIO, ga->ga_irq, harmony_intr, sc, sc->sc_dv.dv_xname);
+ (void)gsc_intr_establish((struct gsc_softc *)parent, ga->ga_irq,
+ IPL_AUDIO, harmony_intr, sc, sc->sc_dv.dv_xname);
/* set defaults */
sc->sc_in_port = HARMONY_IN_LINE;
diff --git a/sys/arch/hppa/gsc/hil_gsc.c b/sys/arch/hppa/gsc/hil_gsc.c
index dad5d3735d2..be3ba456ff4 100644
--- a/sys/arch/hppa/gsc/hil_gsc.c
+++ b/sys/arch/hppa/gsc/hil_gsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hil_gsc.c,v 1.3 2003/08/07 19:47:33 mickey Exp $ */
+/* $OpenBSD: hil_gsc.c,v 1.4 2004/02/13 21:28:19 mickey Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
* All rights reserved.
@@ -81,8 +81,8 @@ hil_gsc_attach(struct device *parent, struct device *self, void *aux)
hil_attach(sc, hil_is_console);
- gsc_intr_establish((struct gsc_softc *)parent, IPL_TTY,
- ga->ga_irq, hil_intr, sc, sc->sc_dev.dv_xname);
+ gsc_intr_establish((struct gsc_softc *)parent, ga->ga_irq, IPL_TTY,
+ hil_intr, sc, sc->sc_dev.dv_xname);
startuphook_establish(hil_attach_deferred, sc);
}
diff --git a/sys/arch/hppa/gsc/if_ie_gsc.c b/sys/arch/hppa/gsc/if_ie_gsc.c
index 125e17ab926..85259961206 100644
--- a/sys/arch/hppa/gsc/if_ie_gsc.c
+++ b/sys/arch/hppa/gsc/if_ie_gsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ie_gsc.c,v 1.22 2003/10/27 17:22:58 mickey Exp $ */
+/* $OpenBSD: if_ie_gsc.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */
/*
* Copyright (c) 1998,1999 Michael Shalayeff
@@ -393,6 +393,6 @@ ie_gsc_attach(parent, self, aux)
i82596_attach(sc, sc->sc_type, (char *)sc->sc_arpcom.ac_enaddr,
ie_gsc_media, IE_NMEDIA, ie_gsc_media[0]);
- sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent, IPL_NET,
- ga->ga_irq, i82596_intr, sc, sc->sc_dev.dv_xname);
+ sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent,
+ ga->ga_irq, IPL_NET, i82596_intr, sc, sc->sc_dev.dv_xname);
}
diff --git a/sys/arch/hppa/gsc/lpt_gsc.c b/sys/arch/hppa/gsc/lpt_gsc.c
index 9e3ab9cd821..72798dbff97 100644
--- a/sys/arch/hppa/gsc/lpt_gsc.c
+++ b/sys/arch/hppa/gsc/lpt_gsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpt_gsc.c,v 1.9 2003/08/07 19:47:33 mickey Exp $ */
+/* $OpenBSD: lpt_gsc.c,v 1.10 2004/02/13 21:28:19 mickey Exp $ */
/*
* Copyright (c) 1998 Michael Shalayeff
@@ -170,6 +170,6 @@ lpt_gsc_attach(parent, self, aux)
lpt_attach_common(sc);
- sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent, IPL_TTY,
- ga->ga_irq, lptintr, sc, sc->sc_dev.dv_xname);
+ sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent,
+ ga->ga_irq, IPL_TTY, lptintr, sc, sc->sc_dev.dv_xname);
}
diff --git a/sys/arch/hppa/gsc/osiop_gsc.c b/sys/arch/hppa/gsc/osiop_gsc.c
index a674c62c21d..f9b879148a0 100644
--- a/sys/arch/hppa/gsc/osiop_gsc.c
+++ b/sys/arch/hppa/gsc/osiop_gsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: osiop_gsc.c,v 1.9 2004/02/13 21:09:42 mickey Exp $ */
+/* $OpenBSD: osiop_gsc.c,v 1.10 2004/02/13 21:28:19 mickey Exp $ */
/* $NetBSD: osiop_gsc.c,v 1.6 2002/10/02 05:17:50 thorpej Exp $ */
/*
@@ -158,8 +158,8 @@ osiop_gsc_attach(parent, self, aux)
#endif /* OSIOP_DEBUG */
osiop_attach(sc);
- (void)gsc_intr_establish((struct gsc_softc *)parent, IPL_BIO,
- ga->ga_irq, osiop_gsc_intr, sc, sc->sc_dev.dv_xname);
+ (void)gsc_intr_establish((struct gsc_softc *)parent,
+ ga->ga_irq, IPL_BIO, osiop_gsc_intr, sc, sc->sc_dev.dv_xname);
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 07:09:14 +0000