diff options
| author | nyan <nyan@FreeBSD.org> | 1999-12-01 13:40:03 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 1999-12-01 13:40:03 +0000 |
| commit | 6a6837052c546d4433452f3d20c7d637d8bd3491 (patch) | |
| tree | 0a2e4226fef1aed7f9546c7e58d2ef71d35bbfd8 /sys/pc98 | |
| parent | 1a595523be91866e358c7843bfca4a18a79461d2 (diff) | |
| download | FreeBSD-src-6a6837052c546d4433452f3d20c7d637d8bd3491.zip FreeBSD-src-6a6837052c546d4433452f3d20c7d637d8bd3491.tar.gz | |
Sync with sys/isa/sio.c revision 1.276.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 20 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 20 |
2 files changed, 8 insertions, 32 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 4dbd7c2..774659a 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -180,15 +180,6 @@ #include <i386/isa/ic/rsa.h> #endif -#include "card.h" -#if NCARD > 0 -/* XXX should die XXX */ -#include <sys/select.h> -#include <sys/module.h> -#include <pccard/cardinfo.h> -#include <pccard/slot.h> -#endif - #ifndef __i386__ #define disable_intr() #define enable_intr() @@ -879,13 +870,9 @@ static int sio_pccard_probe(dev) device_t dev; { - const char *name; - - name = pccard_get_name(dev); - if (strcmp(name, "sio")) - return ENXIO; - /* Do not probe IRQ - pccardd has not arranged for it yet */ + /* XXX Actually it has been asigned to you, but isn't activated */ + /* XXX until you specifically activate the resource for your use. */ SET_FLAG(dev, COM_C_NOPROBE); return (sioprobe(dev)); @@ -907,7 +894,7 @@ sio_pccard_attach(dev) * and ensure that any driver entry points such as * read and write do not hang. */ -static void +static int sio_pccard_detach(dev) device_t dev; { @@ -935,6 +922,7 @@ sio_pccard_detach(dev) free(com, M_DEVBUF); device_printf(dev, "unload,gone\n"); } + return (0); } #endif /* NCARD > 0 */ diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 4dbd7c2..774659a 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -180,15 +180,6 @@ #include <i386/isa/ic/rsa.h> #endif -#include "card.h" -#if NCARD > 0 -/* XXX should die XXX */ -#include <sys/select.h> -#include <sys/module.h> -#include <pccard/cardinfo.h> -#include <pccard/slot.h> -#endif - #ifndef __i386__ #define disable_intr() #define enable_intr() @@ -879,13 +870,9 @@ static int sio_pccard_probe(dev) device_t dev; { - const char *name; - - name = pccard_get_name(dev); - if (strcmp(name, "sio")) - return ENXIO; - /* Do not probe IRQ - pccardd has not arranged for it yet */ + /* XXX Actually it has been asigned to you, but isn't activated */ + /* XXX until you specifically activate the resource for your use. */ SET_FLAG(dev, COM_C_NOPROBE); return (sioprobe(dev)); @@ -907,7 +894,7 @@ sio_pccard_attach(dev) * and ensure that any driver entry points such as * read and write do not hang. */ -static void +static int sio_pccard_detach(dev) device_t dev; { @@ -935,6 +922,7 @@ sio_pccard_detach(dev) free(com, M_DEVBUF); device_printf(dev, "unload,gone\n"); } + return (0); } #endif /* NCARD > 0 */ |
