d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange previous commit that passed the vendor id to the kernel in a way

Browse Source 
that's binary compatible for -stable.  While binary compatibility doesn't
matter much in -current, it is critical for -stable.  This change requires
pccardd/pccardc to be recompiled.
This commit is contained in:
imp 2002-07-14 06:47:52 +00:00
parent 4b0e7df260
commit b5eac652fb
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/pccard/cardinfo.h
View File

@ -142,10 +142,10 @@ struct dev_desc {
int iosize; /* Length of I/O ports */
int irqmask; /* Interrupt number(s) to allocate */
int flags; /* Device flags */
u_int manufacturer; /* Manufacturer ID */
u_int product; /* Product ID */
u_int prodext; /* Product ID (extended) */
u_char misc[128]; /* For any random info */
uint8_t misc[116]; /* For any random info */
uint32_t manufacturer; /* Manufacturer ID */
uint32_t product; /* Product ID */
uint32_t prodext; /* Product ID (extended) */
};
#define DEV_DESC_HAS_SIZE 1

11
sys/pccard/slot.h
View File

@ -86,14 +86,13 @@ struct slot_ctrl {
* devices together.
*/
struct pccard_devinfo {
u_char name[128];
uint8_t name[128];
int running; /* Current state of driver */
u_char misc[128]; /* For any random info */
u_int manufacturer; /* Manufacturer ID */
u_int product; /* Product ID */
u_int prodext; /* Product ID (extended) */
uint8_t misc[116]; /* For any random info */
uint32_t manufacturer; /* Manufacturer ID */
uint32_t product; /* Product ID */
uint32_t prodext; /* Product ID (extended) */
struct slot *slt; /* Back pointer to slot */
struct resource_list resources;
};