diff options
author | Warner Losh <imp@FreeBSD.org> | 2002-07-14 06:47:52 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2002-07-14 06:47:52 +0000 |
commit | 8fe085c7ec4b6b28400f24d65c70463f5767bd02 (patch) | |
tree | c09bd69e7b489354d1c8679f6c9b04b08eca8ce4 /sys/pccard/cardinfo.h | |
parent | c3b98db091b192a2e4333df74ea6da2a6ea90d26 (diff) | |
download | src-8fe085c7ec4b6b28400f24d65c70463f5767bd02.tar.gz src-8fe085c7ec4b6b28400f24d65c70463f5767bd02.zip |
Rearrange previous commit that passed the vendor id to the kernel in a way
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.
Notes
Notes:
svn path=/head/; revision=99943
Diffstat (limited to 'sys/pccard/cardinfo.h')
-rw-r--r-- | sys/pccard/cardinfo.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sys/pccard/cardinfo.h b/sys/pccard/cardinfo.h index 0984aed5b7ad..11bd730a6764 100644 --- a/sys/pccard/cardinfo.h +++ b/sys/pccard/cardinfo.h @@ -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; }; /* |