Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/iomd Un-__P, ANSIfy and light KNF.
details: https://anonhg.NetBSD.org/src/rev/aee98db0d01d
branches: trunk
changeset: 532843:aee98db0d01d
user: bjh21 <bjh21%NetBSD.org@localhost>
date: Sun Jun 16 12:30:13 2002 +0000
description:
Un-__P, ANSIfy and light KNF.
diffstat:
sys/arch/arm/iomd/beep.c | 57 ++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 38 deletions(-)
diffs (138 lines):
diff -r 831a11958509 -r aee98db0d01d sys/arch/arm/iomd/beep.c
--- a/sys/arch/arm/iomd/beep.c Sun Jun 16 12:24:23 2002 +0000
+++ b/sys/arch/arm/iomd/beep.c Sun Jun 16 12:30:13 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: beep.c,v 1.9 2002/06/16 12:24:23 bjh21 Exp $ */
+/* $NetBSD: beep.c,v 1.10 2002/06/16 12:30:13 bjh21 Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe
@@ -42,7 +42,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: beep.c,v 1.9 2002/06/16 12:24:23 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beep.c,v 1.10 2002/06/16 12:30:13 bjh21 Exp $");
#include <sys/systm.h>
#include <sys/conf.h>
@@ -82,12 +82,12 @@
vaddr_t sc_buffer1;
};
-int beepprobe __P((struct device *parent, struct cfdata *cf, 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((void *arg));
-void beepdma __P((struct beep_softc *sc, int buf));
+int beepprobe (struct device *, struct cfdata *, void *);
+void beepattach (struct device *, struct device *, void *);
+int beepopen (dev_t, int, int, struct proc *);
+int beepclose (dev_t, int, int, struct proc *);
+int beepintr (void *arg);
+void beepdma (struct beep_softc *sc, int buf);
static int sdma_channel;
@@ -98,10 +98,7 @@
extern struct cfdriver beep_cd;
int
-beepprobe(parent, cf, aux)
- struct device *parent;
- struct cfdata *cf;
- void *aux;
+beepprobe(struct device *parent, struct cfdata *cf, void *aux)
{
int id;
@@ -126,10 +123,7 @@
void
-beepattach(parent, self, aux)
- struct device *parent;
- struct device *self;
- void *aux;
+beepattach(struct device *parent, struct device *self, void *aux)
{
struct beep_softc *sc = (void *)self;
@@ -167,7 +161,8 @@
sc->sc_ih.ih_name = "dma snd ch 0";
if (irq_claim(sdma_channel, &sc->sc_ih))
- panic("Cannot claim IRQ %d for beep%d\n", sdma_channel, parent->dv_unit);
+ panic("Cannot claim IRQ %d for beep%d\n",
+ sdma_channel, parent->dv_unit);
disable_irq(sdma_channel);
@@ -193,11 +188,7 @@
int
-beepopen(dev, flag, mode, p)
- dev_t dev;
- int flag;
- int mode;
- struct proc *p;
+beepopen(dev_t dev, int flag, int mode, struct proc *p)
{
struct beep_softc *sc;
int unit = minor(dev);
@@ -224,11 +215,7 @@
int
-beepclose(dev, flag, mode, p)
- dev_t dev;
- int flag;
- int mode;
- struct proc *p;
+beepclose(dev_t dev, int flag, int mode, struct proc *p)
{
int unit = minor(dev);
struct beep_softc *sc = beep_cd.cd_devs[unit];
@@ -269,12 +256,7 @@
int
-beepioctl(dev, cmd, data, flag, p)
- dev_t dev;
- u_long cmd;
- caddr_t data;
- int flag;
- struct proc *p;
+beepioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
struct beep_softc *sc = beep_cd.cd_devs[minor(dev)];
int rate;
@@ -314,10 +296,10 @@
int
-beepintr(arg)
- void *arg;
+beepintr(void *arg)
{
struct beep_softc *sc = arg;
+
/* IOMD_WRITE_BYTE(IOMD_DMARQ, 0x10);*/
--sc->sc_count;
if (sc->sc_count <= 0) {
@@ -334,11 +316,10 @@
void
-beepdma(sc, buf)
- struct beep_softc *sc;
- int buf;
+beepdma(struct beep_softc *sc, int buf)
{
int status;
+
/* printf("beep:dma %d", buf); */
status = IOMD_READ_BYTE(IOMD_SD0ST);
/* printf("st=%02x\n", status);*/
Home |
Main Index |
Thread Index |
Old Index