--- Net2/arch/i386/isa/isa_device.h 2018/04/24 18:04:01 1.1.1.1 +++ Net2/arch/i386/isa/isa_device.h 2018/04/24 18:20:07 1.1.1.3 @@ -30,7 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)isa_device.h 7.1 (Berkeley) 5/9/91 + * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 + * isa_device.h,v 1.6 1993/05/22 08:01:30 cgd Exp */ /* @@ -43,13 +44,15 @@ struct isa_device { struct isa_driver *id_driver; short id_iobase; /* base i/o address */ - short id_irq; /* interrupt request */ + u_short id_irq; /* interrupt request */ short id_drq; /* DMA request */ caddr_t id_maddr; /* physical i/o memory address on bus (if any)*/ int id_msize; /* size of i/o memory */ int (*id_intr)(); /* interrupt interface routine */ int id_unit; /* unit number */ - int id_scsiid; /* scsi id if needed */ + int id_flags; /* flags */ + int id_physid; /* eg. scsi id if needed */ + int id_masunit; /* for biotab_dktp, the master unit number */ int id_alive; /* device is present */ }; @@ -67,4 +70,4 @@ struct isa_driver { }; extern struct isa_device isa_devtab_bio[], isa_devtab_tty[], isa_devtab_net[], - isa_devtab_null[]; + isa_devtab_null[], isa_subdev[];