Break out the bus front ends into their own files. Rewrite

sio_pccard_detach to use new siodetach.  Add an extra arg to sioprobe
to tell driver to probe/not probe the device for IRQs.

This incorporates most of Bruce's review material.  I'm at a good
checkpoint, but there will be more to come based on bde's further
reviews.

Reviewed by: bde

1 files changed, 87 insertions, 0 deletions

diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c
new file mode 100644
index 0000000..3d15498
--- /dev/null
+++ b/sys/dev/sio/sio_pccard.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2001 M. Warner Losh.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/module.h>
+#include <sys/tty.h>
+#include <machine/clock.h>
+#include <machine/bus_pio.h>
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/timepps.h>
+
+#include <dev/sio/siovar.h>
+
+static	int	sio_pccard_attach __P((device_t dev));
+static	int	sio_pccard_detach __P((device_t dev));
+static	int	sio_pccard_probe __P((device_t dev));
+
+static device_method_t sio_pccard_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		sio_pccard_probe),
+	DEVMETHOD(device_attach,	sio_pccard_attach),
+	DEVMETHOD(device_detach,	sio_pccard_detach),
+
+	{ 0, 0 }
+};
+
+static driver_t sio_pccard_driver = {
+	sio_driver_name,
+	sio_pccard_methods,
+	sizeof(struct com_s),
+};
+
+static int
+sio_pccard_probe(dev)
+	device_t	dev;
+{
+	/* Do not probe IRQ - pccard doesn't turn on the interrupt line */
+	/* until bus_setup_intr */
+	return (sioprobe(dev, 0, 1));
+}
+
+static int
+sio_pccard_attach(dev)
+	device_t	dev;
+{
+	return (sioattach(dev, 0));
+}
+
+static int
+sio_pccard_detach(dev)
+	device_t	dev;
+{
+	return (siodetach(dev));
+}
+
+DRIVER_MODULE(sio, pccard, sio_pccard_driver, sio_devclass, 0, 0);