From: downsj Date: Mon, 3 Feb 1997 07:19:01 +0000 (+0000) Subject: rd -> hd X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=20fefd3e219b119e7d662c4503bb4ed8e68fe2b2;p=openbsd rd -> hd --- diff --git a/sys/arch/hp300/stand/Makefile b/sys/arch/hp300/stand/Makefile index e653e99f6af..08e974c9ed9 100644 --- a/sys/arch/hp300/stand/Makefile +++ b/sys/arch/hp300/stand/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1997/01/17 08:32:37 downsj Exp $ +# $OpenBSD: Makefile,v 1.5 1997/02/03 07:19:01 downsj Exp $ # $NetBSD: Makefile,v 1.22 1996/10/18 06:03:25 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/10/93 @@ -18,9 +18,9 @@ CFLAGS= -O3 ${INCPATH} ${DEFS} SRCS= autoconf.c cons.c devopen.c machdep.c prf.c OBJS= ${SRCS:N*.h:R:S/$/.o/g} -DSRCS= ct.c dca.c dcm.c fhpib.c hil.c hpib.c if_le.c \ +DSRCS= ct.c dca.c dcm.c fhpib.c hd.c hil.c hpib.c if_le.c \ ite.c ite_dv.c ite_gb.c ite_rb.c ite_subr.c ite_tc.c ite_hy.c \ - nhpib.c rd.c scsi.c sd.c + nhpib.c scsi.c sd.c DOBJS= ${DSRCS:N*.h:R:S/$/.o/g} S= ${.CURDIR}/../../.. diff --git a/sys/arch/hp300/stand/conf.c b/sys/arch/hp300/stand/conf.c index 093051b2edc..e7d9a194787 100644 --- a/sys/arch/hp300/stand/conf.c +++ b/sys/arch/hp300/stand/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.2 1997/01/17 08:32:40 downsj Exp $ */ +/* $OpenBSD: conf.c,v 1.3 1997/02/03 07:19:03 downsj Exp $ */ /* $NetBSD: conf.c,v 1.12 1996/10/14 07:29:15 thorpej Exp $ */ /* @@ -66,10 +66,10 @@ int ctopen __P((struct open_file *, ...)); int ctclose __P((struct open_file *)); #define ctioctl noioctl -int rdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int rdopen __P((struct open_file *, ...)); -int rdclose __P((struct open_file *)); -#define rdioctl noioctl +int hdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int hdopen __P((struct open_file *, ...)); +int hdclose __P((struct open_file *)); +#define hdioctl noioctl int sdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); int sdopen __P((struct open_file *, ...)); @@ -87,7 +87,7 @@ int sdclose __P((struct open_file *)); struct devsw devsw[] = { { "ct", ctstrategy, ctopen, ctclose, ctioctl }, /*0*/ { "??", xxstrategy, xxopen, xxclose, noioctl }, /*1*/ - { "rd", rdstrategy, rdopen, rdclose, rdioctl }, /*2*/ + { "hd", hdstrategy, hdopen, hdclose, hdioctl }, /*2*/ { "??", xxstrategy, xxopen, xxclose, noioctl }, /*3*/ { "sd", sdstrategy, sdopen, sdclose, sdioctl }, /*4*/ { "??", xxstrategy, xxopen, xxclose, noioctl }, /*5*/ @@ -118,14 +118,14 @@ punitzero(ctlr, slave, punit) extern int ctpunit __P((int, int, int *)); #define xxpunit punitzero -#define rdpunit punitzero +#define hdpunit punitzero #define sdpunit punitzero #define lepunit punitzero struct punitsw punitsw[] = { { ctpunit }, { xxpunit }, - { rdpunit }, + { hdpunit }, { xxpunit }, { sdpunit }, { xxpunit }, diff --git a/sys/arch/hp300/stand/devopen.c b/sys/arch/hp300/stand/devopen.c index 4742a44d424..6902bf511cb 100644 --- a/sys/arch/hp300/stand/devopen.c +++ b/sys/arch/hp300/stand/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.2 1997/01/17 08:32:43 downsj Exp $ */ +/* $OpenBSD: devopen.c,v 1.3 1997/02/03 07:19:04 downsj Exp $ */ /* $NetBSD: devopen.c,v 1.7 1996/10/14 07:31:47 thorpej Exp $ */ /*- @@ -74,7 +74,7 @@ devlookup(d, len) bcopy(file_system_rawfs, file_system, sizeof(struct fs_ops)); break; - case 2: /* rd */ + case 2: /* hd */ case 4: /* sd */ bcopy(file_system_ufs, file_system, sizeof(struct fs_ops)); break; @@ -226,7 +226,7 @@ devopen(f, fname, file) bcopy(file_system_rawfs, file_system, sizeof(struct fs_ops)); break; - case 2: /* rd */ + case 2: /* hd */ case 4: /* sd */ bcopy(file_system_ufs, file_system, sizeof(struct fs_ops)); break; diff --git a/sys/arch/hp300/stand/hd.c b/sys/arch/hp300/stand/hd.c new file mode 100644 index 00000000000..25461390084 --- /dev/null +++ b/sys/arch/hp300/stand/hd.c @@ -0,0 +1,422 @@ +/* $OpenBSD: hd.c,v 1.1 1997/02/03 07:19:06 downsj Exp $ */ +/* $NetBSD: rd.c,v 1.11 1996/12/21 21:34:40 thorpej Exp $ */ + +/* + * Copyright (c) 1988 University of Utah. + * Copyright (c) 1982, 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * the Systems Programming Group of the University of Utah Computer + * Science Department. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: Utah Hdr: rd.c 1.20 92/12/21 + * + * @(#)rd.c 8.1 (Berkeley) 7/15/93 + */ + +/* + * CS80/SS80 disk driver + */ +#include +#include +#include "stand.h" +#include "samachdep.h" + +#include + +struct hd_iocmd hd_ioc; +struct hd_rscmd hd_rsc; +struct hd_stat hd_stat; +struct hd_ssmcmd hd_ssmc; + +struct disklabel hdlabel; + +struct hdminilabel { + u_short npart; + u_long offset[MAXPARTITIONS]; +}; + +struct hd_softc { + int sc_ctlr; + int sc_unit; + int sc_part; + char sc_retry; + char sc_alive; + short sc_type; + struct hdminilabel sc_pinfo; +} hd_softc[NHPIB][NHD]; + +#define HDRETRY 5 + +struct hdidentinfo { + short ri_hwid; + short ri_maxunum; + int ri_nblocks; +} hdidentinfo[] = { + { HD7946AID, 0, 108416 }, + { HD9134DID, 1, 29088 }, + { HD9134LID, 1, 1232 }, + { HD7912PID, 0, 128128 }, + { HD7914PID, 0, 258048 }, + { HD7958AID, 0, 255276 }, + { HD7957AID, 0, 159544 }, + { HD7933HID, 0, 789958 }, + { HD9134LID, 1, 77840 }, + { HD7936HID, 0, 600978 }, + { HD7937HID, 0, 1116102 }, + { HD7914CTID, 0, 258048 }, + { HD7946AID, 0, 108416 }, + { HD9134LID, 1, 1232 }, + { HD7957BID, 0, 159894 }, + { HD7958BID, 0, 297108 }, + { HD7959BID, 0, 594216 }, + { HD2200AID, 0, 654948 }, + { HD2203AID, 0, 1309896 } +}; +int numhdidentinfo = sizeof(hdidentinfo) / sizeof(hdidentinfo[0]); + +hdinit(ctlr, unit) + int ctlr, unit; +{ + register struct hd_softc *rs = &hd_softc[ctlr][unit]; + u_char stat; + + rs->sc_type = hdident(ctlr, unit); + if (rs->sc_type < 0) + return (0); + rs->sc_alive = 1; + return (1); +} + +hdreset(ctlr, unit) + register int ctlr, unit; +{ + u_char stat; + + hd_ssmc.c_unit = C_SUNIT(0); + hd_ssmc.c_cmd = C_SSM; + hd_ssmc.c_refm = REF_MASK; + hd_ssmc.c_fefm = FEF_MASK; + hd_ssmc.c_aefm = AEF_MASK; + hd_ssmc.c_iefm = IEF_MASK; + hpibsend(ctlr, unit, C_CMD, &hd_ssmc, sizeof(hd_ssmc)); + hpibswait(ctlr, unit); + hpibrecv(ctlr, unit, C_QSTAT, &stat, 1); +} + +hdident(ctlr, unit) + register int ctlr, unit; +{ + struct hd_describe desc; + u_char stat, cmd[3]; + char name[7]; + register int id, i; + + id = hpibid(ctlr, unit); + if ((id & 0x200) == 0) + return(-1); + for (i = 0; i < numhdidentinfo; i++) + if (id == hdidentinfo[i].ri_hwid) + break; + if (i == numhdidentinfo) + return(-1); + id = i; + hdreset(ctlr, unit); + cmd[0] = C_SUNIT(0); + cmd[1] = C_SVOL(0); + cmd[2] = C_DESC; + hpibsend(ctlr, unit, C_CMD, cmd, sizeof(cmd)); + hpibrecv(ctlr, unit, C_EXEC, &desc, 37); + hpibrecv(ctlr, unit, C_QSTAT, &stat, sizeof(stat)); + bzero(name, sizeof(name)); + if (!stat) { + register int n = desc.d_name; + for (i = 5; i >= 0; i--) { + name[i] = (n & 0xf) + '0'; + n >>= 4; + } + } + /* + * Take care of a couple of anomolies: + * 1. 7945A and 7946A both return same HW id + * 2. 9122S and 9134D both return same HW id + * 3. 9122D and 9134L both return same HW id + */ + switch (hdidentinfo[id].ri_hwid) { + case HD7946AID: + if (bcmp(name, "079450", 6) == 0) + id = HD7945A; + else + id = HD7946A; + break; + + case HD9134LID: + if (bcmp(name, "091340", 6) == 0) + id = HD9134L; + else + id = HD9122D; + break; + + case HD9134DID: + if (bcmp(name, "091220", 6) == 0) + id = HD9122S; + else + id = HD9134D; + break; + } + return(id); +} + +#ifdef COMPAT_NOLABEL +int hdcyloff[][8] = { + { 1, 143, 0, 143, 0, 0, 323, 503, }, /* 7945A */ + { 1, 167, 0, 0, 0, 0, 0, 0, }, /* 9134D */ + { 0, 0, 0, 0, 0, 0, 0, 0, }, /* 9122S */ + { 0, 71, 0, 221, 292, 542, 221, 0, }, /* 7912P */ + { 1, 72, 0, 72, 362, 802, 252, 362, }, /* 7914P */ + { 1, 28, 0, 140, 167, 444, 140, 721, }, /* 7933H */ + { 1, 200, 0, 200, 0, 0, 450, 600, }, /* 9134L */ + { 1, 105, 0, 105, 380, 736, 265, 380, }, /* 7957A */ + { 1, 65, 0, 65, 257, 657, 193, 257, }, /* 7958A */ + { 1, 128, 0, 128, 518, 918, 388, 518, }, /* 7957B */ + { 1, 44, 0, 44, 174, 496, 131, 174, }, /* 7958B */ + { 1, 44, 0, 44, 218, 1022,174, 218, }, /* 7959B */ + { 1, 37, 0, 37, 183, 857, 147, 183, }, /* 2200A */ + { 1, 19, 0, 94, 112, 450, 94, 788, }, /* 2203A */ + { 1, 20, 0, 98, 117, 256, 98, 397, }, /* 7936H */ + { 1, 11, 0, 53, 63, 217, 53, 371, }, /* 7937H */ +}; + +struct hdcompatinfo { + int nbpc; + int *cyloff; +} hdcompatinfo[] = { + NHD7945ABPT*NHD7945ATRK, hdcyloff[0], + NHD9134DBPT*NHD9134DTRK, hdcyloff[1], + NHD9122SBPT*NHD9122STRK, hdcyloff[2], + NHD7912PBPT*NHD7912PTRK, hdcyloff[3], + NHD7914PBPT*NHD7914PTRK, hdcyloff[4], + NHD7958ABPT*NHD7958ATRK, hdcyloff[8], + NHD7957ABPT*NHD7957ATRK, hdcyloff[7], + NHD7933HBPT*NHD7933HTRK, hdcyloff[5], + NHD9134LBPT*NHD9134LTRK, hdcyloff[6], + NHD7936HBPT*NHD7936HTRK, hdcyloff[14], + NHD7937HBPT*NHD7937HTRK, hdcyloff[15], + NHD7914PBPT*NHD7914PTRK, hdcyloff[4], + NHD7945ABPT*NHD7945ATRK, hdcyloff[0], + NHD9122SBPT*NHD9122STRK, hdcyloff[2], + NHD7957BBPT*NHD7957BTRK, hdcyloff[9], + NHD7958BBPT*NHD7958BTRK, hdcyloff[10], + NHD7959BBPT*NHD7959BTRK, hdcyloff[11], + NHD2200ABPT*NHD2200ATRK, hdcyloff[12], + NHD2203ABPT*NHD2203ATRK, hdcyloff[13], +}; +int nhdcompatinfo = sizeof(hdcompatinfo) / sizeof(hdcompatinfo[0]); +#endif + +char io_buf[MAXBSIZE]; + +hdgetinfo(rs) + register struct hd_softc *rs; +{ + register struct hdminilabel *pi = &rs->sc_pinfo; + register struct disklabel *lp = &hdlabel; + char *msg, *getdisklabel(); + int hdstrategy(), err, savepart; + size_t i; + + bzero((caddr_t)lp, sizeof *lp); + lp->d_secsize = DEV_BSIZE; + + /* Disklabel is always from RAW_PART. */ + savepart = rs->sc_part; + rs->sc_part = RAW_PART; + err = hdstrategy(rs, F_READ, LABELSECTOR, + lp->d_secsize ? lp->d_secsize : DEV_BSIZE, io_buf, &i); + rs->sc_part = savepart; + + if (err) { + printf("hdgetinfo: hdstrategy error %d\n", err); + return(0); + } + + msg = getdisklabel(io_buf, lp); + if (msg) { + printf("hd(%d,%d,%d): WARNING: %s, ", + rs->sc_ctlr, rs->sc_unit, rs->sc_part, msg); +#ifdef COMPAT_NOLABEL + { + register struct hdcompatinfo *ci; + + printf("using old default partitioning\n"); + ci = &hdcompatinfo[rs->sc_type]; + pi->npart = 8; + for (i = 0; i < pi->npart; i++) + pi->offset[i] = ci->cyloff[i] * ci->nbpc; + } +#else + printf("defining `c' partition as entire disk\n"); + pi->npart = 3; + pi->offset[0] = pi->offset[1] = -1; + pi->offset[2] = 0; +#endif + } else { + pi->npart = lp->d_npartitions; + for (i = 0; i < pi->npart; i++) + pi->offset[i] = lp->d_partitions[i].p_size == 0 ? + -1 : lp->d_partitions[i].p_offset; + } + return(1); +} + +hdopen(f, ctlr, unit, part) + struct open_file *f; + int ctlr, unit, part; +{ + register struct hd_softc *rs; + struct hdinfo *ri; + + if (ctlr >= NHPIB || hpibalive(ctlr) == 0) + return (EADAPT); + if (unit >= NHD) + return (ECTLR); + rs = &hd_softc[ctlr][unit]; + rs->sc_part = part; + rs->sc_unit = unit; + rs->sc_ctlr = ctlr; + if (rs->sc_alive == 0) { + if (hdinit(ctlr, unit) == 0) + return (ENXIO); + if (hdgetinfo(rs) == 0) + return (ERDLAB); + } + if (part != RAW_PART && /* always allow RAW_PART to be opened */ + (part >= rs->sc_pinfo.npart || rs->sc_pinfo.offset[part] == -1)) + return (EPART); + f->f_devdata = (void *)rs; + return (0); +} + +hdclose(f) + struct open_file *f; +{ + struct hd_softc *rs = f->f_devdata; + + /* + * Mark the disk `not alive' so that the disklabel + * will be re-loaded at next open. + */ + bzero(rs, sizeof(struct hd_softc)); + f->f_devdata = NULL; + + return (0); +} + +hdstrategy(devdata, func, dblk, size, v_buf, rsize) + void *devdata; + int func; + daddr_t dblk; + size_t size; + void *v_buf; + size_t *rsize; +{ + char *buf = v_buf; + struct hd_softc *rs = devdata; + register int ctlr = rs->sc_ctlr; + register int unit = rs->sc_unit; + daddr_t blk; + char stat; + + if (size == 0) + return(0); + + /* + * Don't do partition translation on the `raw partition'. + */ + blk = (dblk + ((rs->sc_part == RAW_PART) ? 0 : + rs->sc_pinfo.offset[rs->sc_part])); + + rs->sc_retry = 0; + hd_ioc.c_unit = C_SUNIT(0); + hd_ioc.c_volume = C_SVOL(0); + hd_ioc.c_saddr = C_SADDR; + hd_ioc.c_hiaddr = 0; + hd_ioc.c_addr = HDBTOS(blk); + hd_ioc.c_nop2 = C_NOP; + hd_ioc.c_slen = C_SLEN; + hd_ioc.c_len = size; + hd_ioc.c_cmd = func == F_READ ? C_READ : C_WRITE; +retry: + hpibsend(ctlr, unit, C_CMD, &hd_ioc.c_unit, sizeof(hd_ioc)-2); + hpibswait(ctlr, unit); + hpibgo(ctlr, unit, C_EXEC, buf, size, func); + hpibswait(ctlr, unit); + hpibrecv(ctlr, unit, C_QSTAT, &stat, 1); + if (stat) { + if (hderror(ctlr, unit, rs->sc_part) == 0) + return(EIO); + if (++rs->sc_retry > HDRETRY) + return(EIO); + goto retry; + } + *rsize = size; + + return(0); +} + +hderror(ctlr, unit, part) + register int ctlr, unit; + int part; +{ + register struct hd_softc *hd = &hd_softc[ctlr][unit]; + char stat; + + hd_rsc.c_unit = C_SUNIT(0); + hd_rsc.c_sram = C_SRAM; + hd_rsc.c_ram = C_RAM; + hd_rsc.c_cmd = C_STATUS; + hpibsend(ctlr, unit, C_CMD, &hd_rsc, sizeof(hd_rsc)); + hpibrecv(ctlr, unit, C_EXEC, &hd_stat, sizeof(hd_stat)); + hpibrecv(ctlr, unit, C_QSTAT, &stat, 1); + if (stat) { + printf("hd(%d,%d,0,%d): request status fail %d\n", + ctlr, unit, part, stat); + return(0); + } + printf("hd(%d,%d,0,%d) err: vu 0x%x", + ctlr, unit, part, hd_stat.c_vu); + if ((hd_stat.c_aef & AEF_UD) || (hd_stat.c_ief & (IEF_MD|IEF_RD))) + printf(", block %d", hd_stat.c_blk); + printf(", R0x%x F0x%x A0x%x I0x%x\n", + hd_stat.c_ref, hd_stat.c_fef, hd_stat.c_aef, hd_stat.c_ief); + return(1); +} diff --git a/sys/arch/hp300/stand/rd.c b/sys/arch/hp300/stand/rd.c deleted file mode 100644 index 5931d54c01f..00000000000 --- a/sys/arch/hp300/stand/rd.c +++ /dev/null @@ -1,422 +0,0 @@ -/* $OpenBSD: rd.c,v 1.2 1997/01/17 08:32:56 downsj Exp $ */ -/* $NetBSD: rd.c,v 1.11 1996/12/21 21:34:40 thorpej Exp $ */ - -/* - * Copyright (c) 1988 University of Utah. - * Copyright (c) 1982, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * the Systems Programming Group of the University of Utah Computer - * Science Department. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: Utah Hdr: rd.c 1.20 92/12/21 - * - * @(#)rd.c 8.1 (Berkeley) 7/15/93 - */ - -/* - * CS80/SS80 disk driver - */ -#include -#include -#include "stand.h" -#include "samachdep.h" - -#include - -struct rd_iocmd rd_ioc; -struct rd_rscmd rd_rsc; -struct rd_stat rd_stat; -struct rd_ssmcmd rd_ssmc; - -struct disklabel rdlabel; - -struct rdminilabel { - u_short npart; - u_long offset[MAXPARTITIONS]; -}; - -struct rd_softc { - int sc_ctlr; - int sc_unit; - int sc_part; - char sc_retry; - char sc_alive; - short sc_type; - struct rdminilabel sc_pinfo; -} rd_softc[NHPIB][NRD]; - -#define RDRETRY 5 - -struct rdidentinfo { - short ri_hwid; - short ri_maxunum; - int ri_nblocks; -} rdidentinfo[] = { - { RD7946AID, 0, 108416 }, - { RD9134DID, 1, 29088 }, - { RD9134LID, 1, 1232 }, - { RD7912PID, 0, 128128 }, - { RD7914PID, 0, 258048 }, - { RD7958AID, 0, 255276 }, - { RD7957AID, 0, 159544 }, - { RD7933HID, 0, 789958 }, - { RD9134LID, 1, 77840 }, - { RD7936HID, 0, 600978 }, - { RD7937HID, 0, 1116102 }, - { RD7914CTID, 0, 258048 }, - { RD7946AID, 0, 108416 }, - { RD9134LID, 1, 1232 }, - { RD7957BID, 0, 159894 }, - { RD7958BID, 0, 297108 }, - { RD7959BID, 0, 594216 }, - { RD2200AID, 0, 654948 }, - { RD2203AID, 0, 1309896 } -}; -int numrdidentinfo = sizeof(rdidentinfo) / sizeof(rdidentinfo[0]); - -rdinit(ctlr, unit) - int ctlr, unit; -{ - register struct rd_softc *rs = &rd_softc[ctlr][unit]; - u_char stat; - - rs->sc_type = rdident(ctlr, unit); - if (rs->sc_type < 0) - return (0); - rs->sc_alive = 1; - return (1); -} - -rdreset(ctlr, unit) - register int ctlr, unit; -{ - u_char stat; - - rd_ssmc.c_unit = C_SUNIT(0); - rd_ssmc.c_cmd = C_SSM; - rd_ssmc.c_refm = REF_MASK; - rd_ssmc.c_fefm = FEF_MASK; - rd_ssmc.c_aefm = AEF_MASK; - rd_ssmc.c_iefm = IEF_MASK; - hpibsend(ctlr, unit, C_CMD, &rd_ssmc, sizeof(rd_ssmc)); - hpibswait(ctlr, unit); - hpibrecv(ctlr, unit, C_QSTAT, &stat, 1); -} - -rdident(ctlr, unit) - register int ctlr, unit; -{ - struct rd_describe desc; - u_char stat, cmd[3]; - char name[7]; - register int id, i; - - id = hpibid(ctlr, unit); - if ((id & 0x200) == 0) - return(-1); - for (i = 0; i < numrdidentinfo; i++) - if (id == rdidentinfo[i].ri_hwid) - break; - if (i == numrdidentinfo) - return(-1); - id = i; - rdreset(ctlr, unit); - cmd[0] = C_SUNIT(0); - cmd[1] = C_SVOL(0); - cmd[2] = C_DESC; - hpibsend(ctlr, unit, C_CMD, cmd, sizeof(cmd)); - hpibrecv(ctlr, unit, C_EXEC, &desc, 37); - hpibrecv(ctlr, unit, C_QSTAT, &stat, sizeof(stat)); - bzero(name, sizeof(name)); - if (!stat) { - register int n = desc.d_name; - for (i = 5; i >= 0; i--) { - name[i] = (n & 0xf) + '0'; - n >>= 4; - } - } - /* - * Take care of a couple of anomolies: - * 1. 7945A and 7946A both return same HW id - * 2. 9122S and 9134D both return same HW id - * 3. 9122D and 9134L both return same HW id - */ - switch (rdidentinfo[id].ri_hwid) { - case RD7946AID: - if (bcmp(name, "079450", 6) == 0) - id = RD7945A; - else - id = RD7946A; - break; - - case RD9134LID: - if (bcmp(name, "091340", 6) == 0) - id = RD9134L; - else - id = RD9122D; - break; - - case RD9134DID: - if (bcmp(name, "091220", 6) == 0) - id = RD9122S; - else - id = RD9134D; - break; - } - return(id); -} - -#ifdef COMPAT_NOLABEL -int rdcyloff[][8] = { - { 1, 143, 0, 143, 0, 0, 323, 503, }, /* 7945A */ - { 1, 167, 0, 0, 0, 0, 0, 0, }, /* 9134D */ - { 0, 0, 0, 0, 0, 0, 0, 0, }, /* 9122S */ - { 0, 71, 0, 221, 292, 542, 221, 0, }, /* 7912P */ - { 1, 72, 0, 72, 362, 802, 252, 362, }, /* 7914P */ - { 1, 28, 0, 140, 167, 444, 140, 721, }, /* 7933H */ - { 1, 200, 0, 200, 0, 0, 450, 600, }, /* 9134L */ - { 1, 105, 0, 105, 380, 736, 265, 380, }, /* 7957A */ - { 1, 65, 0, 65, 257, 657, 193, 257, }, /* 7958A */ - { 1, 128, 0, 128, 518, 918, 388, 518, }, /* 7957B */ - { 1, 44, 0, 44, 174, 496, 131, 174, }, /* 7958B */ - { 1, 44, 0, 44, 218, 1022,174, 218, }, /* 7959B */ - { 1, 37, 0, 37, 183, 857, 147, 183, }, /* 2200A */ - { 1, 19, 0, 94, 112, 450, 94, 788, }, /* 2203A */ - { 1, 20, 0, 98, 117, 256, 98, 397, }, /* 7936H */ - { 1, 11, 0, 53, 63, 217, 53, 371, }, /* 7937H */ -}; - -struct rdcompatinfo { - int nbpc; - int *cyloff; -} rdcompatinfo[] = { - NRD7945ABPT*NRD7945ATRK, rdcyloff[0], - NRD9134DBPT*NRD9134DTRK, rdcyloff[1], - NRD9122SBPT*NRD9122STRK, rdcyloff[2], - NRD7912PBPT*NRD7912PTRK, rdcyloff[3], - NRD7914PBPT*NRD7914PTRK, rdcyloff[4], - NRD7958ABPT*NRD7958ATRK, rdcyloff[8], - NRD7957ABPT*NRD7957ATRK, rdcyloff[7], - NRD7933HBPT*NRD7933HTRK, rdcyloff[5], - NRD9134LBPT*NRD9134LTRK, rdcyloff[6], - NRD7936HBPT*NRD7936HTRK, rdcyloff[14], - NRD7937HBPT*NRD7937HTRK, rdcyloff[15], - NRD7914PBPT*NRD7914PTRK, rdcyloff[4], - NRD7945ABPT*NRD7945ATRK, rdcyloff[0], - NRD9122SBPT*NRD9122STRK, rdcyloff[2], - NRD7957BBPT*NRD7957BTRK, rdcyloff[9], - NRD7958BBPT*NRD7958BTRK, rdcyloff[10], - NRD7959BBPT*NRD7959BTRK, rdcyloff[11], - NRD2200ABPT*NRD2200ATRK, rdcyloff[12], - NRD2203ABPT*NRD2203ATRK, rdcyloff[13], -}; -int nrdcompatinfo = sizeof(rdcompatinfo) / sizeof(rdcompatinfo[0]); -#endif - -char io_buf[MAXBSIZE]; - -rdgetinfo(rs) - register struct rd_softc *rs; -{ - register struct rdminilabel *pi = &rs->sc_pinfo; - register struct disklabel *lp = &rdlabel; - char *msg, *getdisklabel(); - int rdstrategy(), err, savepart; - size_t i; - - bzero((caddr_t)lp, sizeof *lp); - lp->d_secsize = DEV_BSIZE; - - /* Disklabel is always from RAW_PART. */ - savepart = rs->sc_part; - rs->sc_part = RAW_PART; - err = rdstrategy(rs, F_READ, LABELSECTOR, - lp->d_secsize ? lp->d_secsize : DEV_BSIZE, io_buf, &i); - rs->sc_part = savepart; - - if (err) { - printf("rdgetinfo: rdstrategy error %d\n", err); - return(0); - } - - msg = getdisklabel(io_buf, lp); - if (msg) { - printf("rd(%d,%d,%d): WARNING: %s, ", - rs->sc_ctlr, rs->sc_unit, rs->sc_part, msg); -#ifdef COMPAT_NOLABEL - { - register struct rdcompatinfo *ci; - - printf("using old default partitioning\n"); - ci = &rdcompatinfo[rs->sc_type]; - pi->npart = 8; - for (i = 0; i < pi->npart; i++) - pi->offset[i] = ci->cyloff[i] * ci->nbpc; - } -#else - printf("defining `c' partition as entire disk\n"); - pi->npart = 3; - pi->offset[0] = pi->offset[1] = -1; - pi->offset[2] = 0; -#endif - } else { - pi->npart = lp->d_npartitions; - for (i = 0; i < pi->npart; i++) - pi->offset[i] = lp->d_partitions[i].p_size == 0 ? - -1 : lp->d_partitions[i].p_offset; - } - return(1); -} - -rdopen(f, ctlr, unit, part) - struct open_file *f; - int ctlr, unit, part; -{ - register struct rd_softc *rs; - struct rdinfo *ri; - - if (ctlr >= NHPIB || hpibalive(ctlr) == 0) - return (EADAPT); - if (unit >= NRD) - return (ECTLR); - rs = &rd_softc[ctlr][unit]; - rs->sc_part = part; - rs->sc_unit = unit; - rs->sc_ctlr = ctlr; - if (rs->sc_alive == 0) { - if (rdinit(ctlr, unit) == 0) - return (ENXIO); - if (rdgetinfo(rs) == 0) - return (ERDLAB); - } - if (part != RAW_PART && /* always allow RAW_PART to be opened */ - (part >= rs->sc_pinfo.npart || rs->sc_pinfo.offset[part] == -1)) - return (EPART); - f->f_devdata = (void *)rs; - return (0); -} - -rdclose(f) - struct open_file *f; -{ - struct rd_softc *rs = f->f_devdata; - - /* - * Mark the disk `not alive' so that the disklabel - * will be re-loaded at next open. - */ - bzero(rs, sizeof(struct rd_softc)); - f->f_devdata = NULL; - - return (0); -} - -rdstrategy(devdata, func, dblk, size, v_buf, rsize) - void *devdata; - int func; - daddr_t dblk; - size_t size; - void *v_buf; - size_t *rsize; -{ - char *buf = v_buf; - struct rd_softc *rs = devdata; - register int ctlr = rs->sc_ctlr; - register int unit = rs->sc_unit; - daddr_t blk; - char stat; - - if (size == 0) - return(0); - - /* - * Don't do partition translation on the `raw partition'. - */ - blk = (dblk + ((rs->sc_part == RAW_PART) ? 0 : - rs->sc_pinfo.offset[rs->sc_part])); - - rs->sc_retry = 0; - rd_ioc.c_unit = C_SUNIT(0); - rd_ioc.c_volume = C_SVOL(0); - rd_ioc.c_saddr = C_SADDR; - rd_ioc.c_hiaddr = 0; - rd_ioc.c_addr = RDBTOS(blk); - rd_ioc.c_nop2 = C_NOP; - rd_ioc.c_slen = C_SLEN; - rd_ioc.c_len = size; - rd_ioc.c_cmd = func == F_READ ? C_READ : C_WRITE; -retry: - hpibsend(ctlr, unit, C_CMD, &rd_ioc.c_unit, sizeof(rd_ioc)-2); - hpibswait(ctlr, unit); - hpibgo(ctlr, unit, C_EXEC, buf, size, func); - hpibswait(ctlr, unit); - hpibrecv(ctlr, unit, C_QSTAT, &stat, 1); - if (stat) { - if (rderror(ctlr, unit, rs->sc_part) == 0) - return(EIO); - if (++rs->sc_retry > RDRETRY) - return(EIO); - goto retry; - } - *rsize = size; - - return(0); -} - -rderror(ctlr, unit, part) - register int ctlr, unit; - int part; -{ - register struct rd_softc *rd = &rd_softc[ctlr][unit]; - char stat; - - rd_rsc.c_unit = C_SUNIT(0); - rd_rsc.c_sram = C_SRAM; - rd_rsc.c_ram = C_RAM; - rd_rsc.c_cmd = C_STATUS; - hpibsend(ctlr, unit, C_CMD, &rd_rsc, sizeof(rd_rsc)); - hpibrecv(ctlr, unit, C_EXEC, &rd_stat, sizeof(rd_stat)); - hpibrecv(ctlr, unit, C_QSTAT, &stat, 1); - if (stat) { - printf("rd(%d,%d,0,%d): request status fail %d\n", - ctlr, unit, part, stat); - return(0); - } - printf("rd(%d,%d,0,%d) err: vu 0x%x", - ctlr, unit, part, rd_stat.c_vu); - if ((rd_stat.c_aef & AEF_UD) || (rd_stat.c_ief & (IEF_MD|IEF_RD))) - printf(", block %d", rd_stat.c_blk); - printf(", R0x%x F0x%x A0x%x I0x%x\n", - rd_stat.c_ref, rd_stat.c_fef, rd_stat.c_aef, rd_stat.c_ief); - return(1); -} diff --git a/sys/arch/hp300/stand/samachdep.h b/sys/arch/hp300/stand/samachdep.h index b17698ba0bd..123278d1779 100644 --- a/sys/arch/hp300/stand/samachdep.h +++ b/sys/arch/hp300/stand/samachdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: samachdep.h,v 1.2 1997/01/17 08:32:58 downsj Exp $ */ +/* $OpenBSD: samachdep.h,v 1.3 1997/02/03 07:19:09 downsj Exp $ */ /* $NetBSD: samachdep.h,v 1.7 1996/10/14 07:34:48 thorpej Exp $ */ /* @@ -40,7 +40,7 @@ #define NHPIB 4 #define NSCSI 2 -#define NRD 8 +#define NHD 8 #define NCT 8 #define NSD 8