Changed data structures due to removal of old config system.
This commit is contained in:
ragge
parent
f6fb3bf1ab
commit
d969a7e16e
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: ubavar.h,v 1.15 1996/04/08 18:37:36 ragge Exp $ */
|
/* $NetBSD: ubavar.h,v 1.16 1996/07/01 21:31:36 ragge Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1982, 1986 Regents of the University of California.
|
* Copyright (c) 1982, 1986 Regents of the University of California.
|
||||||
|
|
@ -83,8 +83,8 @@ struct uba_softc {
|
||||||
int uh_resno; /* Number of devices to reset */
|
int uh_resno; /* Number of devices to reset */
|
||||||
struct ivec_dsp *uh_idsp; /* Interrupt dispatch area */
|
struct ivec_dsp *uh_idsp; /* Interrupt dispatch area */
|
||||||
u_int *uh_iarea; /* Interrupt vector array */
|
u_int *uh_iarea; /* Interrupt vector array */
|
||||||
struct uba_device *uh_actf; /* head of queue to transfer */
|
struct uba_unit *uh_actf; /* head of queue to transfer */
|
||||||
struct uba_device *uh_actl; /* tail of queue to transfer */
|
struct uba_unit *uh_actl; /* tail of queue to transfer */
|
||||||
short uh_mrwant; /* someone is waiting for map reg */
|
short uh_mrwant; /* someone is waiting for map reg */
|
||||||
short uh_bdpwant; /* someone awaits bdp's */
|
short uh_bdpwant; /* someone awaits bdp's */
|
||||||
int uh_bdpfree; /* free bdp's */
|
int uh_bdpfree; /* free bdp's */
|
||||||
|
|
@ -108,92 +108,19 @@ struct uba_softc {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Per-controller structure.
|
* Per-controller structure.
|
||||||
* (E.g. one for each disk and tape controller, and other things
|
* The unit struct is common to both the adapter and the controller
|
||||||
* which use and release buffered data paths.)
|
* to which it belongs. It is only used on controllers that handles
|
||||||
*
|
* BDP's, and calls the adapter queueing subroutines.
|
||||||
* If a controller has devices attached, then there are
|
|
||||||
* cross-referenced uba_drive structures.
|
|
||||||
* This structure is the one which is queued in unibus resource wait,
|
|
||||||
* and saves the information about unibus resources which are used.
|
|
||||||
* The queue of devices waiting to transfer is also attached here.
|
|
||||||
*/
|
*/
|
||||||
struct uba_ctlr {
|
struct uba_unit {
|
||||||
struct uba_driver *um_driver;
|
void *uu_softc; /* Pointer to units softc */
|
||||||
short um_ctlr; /* controller index in driver */
|
int uu_ubinfo; /* save unibus registers, etc */
|
||||||
short um_ubanum; /* the uba it is on */
|
int uu_bdp; /* for controllers that hang on to bdp's */
|
||||||
short um_alive; /* controller exists */
|
struct buf uu_tab; /* queue of devices for this controller */
|
||||||
void (*um_intr) __P((int)); /* interrupt handler(s) XXX */
|
void (*uu_dgo) __P((struct uba_unit *));
|
||||||
caddr_t um_addr; /* address of device in i/o space */
|
struct uba_unit *uu_forw; /* Link when waiting for resources */
|
||||||
struct uba_softc *um_hd;
|
short uu_xclu; /* want exclusive use of bdp's */
|
||||||
/* the driver saves the prototype command here for use in its go routine */
|
short uu_keepbdp; /* hang on to bdp's once allocated */
|
||||||
int um_cmd; /* communication to dgo() */
|
|
||||||
int um_ubinfo; /* save unibus registers, etc */
|
|
||||||
int um_bdp; /* for controllers that hang on to bdp's */
|
|
||||||
struct buf um_tab; /* queue of devices for this controller */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per ``device'' structure.
|
|
||||||
* (A controller has devices or uses and releases buffered data paths).
|
|
||||||
* (Everything else is a ``device''.)
|
|
||||||
*
|
|
||||||
* If a controller has many drives attached, then there will
|
|
||||||
* be several uba_device structures associated with a single uba_ctlr
|
|
||||||
* structure.
|
|
||||||
*
|
|
||||||
* This structure contains all the information necessary to run
|
|
||||||
* a unibus device such as a dz or a dh. It also contains information
|
|
||||||
* for slaves of unibus controllers as to which device on the slave
|
|
||||||
* this is. A flags field here can also be given in the system specification
|
|
||||||
* and is used to tell which dz lines are hard wired or other device
|
|
||||||
* specific parameters.
|
|
||||||
*/
|
|
||||||
struct uba_device {
|
|
||||||
struct uba_driver *ui_driver;
|
|
||||||
short ui_unit; /* unit number on the system */
|
|
||||||
short ui_ctlr; /* mass ctlr number; -1 if none */
|
|
||||||
short ui_ubanum; /* the uba it is on */
|
|
||||||
short ui_slave; /* slave on controller */
|
|
||||||
void (*ui_intr) __P((int)); /* interrupt handler(s) XXX */
|
|
||||||
caddr_t ui_addr; /* address of device in i/o space */
|
|
||||||
short ui_dk; /* if init 1 set to number for iostat */
|
|
||||||
int ui_flags; /* parameter from system specification */
|
|
||||||
short ui_alive; /* device exists */
|
|
||||||
short ui_type; /* driver specific type information */
|
|
||||||
caddr_t ui_physaddr; /* phys addr, for standalone (dump) code */
|
|
||||||
/* this is the forward link in a list of devices on a controller */
|
|
||||||
struct uba_device *ui_forw;
|
|
||||||
/* if the device is connected to a controller, this is the controller */
|
|
||||||
struct uba_ctlr *ui_mi;
|
|
||||||
struct uba_softc *ui_hd;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-driver structure.
|
|
||||||
*
|
|
||||||
* Each unibus driver defines entries for a set of routines
|
|
||||||
* as well as an array of types which are acceptable to it.
|
|
||||||
* These are used at boot time by the configuration program.
|
|
||||||
*/
|
|
||||||
struct uba_driver {
|
|
||||||
/* see if a driver is really there XXX*/
|
|
||||||
int (*ud_probe) __P((caddr_t, int, struct uba_ctlr *,
|
|
||||||
struct uba_softc *));
|
|
||||||
/* see if a slave is there XXX */
|
|
||||||
int (*ud_slave) __P((struct uba_device *, caddr_t));
|
|
||||||
/* setup driver for a slave XXX */
|
|
||||||
void (*ud_attach) __P((struct uba_device *));
|
|
||||||
/* fill csr/ba to start transfer XXX */
|
|
||||||
void (*ud_dgo) __P((struct uba_ctlr *));
|
|
||||||
u_short *ud_addr; /* device csr addresses */
|
|
||||||
char *ud_dname; /* name of a device */
|
|
||||||
struct uba_device **ud_dinfo; /* backpointers to ubdinit structs */
|
|
||||||
char *ud_mname; /* name of a controller */
|
|
||||||
struct uba_ctlr **ud_minfo; /* backpointers to ubminit structs */
|
|
||||||
short ud_xclu; /* want exclusive use of bdp's */
|
|
||||||
short ud_keepbdp; /* hang on to bdp's once allocated */
|
|
||||||
int (*ud_ubamem) __P((struct uba_device *, int));
|
|
||||||
/* see if dedicated memory is present */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -247,13 +174,7 @@ struct ubinfo {
|
||||||
#ifndef _LOCORE
|
#ifndef _LOCORE
|
||||||
#ifdef _KERNEL
|
#ifdef _KERNEL
|
||||||
#define ubago(ui) ubaqueue(ui, 0)
|
#define ubago(ui) ubaqueue(ui, 0)
|
||||||
|
#define b_forw b_hash.le_next /* Nice to have when handling uba queues */
|
||||||
/*
|
|
||||||
* Ubminit and ubdinit initialize the mass storage controller and
|
|
||||||
* device tables specifying possible devices.
|
|
||||||
*/
|
|
||||||
extern struct uba_ctlr ubminit[];
|
|
||||||
extern struct uba_device ubdinit[];
|
|
||||||
|
|
||||||
extern struct cfdriver uba_cd;
|
extern struct cfdriver uba_cd;
|
||||||
|
|
||||||
|
|
@ -261,8 +182,8 @@ void ubainit __P((struct uba_softc *));
|
||||||
void ubasetvec __P((struct device *, int, void (*) __P((int))));
|
void ubasetvec __P((struct device *, int, void (*) __P((int))));
|
||||||
int uballoc __P((int, caddr_t, int, int));
|
int uballoc __P((int, caddr_t, int, int));
|
||||||
void ubarelse __P((int, int *));
|
void ubarelse __P((int, int *));
|
||||||
int ubaqueue __P((struct uba_device *, int));
|
int ubaqueue __P((struct uba_unit *, int));
|
||||||
void ubadone __P((struct uba_ctlr *));
|
void ubadone __P((struct uba_unit *));
|
||||||
void ubareset __P((int));
|
void ubareset __P((int));
|
||||||
int ubasetup __P((int, struct buf *, int));
|
int ubasetup __P((int, struct buf *, int));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: ubavar.h,v 1.15 1996/04/08 18:37:36 ragge Exp $ */
|
/* $NetBSD: ubavar.h,v 1.16 1996/07/01 21:31:36 ragge Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1982, 1986 Regents of the University of California.
|
* Copyright (c) 1982, 1986 Regents of the University of California.
|
||||||
|
|
@ -83,8 +83,8 @@ struct uba_softc {
|
||||||
int uh_resno; /* Number of devices to reset */
|
int uh_resno; /* Number of devices to reset */
|
||||||
struct ivec_dsp *uh_idsp; /* Interrupt dispatch area */
|
struct ivec_dsp *uh_idsp; /* Interrupt dispatch area */
|
||||||
u_int *uh_iarea; /* Interrupt vector array */
|
u_int *uh_iarea; /* Interrupt vector array */
|
||||||
struct uba_device *uh_actf; /* head of queue to transfer */
|
struct uba_unit *uh_actf; /* head of queue to transfer */
|
||||||
struct uba_device *uh_actl; /* tail of queue to transfer */
|
struct uba_unit *uh_actl; /* tail of queue to transfer */
|
||||||
short uh_mrwant; /* someone is waiting for map reg */
|
short uh_mrwant; /* someone is waiting for map reg */
|
||||||
short uh_bdpwant; /* someone awaits bdp's */
|
short uh_bdpwant; /* someone awaits bdp's */
|
||||||
int uh_bdpfree; /* free bdp's */
|
int uh_bdpfree; /* free bdp's */
|
||||||
|
|
@ -108,92 +108,19 @@ struct uba_softc {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Per-controller structure.
|
* Per-controller structure.
|
||||||
* (E.g. one for each disk and tape controller, and other things
|
* The unit struct is common to both the adapter and the controller
|
||||||
* which use and release buffered data paths.)
|
* to which it belongs. It is only used on controllers that handles
|
||||||
*
|
* BDP's, and calls the adapter queueing subroutines.
|
||||||
* If a controller has devices attached, then there are
|
|
||||||
* cross-referenced uba_drive structures.
|
|
||||||
* This structure is the one which is queued in unibus resource wait,
|
|
||||||
* and saves the information about unibus resources which are used.
|
|
||||||
* The queue of devices waiting to transfer is also attached here.
|
|
||||||
*/
|
*/
|
||||||
struct uba_ctlr {
|
struct uba_unit {
|
||||||
struct uba_driver *um_driver;
|
void *uu_softc; /* Pointer to units softc */
|
||||||
short um_ctlr; /* controller index in driver */
|
int uu_ubinfo; /* save unibus registers, etc */
|
||||||
short um_ubanum; /* the uba it is on */
|
int uu_bdp; /* for controllers that hang on to bdp's */
|
||||||
short um_alive; /* controller exists */
|
struct buf uu_tab; /* queue of devices for this controller */
|
||||||
void (*um_intr) __P((int)); /* interrupt handler(s) XXX */
|
void (*uu_dgo) __P((struct uba_unit *));
|
||||||
caddr_t um_addr; /* address of device in i/o space */
|
struct uba_unit *uu_forw; /* Link when waiting for resources */
|
||||||
struct uba_softc *um_hd;
|
short uu_xclu; /* want exclusive use of bdp's */
|
||||||
/* the driver saves the prototype command here for use in its go routine */
|
short uu_keepbdp; /* hang on to bdp's once allocated */
|
||||||
int um_cmd; /* communication to dgo() */
|
|
||||||
int um_ubinfo; /* save unibus registers, etc */
|
|
||||||
int um_bdp; /* for controllers that hang on to bdp's */
|
|
||||||
struct buf um_tab; /* queue of devices for this controller */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per ``device'' structure.
|
|
||||||
* (A controller has devices or uses and releases buffered data paths).
|
|
||||||
* (Everything else is a ``device''.)
|
|
||||||
*
|
|
||||||
* If a controller has many drives attached, then there will
|
|
||||||
* be several uba_device structures associated with a single uba_ctlr
|
|
||||||
* structure.
|
|
||||||
*
|
|
||||||
* This structure contains all the information necessary to run
|
|
||||||
* a unibus device such as a dz or a dh. It also contains information
|
|
||||||
* for slaves of unibus controllers as to which device on the slave
|
|
||||||
* this is. A flags field here can also be given in the system specification
|
|
||||||
* and is used to tell which dz lines are hard wired or other device
|
|
||||||
* specific parameters.
|
|
||||||
*/
|
|
||||||
struct uba_device {
|
|
||||||
struct uba_driver *ui_driver;
|
|
||||||
short ui_unit; /* unit number on the system */
|
|
||||||
short ui_ctlr; /* mass ctlr number; -1 if none */
|
|
||||||
short ui_ubanum; /* the uba it is on */
|
|
||||||
short ui_slave; /* slave on controller */
|
|
||||||
void (*ui_intr) __P((int)); /* interrupt handler(s) XXX */
|
|
||||||
caddr_t ui_addr; /* address of device in i/o space */
|
|
||||||
short ui_dk; /* if init 1 set to number for iostat */
|
|
||||||
int ui_flags; /* parameter from system specification */
|
|
||||||
short ui_alive; /* device exists */
|
|
||||||
short ui_type; /* driver specific type information */
|
|
||||||
caddr_t ui_physaddr; /* phys addr, for standalone (dump) code */
|
|
||||||
/* this is the forward link in a list of devices on a controller */
|
|
||||||
struct uba_device *ui_forw;
|
|
||||||
/* if the device is connected to a controller, this is the controller */
|
|
||||||
struct uba_ctlr *ui_mi;
|
|
||||||
struct uba_softc *ui_hd;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Per-driver structure.
|
|
||||||
*
|
|
||||||
* Each unibus driver defines entries for a set of routines
|
|
||||||
* as well as an array of types which are acceptable to it.
|
|
||||||
* These are used at boot time by the configuration program.
|
|
||||||
*/
|
|
||||||
struct uba_driver {
|
|
||||||
/* see if a driver is really there XXX*/
|
|
||||||
int (*ud_probe) __P((caddr_t, int, struct uba_ctlr *,
|
|
||||||
struct uba_softc *));
|
|
||||||
/* see if a slave is there XXX */
|
|
||||||
int (*ud_slave) __P((struct uba_device *, caddr_t));
|
|
||||||
/* setup driver for a slave XXX */
|
|
||||||
void (*ud_attach) __P((struct uba_device *));
|
|
||||||
/* fill csr/ba to start transfer XXX */
|
|
||||||
void (*ud_dgo) __P((struct uba_ctlr *));
|
|
||||||
u_short *ud_addr; /* device csr addresses */
|
|
||||||
char *ud_dname; /* name of a device */
|
|
||||||
struct uba_device **ud_dinfo; /* backpointers to ubdinit structs */
|
|
||||||
char *ud_mname; /* name of a controller */
|
|
||||||
struct uba_ctlr **ud_minfo; /* backpointers to ubminit structs */
|
|
||||||
short ud_xclu; /* want exclusive use of bdp's */
|
|
||||||
short ud_keepbdp; /* hang on to bdp's once allocated */
|
|
||||||
int (*ud_ubamem) __P((struct uba_device *, int));
|
|
||||||
/* see if dedicated memory is present */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -247,13 +174,7 @@ struct ubinfo {
|
||||||
#ifndef _LOCORE
|
#ifndef _LOCORE
|
||||||
#ifdef _KERNEL
|
#ifdef _KERNEL
|
||||||
#define ubago(ui) ubaqueue(ui, 0)
|
#define ubago(ui) ubaqueue(ui, 0)
|
||||||
|
#define b_forw b_hash.le_next /* Nice to have when handling uba queues */
|
||||||
/*
|
|
||||||
* Ubminit and ubdinit initialize the mass storage controller and
|
|
||||||
* device tables specifying possible devices.
|
|
||||||
*/
|
|
||||||
extern struct uba_ctlr ubminit[];
|
|
||||||
extern struct uba_device ubdinit[];
|
|
||||||
|
|
||||||
extern struct cfdriver uba_cd;
|
extern struct cfdriver uba_cd;
|
||||||
|
|
||||||
|
|
@ -261,8 +182,8 @@ void ubainit __P((struct uba_softc *));
|
||||||
void ubasetvec __P((struct device *, int, void (*) __P((int))));
|
void ubasetvec __P((struct device *, int, void (*) __P((int))));
|
||||||
int uballoc __P((int, caddr_t, int, int));
|
int uballoc __P((int, caddr_t, int, int));
|
||||||
void ubarelse __P((int, int *));
|
void ubarelse __P((int, int *));
|
||||||
int ubaqueue __P((struct uba_device *, int));
|
int ubaqueue __P((struct uba_unit *, int));
|
||||||
void ubadone __P((struct uba_ctlr *));
|
void ubadone __P((struct uba_unit *));
|
||||||
void ubareset __P((int));
|
void ubareset __P((int));
|
||||||
int ubasetup __P((int, struct buf *, int));
|
int ubasetup __P((int, struct buf *, int));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue