[Midnightbsd-cvs] src: dev/nsp: Sync nsp(4)

[laffer1 at midnightbsd.org]

Log Message:
-----------
Sync nsp(4)

Modified Files:
--------------
    src/sys/modules/nsp:
        Makefile (r1.1.1.1 -> r1.2)
    src/sys/dev/nsp:
        nsp.c (r1.1.1.1 -> r1.2)
        nsp_pccard.c (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/nsp/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/modules/nsp/Makefile -L sys/modules/nsp/Makefile -u -r1.1.1.1 -r1.2
--- sys/modules/nsp/Makefile
+++ sys/modules/nsp/Makefile
@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/modules/nsp/Makefile,v 1.2 2004/05/26 00:53:05 imp Exp $
+# $FreeBSD: src/sys/modules/nsp/Makefile,v 1.3 2005/09/27 18:10:37 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/nsp
 
 KMOD=	nsp
 SRCS=	nsp.c nsp_pccard.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: nsp_pccard.c
===================================================================
RCS file: /home/cvs/src/sys/dev/nsp/nsp_pccard.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/nsp/nsp_pccard.c -L sys/dev/nsp/nsp_pccard.c -u -r1.1.1.1 -r1.2
--- sys/dev/nsp/nsp_pccard.c
+++ sys/dev/nsp/nsp_pccard.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.23 2005/06/24 14:36:53 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.25 2007/02/23 12:18:48 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -79,7 +79,7 @@
 };
 
 /*
- * Additional code for FreeBSD new-bus PCCard frontend
+ * Additional code for FreeBSD new-bus PC Card frontend
  */
 
 static void
@@ -89,7 +89,7 @@
 }
 
 static void
-nsp_release_resource(DEVPORT_PDEVICE dev)
+nsp_release_resource(device_t dev)
 {
 	struct nsp_softc	*sc = device_get_softc(dev);
 
@@ -107,7 +107,7 @@
 }
 
 static int
-nsp_alloc_resource(DEVPORT_PDEVICE dev)
+nsp_alloc_resource(device_t dev)
 {
 	struct nsp_softc	*sc = device_get_softc(dev);
 	u_long			ioaddr, iosize, maddr, msize;
@@ -159,7 +159,8 @@
 	return(0);
 }
 
-static int nsp_pccard_match(device_t dev)
+static int
+nsp_pccard_probe(device_t dev)
 {
   	const struct pccard_product *pp;
 
@@ -173,8 +174,9 @@
 }
 
 static int
-nsp_pccard_probe(DEVPORT_PDEVICE dev)
+nsp_pccard_attach(device_t dev)
 {
+	struct nsp_softc	*sc = device_get_softc(dev);
 	int			error;
 
 	error = nsp_alloc_resource(dev);
@@ -184,22 +186,8 @@
 		nsp_release_resource(dev);
 		return(ENXIO);
 	}
-	nsp_release_resource(dev);
-
-	return(0);
-}
-
-static int
-nsp_pccard_attach(DEVPORT_PDEVICE dev)
-{
-	struct nsp_softc	*sc = device_get_softc(dev);
-	int			error;
-
-	error = nsp_alloc_resource(dev);
-	if (error)
-		return(error);
 	error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_CAM | INTR_ENTROPY,
-			       nsp_pccard_intr, (void *)sc, &sc->nsp_intrhand);
+			       NULL, nsp_pccard_intr, (void *)sc, &sc->nsp_intrhand);
 	if (error) {
 		nsp_release_resource(dev);
 		return(error);
@@ -213,7 +201,7 @@
 }
 
 static void
-nsp_pccard_detach(DEVPORT_PDEVICE dev)
+nsp_pccard_detach(device_t dev)
 {
 	nsp_card_unload(dev);
 	nsp_release_resource(dev);
@@ -221,15 +209,9 @@
 
 static device_method_t nsp_pccard_methods[] = {
 	/* Device interface */
-	DEVMETHOD(device_probe,		pccard_compat_probe),
-	DEVMETHOD(device_attach,	pccard_compat_attach),
+	DEVMETHOD(device_probe,		nsp_pccard_probe),
+	DEVMETHOD(device_attach,	nsp_pccard_attach),
 	DEVMETHOD(device_detach,	nsp_pccard_detach),
-
-	/* Card interface */
-	DEVMETHOD(card_compat_match,	nsp_pccard_match),
-	DEVMETHOD(card_compat_probe,	nsp_pccard_probe),
-	DEVMETHOD(card_compat_attach,	nsp_pccard_attach),
-
 	{ 0, 0 }
 };
 
Index: nsp.c
===================================================================
RCS file: /home/cvs/src/sys/dev/nsp/nsp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/dev/nsp/nsp.c -L sys/dev/nsp/nsp.c -u -r1.1.1.1 -r1.2
--- sys/dev/nsp/nsp.c
+++ sys/dev/nsp/nsp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.14 2005/05/29 04:42:24 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.15 2006/05/16 14:36:29 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,7 +72,6 @@
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>