diff options
| author | imp <imp@FreeBSD.org> | 2003-04-23 23:39:21 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-04-23 23:39:21 +0000 |
| commit | 5c827309fcbfa496d917dad6be838e8a04d33d56 (patch) | |
| tree | 47d618993b14df00f487317887c2f960fccf9467 /sys/pccard/cardinfo.h | |
| parent | 1848692e44bcf63ff4d2c22a9a232c41c4baaf6f (diff) | |
| download | FreeBSD-src-5c827309fcbfa496d917dad6be838e8a04d33d56.zip FreeBSD-src-5c827309fcbfa496d917dad6be838e8a04d33d56.tar.gz | |
1. Allow drivers to query CIS strings from OLDCARD.
2. Include backwards compatibility good for the moment (eventually will
be turned off in current, but allow for a short transition period).
PR: 51333
Submited by: Scott Mitchell (1)
MFC after: 2 weeks
Diffstat (limited to 'sys/pccard/cardinfo.h')
| -rw-r--r-- | sys/pccard/cardinfo.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sys/pccard/cardinfo.h b/sys/pccard/cardinfo.h index 173f27c..fe13598 100644 --- a/sys/pccard/cardinfo.h +++ b/sys/pccard/cardinfo.h @@ -147,10 +147,31 @@ struct dev_desc { uint8_t misc[DEV_MISC_LEN]; /* For any random info */ uint8_t manufstr[DEV_MAX_CIS_LEN]; uint8_t versstr[DEV_MAX_CIS_LEN]; + uint8_t cis3str[DEV_MAX_CIS_LEN]; + uint8_t cis4str[DEV_MAX_CIS_LEN]; uint32_t manufacturer; /* Manufacturer ID */ uint32_t product; /* Product ID */ uint32_t prodext; /* Product ID (extended) */ }; +#if __FreeBSD_version < 5000000 /* 4.x compatibility only. */ +#define PIOCSDRVOLD _IOWR('P', 6, struct dev_desc_old) /* Set driver */ +struct dev_desc_old { + char name[16]; /* Driver name */ + int unit; /* Driver unit number */ + unsigned long mem; /* Memory address of driver */ + int memsize; /* Memory size (if used) */ + int iobase; /* base of I/O ports */ + int iosize; /* Length of I/O ports */ + int irqmask; /* Interrupt number(s) to allocate */ + int flags; /* Device flags */ + uint8_t misc[DEV_MISC_LEN]; /* For any random info */ + uint8_t manufstr[DEV_MAX_CIS_LEN]; + uint8_t versstr[DEV_MAX_CIS_LEN]; + uint32_t manufacturer; /* Manufacturer ID */ + uint32_t product; /* Product ID */ + uint32_t prodext; /* Product ID (extended) */ +}; +#endif #define DEV_DESC_HAS_SIZE 1 struct pcic_reg { |
