[Midnightbsd-cvs] src: dev/ncv: Update ncv(4)

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update ncv(4)

Modified Files:
--------------
    src/sys/modules/ncv:
        Makefile (r1.1.1.1 -> r1.2)
    src/sys/dev/ncv:
        ncr53c500.c (r1.1.1.1 -> r1.2)
        ncr53c500_pccard.c (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/ncv/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/modules/ncv/Makefile -L sys/modules/ncv/Makefile -u -r1.1.1.1 -r1.2
--- sys/modules/ncv/Makefile
+++ sys/modules/ncv/Makefile
@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/modules/ncv/Makefile,v 1.2 2004/05/26 00:53:05 imp Exp $
+# $FreeBSD: src/sys/modules/ncv/Makefile,v 1.3 2005/09/27 18:10:36 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/ncv
 
 KMOD=	ncv
 SRCS=	ncr53c500_pccard.c ncr53c500.c 
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
+SRCS+=	device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
 SRCS+=	opt_cam.h opt_scsi.h opt_ddb.h
 
 .include <bsd.kmod.mk>
Index: ncr53c500.c
===================================================================
RCS file: /home/cvs/src/sys/dev/ncv/ncr53c500.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/ncv/ncr53c500.c -L sys/dev/ncv/ncr53c500.c -u -r1.1.1.1 -r1.2
--- sys/dev/ncv/ncr53c500.c
+++ sys/dev/ncv/ncr53c500.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.12 2005/05/29 04:42:23 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.13 2006/05/16 14:36:29 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,7 +73,6 @@
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 
Index: ncr53c500_pccard.c
===================================================================
RCS file: /home/cvs/src/sys/dev/ncv/ncr53c500_pccard.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/ncv/ncr53c500_pccard.c -L sys/dev/ncv/ncr53c500_pccard.c -u -r1.1.1.1 -r1.2
--- sys/dev/ncv/ncr53c500_pccard.c
+++ sys/dev/ncv/ncr53c500_pccard.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.26 2005/06/24 14:36:53 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.29 2007/02/23 12:18:47 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -200,7 +200,8 @@
 	return(0);
 }
 
-static int ncv_pccard_match(device_t dev)
+static int
+ncv_pccard_probe(device_t dev)
 {
 	const struct ncv_product *pp;
 	const char *vendorstr;
@@ -228,7 +229,7 @@
 }
 
 static int
-ncv_pccard_probe(DEVPORT_PDEVICE dev)
+ncv_pccard_attach(device_t dev)
 {
 	struct ncv_softc	*sc = device_get_softc(dev);
 	int			error;
@@ -244,25 +245,8 @@
 		ncv_release_resource(dev);
 		return(ENXIO);
 	}
-
-	ncv_release_resource(dev);
-
-	return(0);
-}
-
-static int
-ncv_pccard_attach(DEVPORT_PDEVICE dev)
-{
-	struct ncv_softc	*sc = device_get_softc(dev);
-	int			error;
-
-	error = ncv_alloc_resource(dev);
-	if (error) {
-		return(error);
-	}
-
 	error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_CAM | INTR_ENTROPY,
-			       ncv_pccard_intr, (void *)sc, &sc->ncv_intrhand);
+			       NULL, ncv_pccard_intr, (void *)sc, &sc->ncv_intrhand);
 	if (error) {
 		ncv_release_resource(dev);
 		return(error);
@@ -277,7 +261,7 @@
 }
 
 static	void
-ncv_pccard_detach(DEVPORT_PDEVICE dev)
+ncv_pccard_detach(device_t dev)
 {
 	ncv_card_unload(dev);
 	ncv_release_resource(dev);
@@ -285,15 +269,10 @@
 
 static device_method_t ncv_pccard_methods[] = {
 	/* Device interface */
-	DEVMETHOD(device_probe,		pccard_compat_probe),
-	DEVMETHOD(device_attach,	pccard_compat_attach),
+	DEVMETHOD(device_probe,		ncv_pccard_probe),
+	DEVMETHOD(device_attach,	ncv_pccard_attach),
 	DEVMETHOD(device_detach,	ncv_pccard_detach),
 
-	/* Card interface */
-	DEVMETHOD(card_compat_match,	ncv_pccard_match),
-	DEVMETHOD(card_compat_probe,	ncv_pccard_probe),
-	DEVMETHOD(card_compat_attach,	ncv_pccard_attach),
-
 	{ 0, 0 }
 };
 
@@ -314,7 +293,6 @@
 	struct ncv_softc *sc = DEVPORT_PDEVGET_SOFTC(devi);
 	intrmask_t s;
 
-	printf("%s: unload\n", sc->sc_sclow.sl_xname);
 	s = splcam();
 	scsi_low_deactivate((struct scsi_low_softc *)sc);
         scsi_low_dettach(&sc->sc_sclow);