summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2009-12-04 09:49:22 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2009-12-04 09:49:22 +0000
commit9d7fdb58fa366bff4482f47977f3a7aecc0bb4f0 (patch)
tree143ea7339764bde86317066c8131a6082c032113 /sys/dev
parentcf17c928ebba7f2d9cbe85ae777397c2a4ed7c82 (diff)
ansify.
ok md5@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/spkr.c43
1 files changed, 9 insertions, 34 deletions
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 51857ccc796..3081c656223 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkr.c,v 1.11 2009/10/31 01:13:00 fgsch Exp $ */
+/* $OpenBSD: spkr.c,v 1.12 2009/12/04 09:49:21 jasper Exp $ */
/* $NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
/*
@@ -183,8 +183,7 @@ playinit()
/* play tone of proper duration for current rhythm signature */
static void
-playtone(pitch, value, sustain)
- int pitch, value, sustain;
+playtone(int pitch, int value, int sustain)
{
int sound, silence, snum = 1, sdenom = 1;
@@ -216,9 +215,7 @@ playtone(pitch, value, sustain)
/* interpret and play an item from a notation string */
static void
-playstring(cp, slen)
- char *cp;
- int slen;
+playstring(char *cp, int slen)
{
int pitch, lastpitch = OCTAVE_NOTES * DFLT_OCTAVE;
@@ -395,19 +392,13 @@ static void *spkr_inbuf;
static int spkr_attached = 0;
int
-spkrprobe(parent, match, aux)
- struct device *parent;
- void *match;
- void *aux;
+spkrprobe(struct device *parent, void *match, void *aux)
{
return (!spkr_attached);
}
void
-spkrattach(parent, self, aux)
- struct device *parent;
- struct device *self;
- void *aux;
+spkrattach(struct device *parent, struct device *self, void *aux)
{
printf("\n");
ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
@@ -415,11 +406,7 @@ spkrattach(parent, self, aux)
}
int
-spkropen(dev, flags, mode, p)
- dev_t dev;
- int flags;
- int mode;
- struct proc *p;
+spkropen(dev_t dev, int flags, int mode, struct proc *p)
{
#ifdef SPKRDEBUG
printf("spkropen: entering with dev = %x\n", dev);
@@ -438,10 +425,7 @@ spkropen(dev, flags, mode, p)
}
int
-spkrwrite(dev, uio, flags)
- dev_t dev;
- struct uio *uio;
- int flags;
+spkrwrite(dev_t dev, struct uio *uio, int flags)
{
int n;
int error;
@@ -462,11 +446,7 @@ spkrwrite(dev, uio, flags)
}
int
-spkrclose(dev, flags, mode, p)
- dev_t dev;
- int flags;
- int mode;
- struct proc *p;
+spkrclose(dev_t dev, int flags, int mode, struct proc *p)
{
#ifdef SPKRDEBUG
printf("spkrclose: entering with dev = %x\n", dev);
@@ -483,12 +463,7 @@ spkrclose(dev, flags, mode, p)
}
int
-spkrioctl(dev, cmd, data, flag, p)
- dev_t dev;
- u_long cmd;
- caddr_t data;
- int flag;
- struct proc *p;
+spkrioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
tone_t *tp, ttp;
int error;