diff options
| author | wollman <wollman@FreeBSD.org> | 1995-04-12 20:48:13 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-04-12 20:48:13 +0000 |
| commit | 6a8d3a357d2d39cf1274d89e9ee73459574e038d (patch) | |
| tree | 3733f361a8298b0f38c2e4586c976a9240816ec2 /sys/dev/mcd | |
| parent | 669ed5b46ea62e3997fc8495702ddc9078fa7031 (diff) | |
| download | FreeBSD-src-6a8d3a357d2d39cf1274d89e9ee73459574e038d.zip FreeBSD-src-6a8d3a357d2d39cf1274d89e9ee73459574e038d.tar.gz | |
Add a class field to devconf and mst drivers.
For those where it was easy, drivers were also fixed to call
dev_attach() during probe rather than attach (in keeping with the
new design articulated in a mail message five months ago). For
a few that were really easy, correct state tracking was added as well.
The `fd' driver was fixed to correctly fill in the description.
The CPU identify code was fixed to attach a `cpu' device. The code
was also massively reordered to fill in cpu_model with somethingremotely
resembling what identifycpu() prints out. A few bytes saved by using
%b to format the features list rather than lots of ifs.
Diffstat (limited to 'sys/dev/mcd')
| -rw-r--r-- | sys/dev/mcd/mcd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 338fabf..1b96801 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.39 1995/02/23 17:40:16 ache Exp $ + * $Id: mcd.c,v 1.40 1995/03/28 07:55:42 bde Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -223,8 +223,9 @@ static struct kern_devconf kdc_mcd[NMCD] = { { isa_generic_externalize, 0, 0, ISA_EXTERNALLEN, &kdc_isa0, /* parent */ 0, /* parentdata */ - DC_IDLE, /* status */ - "Mitsumi CD-ROM controller" /* properly filled later */ + DC_UNCONFIGURED, /* status */ + "Mitsumi CD-ROM controller", /* properly filled later */ + DC_CLS_RDISK } }; static inline void @@ -250,7 +251,7 @@ int mcd_attach(struct isa_device *dev) /* wire controller for interrupts and dma */ mcd_configure(cd); #endif - mcd_registerdev(dev); + kdc_mcd[dev->id_unit].kdc_state = DC_IDLE; /* name filled in probe */ kdc_mcd[dev->id_unit].kdc_description = mcd_data[dev->id_unit].name; @@ -702,6 +703,7 @@ mcd_probe(struct isa_device *dev) int status; unsigned char stbytes[3]; + mcd_registerdev(dev); mcd_data[unit].flags = MCDPROBING; #ifdef NOTDEF |
