From c62822dc9fdc77e8a9a8ee9a26b90811be89f26b Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 26 Nov 2001 00:39:33 +0000 Subject: First part of patches to make sio grok 16-bit serial cards under NEWCARD. Other patches may be reqiured to sio to prevent a hang on eject. Also add commented out entries for sio_pccard.c in files.pc98 to match other architectures. Submitted by: yamamoto shigeru-san --- sys/dev/sio/sio_pccard.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'sys/dev/sio/sio_pccard.c') diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c index 3d15498..c25709d 100644 --- a/sys/dev/sio/sio_pccard.c +++ b/sys/dev/sio/sio_pccard.c @@ -40,18 +40,28 @@ #include #include +#include +#include +#include + #include static int sio_pccard_attach __P((device_t dev)); static int sio_pccard_detach __P((device_t dev)); +static int sio_pccard_match __P((device_t self)); 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_probe, pccard_compat_probe), + DEVMETHOD(device_attach, pccard_compat_attach), DEVMETHOD(device_detach, sio_pccard_detach), + /* Card interface */ + DEVMETHOD(card_compat_match, sio_pccard_match), + DEVMETHOD(card_compat_probe, sio_pccard_probe), + DEVMETHOD(card_compat_attach, sio_pccard_attach), + { 0, 0 } }; @@ -62,6 +72,24 @@ static driver_t sio_pccard_driver = { }; static int +sio_pccard_match(device_t dev) +{ + int error = 0; + u_int32_t fcn = PCCARD_FUNCTION_UNSPEC; + + error = pccard_get_function(dev, &fcn); + if (error != 0) + return (error); + /* + * If a serial card, we are likely the right driver. + */ + if (fcn == PCCARD_FUNCTION_SERIAL) + return (0); + + return(ENXIO); +} + +static int sio_pccard_probe(dev) device_t dev; { -- cgit v1.1