diff options
author | imp <imp@FreeBSD.org> | 2001-04-21 04:08:39 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2001-04-21 04:08:39 +0000 |
commit | 95af7f8b67f737988c4a7882be3e0890a661e507 (patch) | |
tree | 4127b50003865da6fff23685e7289e7aea0910ae /sys/dev/pccard | |
parent | 1c08859c6ba7846e555407d0eb1de52050bda308 (diff) | |
download | FreeBSD-src-95af7f8b67f737988c4a7882be3e0890a661e507.zip FreeBSD-src-95af7f8b67f737988c4a7882be3e0890a661e507.tar.gz |
Add accessor/ivar for the "function". This is so we can generically
match disks and serial ports and maybe others.
Diffstat (limited to 'sys/dev/pccard')
-rw-r--r-- | sys/dev/pccard/pccard.c | 3 | ||||
-rw-r--r-- | sys/dev/pccard/pccardvar.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 532c33c..ab33929 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -867,6 +867,9 @@ pccard_read_ivar(device_t bus, device_t child, int which, u_char *result) case PCCARD_IVAR_PRODUCT: *(u_int32_t *) result = sc->card.product; break; + case PCCARD_IVAR_FUNCTION: + *(u_int32_t *) result = func->function; + break; case PCCARD_IVAR_FUNCTION_NUMBER: if (!func) { device_printf(bus, "No function number, bug!\n"); diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 11e33ad..e53e811 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -316,7 +316,8 @@ enum { PCCARD_IVAR_VENDOR_STR, /* CIS string for "Manufacturer" */ PCCARD_IVAR_PRODUCT_STR,/* CIS strnig for "Product" */ PCCARD_IVAR_CIS3_STR, - PCCARD_IVAR_CIS4_STR + PCCARD_IVAR_CIS4_STR, + PCCARD_IVAR_FUNCTION }; #define PCCARD_ACCESSOR(A, B, T) \ @@ -331,6 +332,7 @@ PCCARD_ACCESSOR(ether, ETHADDR, u_int8_t) PCCARD_ACCESSOR(vendor, VENDOR, u_int32_t) PCCARD_ACCESSOR(product, PRODUCT, u_int32_t) PCCARD_ACCESSOR(function_number,FUNCTION_NUMBER, u_int32_t) +PCCARD_ACCESSOR(function, FUNCTION, u_int32_t) PCCARD_ACCESSOR(vendor_str, VENDOR_STR, char *) PCCARD_ACCESSOR(product_str, PRODUCT_STR, char *) PCCARD_ACCESSOR(cis3_str, CIS3_STR, char *) |