diff options
author | imp <imp@FreeBSD.org> | 2000-10-15 17:21:50 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2000-10-15 17:21:50 +0000 |
commit | cd3bbf9dd583c5bd224d95646c3cddaaf6e52582 (patch) | |
tree | 4bd29a2251d4bb2ae5845d63ff27e58bd714c917 /sys/dev/pccard/pccardvar.h | |
parent | e25bb3a14c85b7ef207246ce6dd07bc6d76c41b0 (diff) | |
download | FreeBSD-src-cd3bbf9dd583c5bd224d95646c3cddaaf6e52582.zip FreeBSD-src-cd3bbf9dd583c5bd224d95646c3cddaaf6e52582.tar.gz |
Lots of little fixes. We no longer panic on card insert:
o initialize ivars with bzero.
o remove interrupt function pointer. netbsd needs it, but we don't.
o add lots of comments about bogus things that I've been kludging to try
to make the simple cases work.
o add new ivar accessor for cis4 to match cis3. likely neither will be
needed, but it doesn't hurt to have it.
Diffstat (limited to 'sys/dev/pccard/pccardvar.h')
-rw-r--r-- | sys/dev/pccard/pccardvar.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index f2ee3d4..5700f06 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -129,9 +129,6 @@ struct pccard_function { int pf_ccr_window; long pf_mfc_iobase; long pf_mfc_iomax; - int (*ih_fct)(void *); - void *ih_arg; - int ih_ipl; int pf_flags; }; @@ -299,7 +296,8 @@ enum { PCCARD_IVAR_FUNCTION_NUMBER, PCCARD_IVAR_VENDOR_STR, /* CIS string for "Manufacturer" */ PCCARD_IVAR_PRODUCT_STR,/* CIS strnig for "Product" */ - PCCARD_IVAR_CIS3_STR /* Some cards need this */ + PCCARD_IVAR_CIS3_STR, + PCCARD_IVAR_CIS4_STR }; #define PCCARD_ACCESSOR(A, B, T) \ |