Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch add missing protos, clean up includes.
details: https://anonhg.NetBSD.org/src/rev/a9e8fb3d11c1
branches: trunk
changeset: 537779:a9e8fb3d11c1
user: chs <chs%NetBSD.org@localhost>
date: Sat Oct 05 17:16:33 2002 +0000
description:
add missing protos, clean up includes.
diffstat:
sys/arch/acorn26/conf/Makefile.acorn26 | 3 +-
sys/arch/acorn32/conf/Makefile.acorn32 | 3 +-
sys/arch/acorn32/podulebus/amps.c | 10 ++-
sys/arch/acorn32/podulebus/cosc.c | 24 +++++-----
sys/arch/acorn32/podulebus/csc.c | 56 +++++++++++++------------
sys/arch/acorn32/podulebus/esc.c | 13 +++--
sys/arch/acorn32/podulebus/escvar.h | 14 +++---
sys/arch/acorn32/podulebus/netslot.c | 5 +-
sys/arch/acorn32/podulebus/ptsc.c | 59 ++++++++++++--------------
sys/arch/acorn32/podulebus/sfas.c | 57 +++++++++++++++----------
sys/arch/acorn32/podulebus/sfasvar.h | 25 +++++-----
sys/arch/arm/conf/Makefile.arm | 4 +-
sys/arch/arm/iomd/console/console.c | 54 +++++++++++++++++-------
sys/arch/arm/iomd/console/console.h | 9 ++++
sys/arch/arm/iomd/console/dumb.c | 7 ++-
sys/arch/arm/iomd/console/vidcconsole.c | 12 +---
sys/arch/arm/iomd/console/vidcrender.c | 65 ++++++++++++++++++++---------
sys/arch/arm/iomd/console/vt220.c | 72 +++++++++++++++++++++++++++-----
sys/arch/arm/iomd/kbd.c | 12 ++---
19 files changed, 305 insertions(+), 199 deletions(-)
diffs (truncated from 1133 to 300 lines):
diff -r d1fbb3ac0996 -r a9e8fb3d11c1 sys/arch/acorn26/conf/Makefile.acorn26
--- a/sys/arch/acorn26/conf/Makefile.acorn26 Sat Oct 05 17:12:51 2002 +0000
+++ b/sys/arch/acorn26/conf/Makefile.acorn26 Sat Oct 05 17:16:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.acorn26,v 1.2 2002/06/24 07:15:24 jdolecek Exp $
+# $NetBSD: Makefile.acorn26,v 1.3 2002/10/05 17:16:33 chs Exp $
# Makefile for NetBSD
#
@@ -33,7 +33,6 @@
##
CPPFLAGS+= -Dacorn26
CWARNFLAGS+= -Wcomment
-LOOSE_PROTOTYPES= yes
# We'd like GCC to leave R14 alone as much as possible (so page faults in the
# kernel are safer).
CFLAGS+= -ffixed-r14
diff -r d1fbb3ac0996 -r a9e8fb3d11c1 sys/arch/acorn32/conf/Makefile.acorn32
--- a/sys/arch/acorn32/conf/Makefile.acorn32 Sat Oct 05 17:12:51 2002 +0000
+++ b/sys/arch/acorn32/conf/Makefile.acorn32 Sat Oct 05 17:16:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.acorn32,v 1.14 2002/06/01 23:24:15 bjh21 Exp $
+# $NetBSD: Makefile.acorn32,v 1.15 2002/10/05 17:16:34 chs Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,6 @@
##
CPPFLAGS+= -Darm32
CWARNFLAGS+= -Wcomment
-LOOSE_PROTOTYPES= yes
AFLAGS+= -x assembler-with-cpp
##
diff -r d1fbb3ac0996 -r a9e8fb3d11c1 sys/arch/acorn32/podulebus/amps.c
--- a/sys/arch/acorn32/podulebus/amps.c Sat Oct 05 17:12:51 2002 +0000
+++ b/sys/arch/acorn32/podulebus/amps.c Sat Oct 05 17:16:33 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amps.c,v 1.6 2002/10/02 03:31:59 thorpej Exp $ */
+/* $NetBSD: amps.c,v 1.7 2002/10/05 17:16:34 chs Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -90,13 +90,15 @@
bus_space_tag_t sc_iot; /* Bus tag */
};
-int amps_probe __P((struct device *, struct cfdata *, void *));
-void amps_attach __P((struct device *, struct device *, void *));
-void amps_shutdown __P((void *arg));
+int amps_probe(struct device *, struct cfdata *, void *);
+void amps_attach(struct device *, struct device *, void *);
CFATTACH_DECL(amps, sizeof(struct amps_softc),
amps_probe, amps_attach, NULL, NULL);
+int amps_print(void *, const char *);
+void amps_shutdown(void *);
+
/*
* Attach arguments for child devices.
* Pass the podule details, the parent softc and the channel
diff -r d1fbb3ac0996 -r a9e8fb3d11c1 sys/arch/acorn32/podulebus/cosc.c
--- a/sys/arch/acorn32/podulebus/cosc.c Sat Oct 05 17:12:51 2002 +0000
+++ b/sys/arch/acorn32/podulebus/cosc.c Sat Oct 05 17:16:33 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cosc.c,v 1.9 2002/10/02 03:31:59 thorpej Exp $ */
+/* $NetBSD: cosc.c,v 1.10 2002/10/05 17:16:34 chs Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -59,26 +59,26 @@
#include <acorn32/podulebus/coscvar.h>
#include <dev/podulebus/podules.h>
-void coscattach __P((struct device *, struct device *, void *));
-int coscmatch __P((struct device *, struct cfdata *, void *));
+void coscattach(struct device *, struct device *, void *);
+int coscmatch(struct device *, struct cfdata *, void *);
CFATTACH_DECL(cosc, sizeof(struct cosc_softc),
coscmatch, coscattach, NULL, NULL);
-int cosc_intr __P((void *arg));
-int cosc_setup_dma __P((struct esc_softc *sc, void *ptr, int len,
- int mode));
-int cosc_build_dma_chain __P((struct esc_softc *sc,
- struct esc_dma_chain *chain, void *p, int l));
-int cosc_need_bump __P((struct esc_softc *sc, void *ptr, int len));
-
-void cosc_led __P((struct esc_softc *sc, int mode));
+int cosc_intr(void *);
+int cosc_setup_dma(struct esc_softc *, void *, int, int);
+int cosc_build_dma_chain(struct esc_softc *, struct esc_dma_chain *, void *,
+ int);
+int cosc_need_bump(struct esc_softc *, void *, int);
+void cosc_led(struct esc_softc *, int);
+void cosc_set_dma_adr(struct esc_softc *, void *);
+void cosc_set_dma_tc(struct esc_softc *, unsigned int);
+void cosc_set_dma_mode(struct esc_softc *, int);
#if COSC_POLL > 0
int cosc_poll = 1;
#endif
-
int
coscmatch(pdp, cf, auxp)
struct device *pdp;
diff -r d1fbb3ac0996 -r a9e8fb3d11c1 sys/arch/acorn32/podulebus/csc.c
--- a/sys/arch/acorn32/podulebus/csc.c Sat Oct 05 17:12:51 2002 +0000
+++ b/sys/arch/acorn32/podulebus/csc.c Sat Oct 05 17:16:33 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: csc.c,v 1.8 2002/10/02 03:31:59 thorpej Exp $ */
+/* $NetBSD: csc.c,v 1.9 2002/10/05 17:16:34 chs Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -47,8 +47,6 @@
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
-#include <uvm/uvm_extern.h>
-#include <machine/pmap.h>
#include <machine/io.h>
#include <machine/intr.h>
#include <machine/bootconfig.h>
@@ -60,19 +58,21 @@
#include <dev/podulebus/podules.h>
#include <dev/podulebus/powerromreg.h>
-void cscattach __P((struct device *, struct device *, void *));
-int cscmatch __P((struct device *, struct cfdata *, void *));
+int cscmatch(struct device *, struct cfdata *, void *);
+void cscattach(struct device *, struct device *, void *);
CFATTACH_DECL(csc, sizeof(struct csc_softc),
cscmatch, cscattach, NULL, NULL);
-int csc_intr __P((void *arg));
-int csc_setup_dma __P((struct sfas_softc *sc, void *ptr, int len,
- int mode));
-int csc_build_dma_chain __P((struct sfas_softc *sc,
- struct sfas_dma_chain *chain, void *p, int l));
-int csc_need_bump __P((struct sfas_softc *sc, void *ptr, int len));
-void csc_led __P((struct sfas_softc *sc, int mode));
+int csc_intr(void *);
+int csc_setup_dma(void *, void *, int, int);
+int csc_build_dma_chain(void *, void *, void *, int);
+int csc_need_bump(void *, void *, int);
+void csc_led(void *, int);
+
+void csc_set_dma_adr(struct sfas_softc *, void *);
+void csc_set_dma_tc(struct sfas_softc *, unsigned int);
+void csc_set_dma_mode(struct sfas_softc *, int);
/*
* if we are a Cumana SCSI-2 card
@@ -267,20 +267,21 @@
/* Initialize DMA for transfer */
int
csc_setup_dma(sc, ptr, len, mode)
- struct sfas_softc *sc;
- void *ptr;
- int len;
- int mode;
+ void *sc;
+ void *ptr;
+ int len;
+ int mode;
{
- return(0);
+
+ return (0);
}
/* Check if address and len is ok for DMA transfer */
int
csc_need_bump(sc, ptr, len)
- struct sfas_softc *sc;
- void *ptr;
- int len;
+ void *sc;
+ void *ptr;
+ int len;
{
int p;
@@ -299,20 +300,21 @@
/* Interrupt driven routines */
int
csc_build_dma_chain(sc, chain, p, l)
- struct sfas_softc *sc;
- struct sfas_dma_chain *chain;
- void *p;
- int l;
+ void *sc;
+ void *chain;
+ void *p;
+ int l;
{
return(0);
}
/* Turn on/off led */
void
-csc_led(sc, mode)
- struct sfas_softc *sc;
- int mode;
+csc_led(v, mode)
+ void *v;
+ int mode;
{
+ struct sfas_softc *sc = v;
csc_regmap_p rp;
rp = (csc_regmap_p)sc->sc_fas;
diff -r d1fbb3ac0996 -r a9e8fb3d11c1 sys/arch/acorn32/podulebus/esc.c
--- a/sys/arch/acorn32/podulebus/esc.c Sat Oct 05 17:12:51 2002 +0000
+++ b/sys/arch/acorn32/podulebus/esc.c Sat Oct 05 17:16:33 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: esc.c,v 1.8 2002/08/22 01:13:54 thorpej Exp $ */
+/* $NetBSD: esc.c,v 1.9 2002/10/05 17:16:34 chs Exp $ */
/*
* Copyright (c) 1995 Scott Stevens
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__RCSID("$NetBSD: esc.c,v 1.8 2002/08/22 01:13:54 thorpej Exp $");
+__RCSID("$NetBSD: esc.c,v 1.9 2002/10/05 17:16:34 chs Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -876,7 +876,7 @@
* reselection. Much nicer this way.
*/
if ((mode & ESC_SELECT_I) || (dev->sc_config_flags & ESC_NO_DMA)) {
- nexus->dma[0].ptr = (vm_offset_t)buf;
+ nexus->dma[0].ptr = buf;
nexus->dma[0].len = len;
nexus->dma[0].flg = ESC_CHAIN_PRG;
nexus->max_link = 1;
@@ -1229,10 +1229,11 @@
dev->sc_len -= len-left;
dev->sc_buf += len-left;
- dev->sc_dma_buf += len-left;
- dev->sc_dma_len = left;
+ dev->sc_dma_buf = (char *)dev->sc_dma_buf + len-left;
+ dev->sc_dma_len = left;
- dev->sc_dma_blk_ptr += len-left;
+ dev->sc_dma_blk_ptr = (char *)dev->sc_dma_blk_ptr +
+ len-left;
dev->sc_dma_blk_len -= len-left;
/*
diff -r d1fbb3ac0996 -r a9e8fb3d11c1 sys/arch/acorn32/podulebus/escvar.h
--- a/sys/arch/acorn32/podulebus/escvar.h Sat Oct 05 17:12:51 2002 +0000
+++ b/sys/arch/acorn32/podulebus/escvar.h Sat Oct 05 17:16:33 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: escvar.h,v 1.2 2002/02/18 19:55:01 bjh21 Exp $ */
+/* $NetBSD: escvar.h,v 1.3 2002/10/05 17:16:34 chs Exp $ */
/*
* Copyright (c) 1995 Daniel Widenfalk
@@ -55,7 +55,7 @@
* adress.
*/
struct esc_dma_chain {
- vm_offset_t ptr;
+ void *ptr;
u_short len;
short flg;
};
@@ -91,10 +91,10 @@
u_char *buf; /* Virtual adress of data */
int len; /* Bytes left to transfer */
- vm_offset_t dma_buf; /* Current DMA adress */
+ void *dma_buf; /* Current DMA adress */
int dma_len; /* Current DMA length */
- vm_offset_t dma_blk_ptr; /* Current chain adress */
+ void *dma_blk_ptr; /* Current chain adress */
int dma_blk_len; /* Current chain length */
u_char dma_blk_flg; /* Current chain flags */
@@ -164,7 +164,7 @@
void *sc_spec; /* Board-specific data */
u_char *sc_bump_va; /* Bumpbuf virtual adr */
- vm_offset_t sc_bump_pa; /* Bumpbuf physical adr */
+ void *sc_bump_pa; /* Bumpbuf physical adr */
int sc_bump_sz; /* Bumpbuf size */
/* Configuration registers, must be set BEFORE escinitialize */
@@ -194,9 +194,9 @@
Home |
Main Index |
Thread Index |
Old Index