system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-20 08:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

First step towards making loadable modules independent of having

Browse source 
pccard in the kernel for those drivers with pccard attachments.  This
makes the compat layer a little larger by introducing some inlines,
but should almost make it possible to have independent attachments.
The pccard_match function are the only one left, which I will take
care of shortly.
This commit is contained in:
Warner Losh 2001-03-22 06:00:07 +00:00
parent f55f5ee276
commit c33c1284cb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=74636
4 changed files with 53 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/dev/pccard/card_if.m
View file

@ -30,6 +30,9 @@
INTERFACE card;
# WARNING: THIS FILE IS USED BY BOTH OLDCARD AND NEWCARD. MAKE SURE
# YOU TEST BOTH KERNELS IF CHANGING THIS FILE.
#
# Companion interface for pccard. We need to set attributes for memory
# and i/o port mappings (as well as other types of attributes) that have
@ -149,6 +152,10 @@ METHOD int deactivate_function {
#
# Drivers wishing to not retain OLDCARD compatibility needn't do this.
#
# The compat_do_* versions are so that we can make the pccard_compat_probe
# and _attach static lines and have the bus system pick the right version
# to use so we don't enshrine pccard_* symbols in the driver's module.
#
METHOD int compat_probe {
device_t dev;
}
@ -157,6 +164,28 @@ METHOD int compat_attach {
device_t dev;
}
CODE {
static int null_do_probe(device_t bus, device_t dev)
{
return (CARD_COMPAT_DO_PROBE(device_get_parent(bus), dev));
}
static int null_do_attach(device_t bus, device_t dev)
{
return (CARD_COMPAT_DO_ATTACH(device_get_parent(bus), dev));
}
}
METHOD int compat_do_probe {
device_t bus;
device_t dev;
} DEFAULT null_do_attach;
METHOD int compat_do_attach {
device_t bus;
device_t dev;
} DEFAULT null_do_attach;
#
# Helper method for the above. When a compatibility driver is converted,
# one must write a match routine. This routine is unused on OLDCARD but

10
sys/dev/pccard/pccard.c
View file

@ -673,14 +673,14 @@ pccard_io_unmap(struct pccard_function *pf, int window)
* needs to grab devices while in the old they were assigned to the device by
* the pccardd process. These symbols are exported to the upper layers.
*/
int
pccard_compat_probe(device_t dev)
static int
pccard_compat_do_probe(device_t bus, device_t dev)
{
return (CARD_COMPAT_MATCH(dev));
}
int
pccard_compat_attach(device_t dev)
static int
pccard_compat_do_attach(device_t bus, device_t dev)
{
int err;
@ -1106,6 +1106,8 @@ static device_method_t pccard_methods[] = {
DEVMETHOD(card_get_type, pccard_card_gettype),
DEVMETHOD(card_attach_card, pccard_attach_card),
DEVMETHOD(card_detach_card, pccard_detach_card),
DEVMETHOD(card_compat_do_probe, pccard_compat_do_probe),
DEVMETHOD(card_compat_do_attach, pccard_compat_do_attach),
{ 0, 0 }
};

14
sys/dev/pccard/pccardvar.h
View file

@ -34,6 +34,7 @@
#include <sys/queue.h>
#include <machine/bus.h>
#include "card_if.h"
extern int pccard_verbose;
@ -294,8 +295,17 @@ void pccard_io_unmap(struct pccard_function *, int);
(pccard_chip_mem_unmap((pf)->sc->pct, (pf)->sc->pch, (window)))
/* compat layer */
int pccard_compat_probe(device_t dev);
int pccard_compat_attach(device_t dev);
static __inline int
pccard_compat_probe(device_t dev)
{
return (CARD_COMPAT_DO_PROBE(device_get_parent(dev), dev));
}
static __inline int
pccard_compat_attach(device_t dev)
{
return (CARD_COMPAT_DO_ATTACH(device_get_parent(dev), dev));
}
/* ivar interface */
enum {

10
sys/pccard/pccard_nbk.c
View file

@ -80,14 +80,14 @@ devclass_t pccard_devclass;
/*
* glue for NEWCARD/OLDCARD compat layer
*/
int
pccard_compat_probe(device_t dev)
static int
pccard_compat_do_probe(device_t bus, device_t dev)
{
return (CARD_COMPAT_PROBE(dev));
}
int
pccard_compat_attach(device_t dev)
static int
pccard_compat_do_attach(device_t bus, device_t dev)
{
return (CARD_COMPAT_ATTACH(dev));
}
@ -376,6 +376,8 @@ static device_method_t pccard_methods[] = {
DEVMETHOD(card_get_function, pccard_get_function),
DEVMETHOD(card_activate_function, pccard_activate_function),
DEVMETHOD(card_deactivate_function, pccard_deactivate_function),
DEVMETHOD(card_compat_do_probe, pccard_compat_do_probe),
DEVMETHOD(card_compat_do_attach, pccard_compat_do_attach),
{ 0, 0 }
};