From 67d88b0a9910a68bb666b448d2dac29cb4d3d8c2 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sun, 21 Apr 1996 22:33:19 +0000
Subject: partial sync with netbsd 960418, more to come

---
 sys/arch/amiga/dev/atzsc.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'sys/arch/amiga/dev/atzsc.c')

diff --git a/sys/arch/amiga/dev/atzsc.c b/sys/arch/amiga/dev/atzsc.c
index 55d69a25e42..2073fda49a5 100644
--- a/sys/arch/amiga/dev/atzsc.c
+++ b/sys/arch/amiga/dev/atzsc.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: atzsc.c,v 1.13 1995/09/04 13:04:42 chopps Exp $	*/
+/*	$OpenBSD: atzsc.c,v 1.2 1996/04/21 22:14:59 deraadt Exp $	*/
+/*	$NetBSD: atzsc.c,v 1.15 1996/03/18 04:58:37 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -53,7 +54,7 @@
 
 int atzscprint __P((void *auxp, char *));
 void atzscattach __P((struct device *, struct device *, void *));
-int atzscmatch __P((struct device *, struct cfdata *, void *));
+int atzscmatch __P((struct device *, void *, void *));
 
 void atzsc_enintr __P((struct sbic_softc *));
 void atzsc_dmastop __P((struct sbic_softc *));
@@ -80,19 +81,23 @@ struct scsi_device atzsc_scsidev = {
 int	atzsc_dmadebug = 0;
 #endif
 
-struct cfdriver atzsccd = {
-	NULL, "atzsc", (cfmatch_t)atzscmatch, atzscattach,
-	DV_DULL, sizeof(struct sbic_softc), NULL, 0 };
+struct cfattach atzsc_ca = {
+	sizeof(struct sbic_softc), atzscmatch, atzscattach
+};
+
+struct cfdriver atzsc_cd = {
+	NULL, "atzsc", DV_DULL, NULL, 0
+};
 
 /*
  * if we are an A3000 we are here.
  */
 int
-atzscmatch(pdp, cdp, auxp)
+atzscmatch(pdp, match, auxp)
 	struct device *pdp;
-	struct cfdata *cdp;
-	void *auxp;
+	void *match, *auxp;
 {
+	struct cfdata *cdp = match;
 	struct zbus_args *zap;
 
 	zap = auxp;
@@ -346,8 +351,8 @@ atzsc_dump()
 {
 	int i;
 
-	for (i = 0; i < atzsccd.cd_ndevs; ++i)
-		if (atzsccd.cd_devs[i])
-			sbic_dump(atzsccd.cd_devs[i]);
+	for (i = 0; i < atzsc_cd.cd_ndevs; ++i)
+		if (atzsc_cd.cd_devs[i])
+			sbic_dump(atzsc_cd.cd_devs[i]);
 }
 #endif
-- 
cgit v1.2.3