diff options
Diffstat (limited to 'sys/arch/pmax/dev/rz.c')
| -rw-r--r-- | sys/arch/pmax/dev/rz.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/sys/arch/pmax/dev/rz.c b/sys/arch/pmax/dev/rz.c index d0ec6e419cc..c6b4cac3075 100644 --- a/sys/arch/pmax/dev/rz.c +++ b/sys/arch/pmax/dev/rz.c @@ -1,4 +1,4 @@ -/* $NetBSD: rz.c,v 1.20 1996/10/13 03:39:38 christos Exp $ */ +/* $NetBSD: rz.c,v 1.23 1997/02/04 05:24:55 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -59,6 +59,7 @@ #include <sys/uio.h> #include <sys/stat.h> #include <sys/syslog.h> +#include <sys/device.h> #include <ufs/ffs/fs.h> @@ -98,16 +99,6 @@ struct size { * (including the boot area). */ static struct size rzdefaultpart[MAXPARTITIONS] = { -#ifdef GENERIC /* greedy machines have 64 meg of swap */ - { 0, 32768 }, /* A */ - { 32768, 131072 }, /* B */ - { 0, 0 }, /* C */ - { 17408, 0 }, /* D */ - { 115712, 0 }, /* E */ - { 218112, 0 }, /* F */ - { 163840, 0 }, /* G */ - { 115712, 0 } /* H */ -#else { 0, 16384 }, /* A */ { 16384, 65536 }, /* B */ { 0, 0 }, /* C */ @@ -116,7 +107,6 @@ static struct size rzdefaultpart[MAXPARTITIONS] = { { 218112, 0 }, /* F */ { 81920, 0 }, /* G */ { 115712, 0 } /* H */ -#endif }; extern char * @@ -127,7 +117,7 @@ readdisklabel __P((dev_t dev, void (*strat) __P((struct buf *bp)), * Ultrix disklabel declarations */ #ifdef COMPAT_ULTRIX -#include "../../stand/dec_boot.h" +#include <pmax/stand/dec_boot.h> extern char * compat_label __P((dev_t dev, void (*strat) __P((struct buf *bp)), @@ -144,6 +134,7 @@ struct rzstats { }; struct rz_softc { + struct device sc_dev; /* new config glue */ struct pmax_scsi_device *sc_sd; /* physical unit info */ pid_t sc_format_pid; /* process using "format" mode */ short sc_flags; /* see below */ @@ -156,7 +147,6 @@ struct rz_softc { #define sc_bopenpart sc_dkdev.dk_bopenmask /* XXX compat */ #define sc_copenpart sc_dkdev.dk_copenmask /* XXX compat */ #define sc_bshift sc_dkdev.dk_blkshift /* XXX compat */ - char sc_xname[8]; /* XXX external name */ struct rzstats sc_stats; /* statisic counts */ struct buf sc_tab; /* queue of pending operations */ struct buf sc_buf; /* buf for doing I/O */ @@ -356,12 +346,14 @@ rzprobe(xxxsd) sc->sc_rwcmd.unitNumber = sd->sd_slave; /* XXX set up the external name */ - bzero(sc->sc_xname, sizeof(sc->sc_xname)); /* XXX */ - sprintf(sc->sc_xname, "rz%d", sd->sd_unit); /* XXX */ + bzero(&sc->sc_dev, sizeof(sc->sc_dev)); /* XXX */ + sprintf(sc->sc_dev.dv_xname, "rz%d", sd->sd_unit); /* XXX */ + sc->sc_dev.dv_unit = sd->sd_unit; /* XXX */ + sc->sc_dev.dv_class = DV_DISK; /* XXX */ /* Initialize the disk structure. */ bzero(&sc->sc_dkdev, sizeof(sc->sc_dkdev)); - sc->sc_dkdev.dk_name = sc->sc_xname; + sc->sc_dkdev.dk_name = sc->sc_dev.dv_xname; /* try to find out what type of device this is */ sc->sc_format_pid = 1; /* force use of sc_cdb */ @@ -445,6 +437,10 @@ rzprobe(xxxsd) if (inqbuf.rmb) sc->sc_flags |= RZF_REMOVEABLE; sc->sc_buf.b_flags = 0; + + sd->sd_devp = &sc->sc_dev; /* XXX */ + TAILQ_INSERT_TAIL(&alldevs, &sc->sc_dev, dv_list); /* XXX */ + return (1); bad: |