Fix the declarations of the interrupt handlers to accept void * pointers
as the only argument and cast this as appropriate now that the function pointers to the interrupt registration functions are fully prototyped. Use <machine/conf.h> for the declarations of the device driver entry points.
This commit is contained in:
mark
parent
844495ceb6
commit
a497e39048
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kbd.c,v 1.15 1996/11/23 03:37:36 mark Exp $ */
|
||||
/* $NetBSD: kbd.c,v 1.16 1997/01/28 04:55:16 mark Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Mark Brinicombe.
|
||||
|
|
@ -65,6 +65,7 @@
|
|||
#include <machine/vidc.h>
|
||||
#include <machine/katelib.h>
|
||||
#include <machine/kbd.h>
|
||||
#include <machine/conf.h>
|
||||
#include <arm32/mainbus/mainbus.h>
|
||||
#include "vt.h"
|
||||
#include "kbd.h"
|
||||
|
|
@ -599,12 +600,6 @@ struct kbd_softc {
|
|||
int kbdprobe __P((struct device *, void *, void *));
|
||||
void kbdattach __P((struct device *, struct device *, void *));
|
||||
|
||||
int kbdopen __P((dev_t, int, int, struct proc *));
|
||||
int kbdclose __P((dev_t, int, int, struct proc *));
|
||||
int kbdread __P((dev_t, struct uio *, int));
|
||||
int kbdselect __P((dev_t, int, struct proc *));
|
||||
int kbdioctl __P((dev_t, int, caddr_t, int, struct proc *));
|
||||
|
||||
int kbdreset __P((void));
|
||||
void kbd_flush_input __P((void));
|
||||
int kbdcmd __P((u_char cmd));
|
||||
|
|
@ -612,7 +607,7 @@ void kbdsetleds __P((int /*leds*/));
|
|||
|
||||
int PollKeyboard __P((int));
|
||||
int kbddecodekey __P((struct kbd_softc *, int));
|
||||
int kbdintr __P((struct kbd_softc *));
|
||||
int kbdintr __P((void *arg));
|
||||
|
||||
void autorepeatstart __P((void *));
|
||||
void autorepeat __P((void *));
|
||||
|
|
@ -897,7 +892,7 @@ kbdpoll(dev, events, p)
|
|||
int
|
||||
kbdioctl(dev, cmd, data, flag, p)
|
||||
dev_t dev;
|
||||
int cmd;
|
||||
u_long cmd;
|
||||
caddr_t data;
|
||||
int flag;
|
||||
struct proc *p;
|
||||
|
|
@ -1217,9 +1212,10 @@ getkey_polled()
|
|||
/* Keyboard IRQ handler */
|
||||
|
||||
int
|
||||
kbdintr(sc)
|
||||
struct kbd_softc *sc;
|
||||
kbdintr(arg)
|
||||
void *arg;
|
||||
{
|
||||
struct kbd_softc *sc = arg;
|
||||
int key;
|
||||
|
||||
/* Read the IOMD keyboard register and process the key */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pms.c,v 1.9 1997/01/06 04:47:58 mark Exp $ */
|
||||
/* $NetBSD: pms.c,v 1.10 1997/01/28 04:55:17 mark Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996 D.C. Tsen
|
||||
|
|
@ -62,6 +62,7 @@
|
|||
#include <machine/cpu.h>
|
||||
#include <machine/katelib.h>
|
||||
#include <machine/irqhandler.h>
|
||||
#include <machine/conf.h>
|
||||
#include <machine/iomd.h>
|
||||
#include <machine/mouse.h>
|
||||
#include <arm32/mainbus/mainbus.h>
|
||||
|
|
@ -101,9 +102,10 @@ struct pms_softc { /* driver status information */
|
|||
int pmsprobe __P((struct device *, void *, void *));
|
||||
void pmsattach __P((struct device *, struct device *, void *));
|
||||
int pmsintr __P((void *));
|
||||
int pmsinit __P(());
|
||||
int pmsinit __P((void));
|
||||
void pmswatchdog __P((void *));
|
||||
void pmsputbuffer __P((struct pms_softc *sc, struct mousebufrec *buf));
|
||||
static __inline void pms_flush __P((void));
|
||||
|
||||
struct cfattach pms_ca = {
|
||||
sizeof(struct pms_softc), pmsprobe, pmsattach
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: qms.c,v 1.12 1996/11/23 03:37:39 mark Exp $ */
|
||||
/* $NetBSD: qms.c,v 1.13 1997/01/28 04:55:18 mark Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) Scott Stevens 1995 All rights reserved
|
||||
|
|
@ -56,6 +56,7 @@
|
|||
#include <arm32/mainbus/mainbus.h>
|
||||
#include <machine/irqhandler.h>
|
||||
#include <machine/katelib.h>
|
||||
#include <machine/conf.h>
|
||||
#include <machine/iomd.h>
|
||||
#include <machine/mouse.h>
|
||||
|
||||
|
|
@ -85,10 +86,8 @@ struct quadmouse_softc {
|
|||
|
||||
int quadmouseprobe __P((struct device *, void *, void *));
|
||||
void quadmouseattach __P((struct device *, struct device *, void *));
|
||||
int quadmouseopen __P((dev_t, int, int, struct proc *));
|
||||
int quadmouseclose __P((dev_t, int, int, struct proc *));
|
||||
|
||||
int quadmouseintr __P((struct quadmouse_softc *sc));
|
||||
int quadmouseintr __P((void *arg));
|
||||
void quadmouseputbuffer __P((struct quadmouse_softc *sc, struct mousebufrec *buf));
|
||||
|
||||
struct cfattach quadmouse_ca = {
|
||||
|
|
@ -311,7 +310,7 @@ quadmouseread(dev, uio, flag)
|
|||
int
|
||||
quadmouseioctl(dev, cmd, data, flag, p)
|
||||
dev_t dev;
|
||||
int cmd;
|
||||
u_long cmd;
|
||||
caddr_t data;
|
||||
int flag;
|
||||
struct proc *p;
|
||||
|
|
@ -434,9 +433,10 @@ quadmouseioctl(dev, cmd, data, flag, p)
|
|||
|
||||
|
||||
int
|
||||
quadmouseintr(sc)
|
||||
struct quadmouse_softc *sc;
|
||||
quadmouseintr(arg)
|
||||
void *arg;
|
||||
{
|
||||
struct quadmouse_softc *sc = arg;
|
||||
int s;
|
||||
struct mousebufrec buffer;
|
||||
int dosignal=0;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: beep.c,v 1.8 1996/11/23 03:37:35 mark Exp $ */
|
||||
/* $NetBSD: beep.c,v 1.9 1997/01/28 04:55:15 mark Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Mark Brinicombe
|
||||
|
|
@ -89,7 +89,7 @@ int beepprobe __P((struct device *parent, void *match, void *aux));
|
|||
void beepattach __P((struct device *parent, struct device *self, void *aux));
|
||||
int beepopen __P((dev_t, int, int, struct proc *));
|
||||
int beepclose __P((dev_t, int, int, struct proc *));
|
||||
int beepintr __P((struct beep_softc *sc));
|
||||
int beepintr __P((void *arg));
|
||||
void beepdma __P((struct beep_softc *sc, int buf));
|
||||
|
||||
static int sdma_channel;
|
||||
|
|
@ -371,9 +371,10 @@ beepioctl(dev, cmd, data, flag, p)
|
|||
|
||||
|
||||
int
|
||||
beepintr(sc)
|
||||
struct beep_softc *sc;
|
||||
beepintr(arg)
|
||||
void *arg;
|
||||
{
|
||||
struct beep_softc *sc = arg;
|
||||
/* WriteByte(IOMD_DMARQ, 0x10);*/
|
||||
--sc->sc_count;
|
||||
if (sc->sc_count <= 0) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kbd.c,v 1.15 1996/11/23 03:37:36 mark Exp $ */
|
||||
/* $NetBSD: kbd.c,v 1.16 1997/01/28 04:55:16 mark Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Mark Brinicombe.
|
||||
|
|
@ -65,6 +65,7 @@
|
|||
#include <machine/vidc.h>
|
||||
#include <machine/katelib.h>
|
||||
#include <machine/kbd.h>
|
||||
#include <machine/conf.h>
|
||||
#include <arm32/mainbus/mainbus.h>
|
||||
#include "vt.h"
|
||||
#include "kbd.h"
|
||||
|
|
@ -599,12 +600,6 @@ struct kbd_softc {
|
|||
int kbdprobe __P((struct device *, void *, void *));
|
||||
void kbdattach __P((struct device *, struct device *, void *));
|
||||
|
||||
int kbdopen __P((dev_t, int, int, struct proc *));
|
||||
int kbdclose __P((dev_t, int, int, struct proc *));
|
||||
int kbdread __P((dev_t, struct uio *, int));
|
||||
int kbdselect __P((dev_t, int, struct proc *));
|
||||
int kbdioctl __P((dev_t, int, caddr_t, int, struct proc *));
|
||||
|
||||
int kbdreset __P((void));
|
||||
void kbd_flush_input __P((void));
|
||||
int kbdcmd __P((u_char cmd));
|
||||
|
|
@ -612,7 +607,7 @@ void kbdsetleds __P((int /*leds*/));
|
|||
|
||||
int PollKeyboard __P((int));
|
||||
int kbddecodekey __P((struct kbd_softc *, int));
|
||||
int kbdintr __P((struct kbd_softc *));
|
||||
int kbdintr __P((void *arg));
|
||||
|
||||
void autorepeatstart __P((void *));
|
||||
void autorepeat __P((void *));
|
||||
|
|
@ -897,7 +892,7 @@ kbdpoll(dev, events, p)
|
|||
int
|
||||
kbdioctl(dev, cmd, data, flag, p)
|
||||
dev_t dev;
|
||||
int cmd;
|
||||
u_long cmd;
|
||||
caddr_t data;
|
||||
int flag;
|
||||
struct proc *p;
|
||||
|
|
@ -1217,9 +1212,10 @@ getkey_polled()
|
|||
/* Keyboard IRQ handler */
|
||||
|
||||
int
|
||||
kbdintr(sc)
|
||||
struct kbd_softc *sc;
|
||||
kbdintr(arg)
|
||||
void *arg;
|
||||
{
|
||||
struct kbd_softc *sc = arg;
|
||||
int key;
|
||||
|
||||
/* Read the IOMD keyboard register and process the key */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pms.c,v 1.9 1997/01/06 04:47:58 mark Exp $ */
|
||||
/* $NetBSD: pms.c,v 1.10 1997/01/28 04:55:17 mark Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996 D.C. Tsen
|
||||
|
|
@ -62,6 +62,7 @@
|
|||
#include <machine/cpu.h>
|
||||
#include <machine/katelib.h>
|
||||
#include <machine/irqhandler.h>
|
||||
#include <machine/conf.h>
|
||||
#include <machine/iomd.h>
|
||||
#include <machine/mouse.h>
|
||||
#include <arm32/mainbus/mainbus.h>
|
||||
|
|
@ -101,9 +102,10 @@ struct pms_softc { /* driver status information */
|
|||
int pmsprobe __P((struct device *, void *, void *));
|
||||
void pmsattach __P((struct device *, struct device *, void *));
|
||||
int pmsintr __P((void *));
|
||||
int pmsinit __P(());
|
||||
int pmsinit __P((void));
|
||||
void pmswatchdog __P((void *));
|
||||
void pmsputbuffer __P((struct pms_softc *sc, struct mousebufrec *buf));
|
||||
static __inline void pms_flush __P((void));
|
||||
|
||||
struct cfattach pms_ca = {
|
||||
sizeof(struct pms_softc), pmsprobe, pmsattach
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: qmouse.c,v 1.12 1996/11/23 03:37:39 mark Exp $ */
|
||||
/* $NetBSD: qmouse.c,v 1.13 1997/01/28 04:55:18 mark Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) Scott Stevens 1995 All rights reserved
|
||||
|
|
@ -56,6 +56,7 @@
|
|||
#include <arm32/mainbus/mainbus.h>
|
||||
#include <machine/irqhandler.h>
|
||||
#include <machine/katelib.h>
|
||||
#include <machine/conf.h>
|
||||
#include <machine/iomd.h>
|
||||
#include <machine/mouse.h>
|
||||
|
||||
|
|
@ -85,10 +86,8 @@ struct quadmouse_softc {
|
|||
|
||||
int quadmouseprobe __P((struct device *, void *, void *));
|
||||
void quadmouseattach __P((struct device *, struct device *, void *));
|
||||
int quadmouseopen __P((dev_t, int, int, struct proc *));
|
||||
int quadmouseclose __P((dev_t, int, int, struct proc *));
|
||||
|
||||
int quadmouseintr __P((struct quadmouse_softc *sc));
|
||||
int quadmouseintr __P((void *arg));
|
||||
void quadmouseputbuffer __P((struct quadmouse_softc *sc, struct mousebufrec *buf));
|
||||
|
||||
struct cfattach quadmouse_ca = {
|
||||
|
|
@ -311,7 +310,7 @@ quadmouseread(dev, uio, flag)
|
|||
int
|
||||
quadmouseioctl(dev, cmd, data, flag, p)
|
||||
dev_t dev;
|
||||
int cmd;
|
||||
u_long cmd;
|
||||
caddr_t data;
|
||||
int flag;
|
||||
struct proc *p;
|
||||
|
|
@ -434,9 +433,10 @@ quadmouseioctl(dev, cmd, data, flag, p)
|
|||
|
||||
|
||||
int
|
||||
quadmouseintr(sc)
|
||||
struct quadmouse_softc *sc;
|
||||
quadmouseintr(arg)
|
||||
void *arg;
|
||||
{
|
||||
struct quadmouse_softc *sc = arg;
|
||||
int s;
|
||||
struct mousebufrec buffer;
|
||||
int dosignal=0;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: beep.c,v 1.8 1996/11/23 03:37:35 mark Exp $ */
|
||||
/* $NetBSD: beep.c,v 1.9 1997/01/28 04:55:15 mark Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Mark Brinicombe
|
||||
|
|
@ -89,7 +89,7 @@ int beepprobe __P((struct device *parent, void *match, void *aux));
|
|||
void beepattach __P((struct device *parent, struct device *self, void *aux));
|
||||
int beepopen __P((dev_t, int, int, struct proc *));
|
||||
int beepclose __P((dev_t, int, int, struct proc *));
|
||||
int beepintr __P((struct beep_softc *sc));
|
||||
int beepintr __P((void *arg));
|
||||
void beepdma __P((struct beep_softc *sc, int buf));
|
||||
|
||||
static int sdma_channel;
|
||||
|
|
@ -371,9 +371,10 @@ beepioctl(dev, cmd, data, flag, p)
|
|||
|
||||
|
||||
int
|
||||
beepintr(sc)
|
||||
struct beep_softc *sc;
|
||||
beepintr(arg)
|
||||
void *arg;
|
||||
{
|
||||
struct beep_softc *sc = arg;
|
||||
/* WriteByte(IOMD_DMARQ, 0x10);*/
|
||||
--sc->sc_count;
|
||||
if (sc->sc_count <= 0) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue