summaryrefslogtreecommitdiffstats
path: root/sys/dev/isa/ast.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>1996-05-10 12:35:41 +0000
committerderaadt <deraadt@openbsd.org>1996-05-10 12:35:41 +0000
commit7a1e2957ddfe3b414f2f7af668511d06c4c23193 (patch)
tree355e004e12c00378eadd24f55d8fb1a748228d9b /sys/dev/isa/ast.c
parentAHA_MBO_FREE/AHA_MBI_FREE botch (diff)
downloadwireguard-openbsd-7a1e2957ddfe3b414f2f7af668511d06c4c23193.tar.xz
wireguard-openbsd-7a1e2957ddfe3b414f2f7af668511d06c4c23193.zip
proto updates
Diffstat (limited to 'sys/dev/isa/ast.c')
-rw-r--r--sys/dev/isa/ast.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index a092b796fc4..32331305bc5 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: ast.c,v 1.9 1996/04/27 21:08:46 niklas Exp $ */
-/* $NetBSD: ast.c,v 1.26 1996/04/15 18:55:23 cgd Exp $ */
+/* $OpenBSD: ast.c,v 1.10 1996/05/10 12:35:41 deraadt Exp $ */
+/* $NetBSD: ast.c,v 1.27 1996/05/05 19:49:54 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -35,6 +35,7 @@
*/
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
@@ -63,9 +64,10 @@ struct ast_softc {
bus_io_handle_t sc_slaveioh[NSLAVES];
};
-int astprobe();
-void astattach();
+int astprobe __P((struct device *, void *, void *));
+void astattach __P((struct device *, struct device *, void *));
int astintr __P((void *));
+int astprint __P((void *, char *));
struct cfattach ast_ca = {
sizeof(struct ast_softc), astprobe, astattach
@@ -77,7 +79,8 @@ struct cfdriver ast_cd = {
int
astprobe(parent, self, aux)
- struct device *parent, *self;
+ struct device *parent;
+ void *self;
void *aux;
{
struct isa_attach_args *ia = aux;
@@ -147,7 +150,8 @@ astattach(parent, self, aux)
struct ast_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
struct commulti_attach_args ca;
- int i, subunit;
+ bus_chipset_tag_t bc = ia->ia_bc;
+ int i;
sc->sc_bc = ia->ia_bc;
sc->sc_iobase = ia->ia_iobase;
@@ -165,8 +169,6 @@ astattach(parent, self, aux)
printf("\n");
for (i = 0; i < NSLAVES; i++) {
- struct cfdata *match;
-
ca.ca_slave = i;
ca.ca_bc = sc->sc_bc;
ca.ca_ioh = sc->sc_slaveioh[i];