d/freebsd-skq
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:
Warner Losh 2002-07-14 06:47:52 +00:00
parent c3b98db091
commit 8fe085c7ec
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/pccard/cardinfo.h
View File

@ -134,18 +134,18 @@ struct io_desc {
* Device descriptor for allocation of driver.
*/
struct dev_desc {
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 */
u_int manufacturer; /* Manufacturer ID */
u_int product; /* Product ID */
u_int prodext; /* Product ID (extended) */
u_char misc[128]; /* For any random info */
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[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
@ -158,20 +158,20 @@ struct pcic_reg {
* Slot information. Used to read current status of slot.
*/
struct slotstate {
enum cardstate state; /* Current state of slot */
enum cardstate laststate; /* Previous state of slot */
int maxmem; /* Max allowed memory windows */
int maxio; /* Max allowed I/O windows */
int irqs; /* Bitmap of IRQs allowed */
int flags; /* Capability flags */
enum cardstate state; /* Current state of slot */
enum cardstate laststate; /* Previous state of slot */
int maxmem; /* Max allowed memory windows */
int maxio; /* Max allowed I/O windows */
int irqs; /* Bitmap of IRQs allowed */
int flags; /* Capability flags */
};
/*
* The power values are in volts * 10, e.g. 5V is 50, 3.3V is 33.
*/
struct power {
int vcc;
int vpp;
int vcc;
int vpp;
};
/*

15
sys/pccard/slot.h
View File

@ -86,14 +86,13 @@ struct slot_ctrl {
* devices together.
*/
struct pccard_devinfo {
u_char 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) */
struct slot *slt; /* Back pointer to slot */
uint8_t name[128];
int running; /* Current state of driver */
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;
};