From e564c617f8aadbc77f1edc9eddeb5206cc9fb74c Mon Sep 17 00:00:00 2001 From: jon Date: Sat, 6 Jan 2001 18:04:55 +0000 Subject: * Better kld support in pccbb/cardbus - pccbb no longer needs to remember whether a card is inserted. - pccbb reissues insertion on load of cardbus/pccard modules. - got rid of unnecessary delays in power functions. - Cardbus children are no longer deleted if probe/attach fails. - non-attached child devices are reprobed at driver_added. * CARD interface to read CIS - added card_cis_read/card_cis_free interface to read arbitrary CIS data. This currently is only implemented in cardbus. * pccard begins to work - pccard can now use higher memory space (and uses it by default). - set_memory_offset interface changed. - fixed ccr access, which was broken at multiple locations. - implement an interrupt handler - pccard can now share interrupts. - resource alloc/release/activate/deactivate functions gutted: some resources are allocated by the bridge before the child device is probed or attached. Thus the resource "belongs" to the bridge, and the pccard_*_resource functions need to fudge the owner/rid. - changed some error conditions to panics to speed debugging. * Mutex fix - Giant is entered at the beginning of thread --- sys/dev/cardbus/cardbus_cis.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sys/dev/cardbus/cardbus_cis.h') diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h index 9268582..f884eef 100644 --- a/sys/dev/cardbus/cardbus_cis.h +++ b/sys/dev/cardbus/cardbus_cis.h @@ -32,7 +32,12 @@ * Cardbus CIS definitions */ +struct cis_tupleinfo; + int cardbus_do_cis(device_t dev, device_t child); +int cardbus_cis_read(device_t dev, device_t child, u_int8_t id, + struct cis_tupleinfo** buff, int* nret); +void cardbus_cis_free(device_t dev, struct cis_tupleinfo *buff, int* nret); #define MAXTUPLESIZE 0x400 @@ -78,6 +83,8 @@ int cardbus_do_cis(device_t dev, device_t child); #define CISTPL_CUSTOMSTART 0x80 #define CISTPL_END 0xFF +#define CISTPL_GENERIC -1 /* catchall */ + /* BAR */ #define TPL_BAR_REG_ASI_MASK 0x07 #define TPL_BAR_REG_AS 0x10 -- cgit v1.1