Module Name: src
Committed By: tsutsui
Date: Mon Nov 21 16:22:37 UTC 2022
Modified Files:
src/sys/arch/hp300/dev: rd.c rdreg.h
src/sys/arch/hp300/stand/common: rd.c
Log Message:
Use common macro for numbers of cylinders and blocks for HP-IB disks.
No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/hp300/dev/rd.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp300/dev/rdreg.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/rd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/dev/rd.c
diff -u src/sys/arch/hp300/dev/rd.c:1.110 src/sys/arch/hp300/dev/rd.c:1.111
--- src/sys/arch/hp300/dev/rd.c:1.110 Sat Jul 31 20:29:36 2021
+++ src/sys/arch/hp300/dev/rd.c Mon Nov 21 16:22:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.110 2021/07/31 20:29:36 andvar Exp $ */
+/* $NetBSD: rd.c,v 1.111 2022/11/21 16:22:37 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.110 2021/07/31 20:29:36 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.111 2022/11/21 16:22:37 tsutsui Exp $");
#include "opt_useleds.h"
@@ -191,8 +191,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7945A",
.ri_nbpt = NRD7945ABPT,
.ri_ntpc = NRD7945ATRK,
- .ri_ncyl = 968,
- .ri_nblocks = 108416
+ .ri_ncyl = NRD7945ACYL,
+ .ri_nblocks = NRD7945ABLK
},
[RD9134D] = {
@@ -200,8 +200,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "9134D",
.ri_nbpt = NRD9134DBPT,
.ri_ntpc = NRD9134DTRK,
- .ri_ncyl = 303,
- .ri_nblocks = 29088
+ .ri_ncyl = NRD9134DCYL,
+ .ri_nblocks = NRD9134DBLK
},
[RD9122S] = {
@@ -209,8 +209,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "9122S",
.ri_nbpt = NRD9122SBPT,
.ri_ntpc = NRD9122STRK,
- .ri_ncyl = 77,
- .ri_nblocks = 1232
+ .ri_ncyl = NRD9122SCYL,
+ .ri_nblocks = NRD9122SBLK
},
[RD7912P] = {
@@ -218,8 +218,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7912P",
.ri_nbpt = NRD7912PBPT,
.ri_ntpc = NRD7912PTRK,
- .ri_ncyl = 572,
- .ri_nblocks = 128128
+ .ri_ncyl = NRD7912PCYL,
+ .ri_nblocks = NRD7912PBLK
},
[RD7914P] = {
@@ -227,8 +227,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7914P",
.ri_nbpt = NRD7914PBPT,
.ri_ntpc = NRD7914PTRK,
- .ri_ncyl = 1152,
- .ri_nblocks = 258048
+ .ri_ncyl = NRD7914PCYL,
+ .ri_nblocks = NRD7914PBLK
},
[RD7958A] = {
@@ -236,8 +236,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7958A",
.ri_nbpt = NRD7958ABPT,
.ri_ntpc = NRD7958ATRK,
- .ri_ncyl = 1013,
- .ri_nblocks = 255276
+ .ri_ncyl = NRD7958ACYL,
+ .ri_nblocks = NRD7958ABLK
},
[RD7957A] = {
@@ -245,8 +245,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7957A",
.ri_nbpt = NRD7957ABPT,
.ri_ntpc = NRD7957ATRK,
- .ri_ncyl = 1036,
- .ri_nblocks = 159544
+ .ri_ncyl = NRD7957ACYL,
+ .ri_nblocks = NRD7957ABLK
},
[RD7933H] = {
@@ -254,8 +254,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7933H",
.ri_nbpt = NRD7933HBPT,
.ri_ntpc = NRD7933HTRK,
- .ri_ncyl = 1321,
- .ri_nblocks = 789958
+ .ri_ncyl = NRD7933HCYL,
+ .ri_nblocks = NRD7933HBLK
},
[RD9134L] = {
@@ -263,8 +263,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "9134L",
.ri_nbpt = NRD9134LBPT,
.ri_ntpc = NRD9134LTRK,
- .ri_ncyl = 973,
- .ri_nblocks = 77840
+ .ri_ncyl = NRD9134LCYL,
+ .ri_nblocks = NRD9134LBLK
},
[RD7936H] = {
@@ -272,8 +272,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7936H",
.ri_nbpt = NRD7936HBPT,
.ri_ntpc = NRD7936HTRK,
- .ri_ncyl = 698,
- .ri_nblocks = 600978
+ .ri_ncyl = NRD7936HCYL,
+ .ri_nblocks = NRD7936HBLK
},
[RD7937H] = {
@@ -281,8 +281,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7937H",
.ri_nbpt = NRD7937HBPT,
.ri_ntpc = NRD7937HTRK,
- .ri_ncyl = 698,
- .ri_nblocks = 1116102
+ .ri_ncyl = NRD7937HCYL,
+ .ri_nblocks = NRD7937HBLK
},
[RD7914CT] = {
@@ -290,8 +290,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7914CT",
.ri_nbpt = NRD7914PBPT,
.ri_ntpc = NRD7914PTRK,
- .ri_ncyl = 1152,
- .ri_nblocks = 258048
+ .ri_ncyl = NRD7914PCYL,
+ .ri_nblocks = NRD7914PBLK
},
[RD7946A] = {
@@ -299,8 +299,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7946A",
.ri_nbpt = NRD7945ABPT,
.ri_ntpc = NRD7945ATRK,
- .ri_ncyl = 968,
- .ri_nblocks = 108416
+ .ri_ncyl = NRD7945ACYL,
+ .ri_nblocks = NRD7945ABLK
},
[RD9122D] = {
@@ -308,8 +308,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "9122D",
.ri_nbpt = NRD9122SBPT,
.ri_ntpc = NRD9122STRK,
- .ri_ncyl = 77,
- .ri_nblocks = 1232
+ .ri_ncyl = NRD9122SCYL,
+ .ri_nblocks = NRD9122SBLK
},
[RD7957B] = {
@@ -317,8 +317,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7957B",
.ri_nbpt = NRD7957BBPT,
.ri_ntpc = NRD7957BTRK,
- .ri_ncyl = 1269,
- .ri_nblocks = 159894
+ .ri_ncyl = NRD7957BCYL,
+ .ri_nblocks = NRD7957BBLK
},
[RD7958B] = {
@@ -326,8 +326,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7958B",
.ri_nbpt = NRD7958BBPT,
.ri_ntpc = NRD7958BTRK,
- .ri_ncyl = 786,
- .ri_nblocks = 297108
+ .ri_ncyl = NRD7958BCYL,
+ .ri_nblocks = NRD7958BBLK
},
[RD7959B] = {
@@ -335,8 +335,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7959B",
.ri_nbpt = NRD7959BBPT,
.ri_ntpc = NRD7959BTRK,
- .ri_ncyl = 1572,
- .ri_nblocks = 594216
+ .ri_ncyl = NRD7959BCYL,
+ .ri_nblocks = NRD7959BBLK
},
[RD2200A] = {
@@ -344,8 +344,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "2200A",
.ri_nbpt = NRD2200ABPT,
.ri_ntpc = NRD2200ATRK,
- .ri_ncyl = 1449,
- .ri_nblocks = 654948
+ .ri_ncyl = NRD2200ACYL,
+ .ri_nblocks = NRD2200ABLK
},
[RD2203A] = {
@@ -353,8 +353,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "2203A",
.ri_nbpt = NRD2203ABPT,
.ri_ntpc = NRD2203ATRK,
- .ri_ncyl = 1449,
- .ri_nblocks = 1309896
+ .ri_ncyl = NRD2203ACYL,
+ .ri_nblocks = NRD2203ABLK
},
[RD2202A] = {
@@ -362,8 +362,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "2202A",
.ri_nbpt = NRD2202ABPT,
.ri_ntpc = NRD2202ATRK,
- .ri_ncyl = 1449,
- .ri_nblocks = 1309896
+ .ri_ncyl = NRD2202ACYL,
+ .ri_nblocks = NRD2202ABLK
},
[RD7908A] = {
@@ -371,8 +371,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7908A",
.ri_nbpt = NRD7908ABPT,
.ri_ntpc = NRD7908ATRK,
- .ri_ncyl = 185,
- .ri_nblocks = 32375
+ .ri_ncyl = NRD7908ACYL,
+ .ri_nblocks = NRD7908ABLK
},
[RD7911A] = {
@@ -380,8 +380,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7911A",
.ri_nbpt = NRD7911ABPT,
.ri_ntpc = NRD7911ATRK,
- .ri_ncyl = 572,
- .ri_nblocks = 54912
+ .ri_ncyl = NRD7911ACYL,
+ .ri_nblocks = NRD7911ABLK
},
[RD7941A] = {
@@ -389,8 +389,8 @@ static const struct rdidentinfo rdidenti
.ri_desc = "7941A",
.ri_nbpt = NRD7941ABPT,
.ri_ntpc = NRD7941ATRK,
- .ri_ncyl = 968,
- .ri_nblocks = 46464
+ .ri_ncyl = NRD7941ACYL,
+ .ri_nblocks = NRD7941ABLK
}
};
static const int numrdidentinfo = __arraycount(rdidentinfo);
Index: src/sys/arch/hp300/dev/rdreg.h
diff -u src/sys/arch/hp300/dev/rdreg.h:1.18 src/sys/arch/hp300/dev/rdreg.h:1.19
--- src/sys/arch/hp300/dev/rdreg.h:1.18 Mon May 23 19:52:34 2022
+++ src/sys/arch/hp300/dev/rdreg.h Mon Nov 21 16:22:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rdreg.h,v 1.18 2022/05/23 19:52:34 andvar Exp $ */
+/* $NetBSD: rdreg.h,v 1.19 2022/11/21 16:22:37 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -177,22 +177,48 @@ struct rd_clearcmd {
#define NRD7945ABPT 16
#define NRD7945ATRK 7
+#define NRD7945ACYL 968
+#define NRD7945ABLK 108416
+
#define NRD9134DBPT 16
#define NRD9134DTRK 6
+#define NRD9134DCYL 303
+#define NRD9134DBLK 29088
+
#define NRD9122SBPT 8
#define NRD9122STRK 2
+#define NRD9122SCYL 77
+#define NRD9122SBLK 1232
+
#define NRD7912PBPT 32
#define NRD7912PTRK 7
+#define NRD7912PCYL 572
+#define NRD7912PBLK 128128
+
#define NRD7914PBPT 32
#define NRD7914PTRK 7
+#define NRD7914PCYL 1152
+#define NRD7914PBLK 258048
+
#define NRD7933HBPT 46
#define NRD7933HTRK 13
+#define NRD7933HCYL 1321
+#define NRD7933HBLK 789958
+
#define NRD9134LBPT 16
#define NRD9134LTRK 5
+#define NRD9134LCYL 973
+#define NRD9134LBLK 77840
+
#define NRD7911ABPT 32
#define NRD7911ATRK 3
+#define NRD7911ACYL 572
+#define NRD7911ABLK 54912
+
#define NRD7941ABPT 16
#define NRD7941ATRK 3
+#define NRD7941ACYL 968
+#define NRD7941ABLK 46464
/*
* Several HP drives have an odd number of 256 byte sectors per track.
@@ -223,26 +249,58 @@ struct rd_clearcmd {
*/
#define NRD7936HBPT 123
#define NRD7936HTRK 7
+#define NRD7936HCYL 698
+#define NRD7936HBLK 600978
+
#define NRD7937HBPT 123
#define NRD7937HTRK 13
+#define NRD7937HCYL 698
+#define NRD7937HBLK 1116102
+
#define NRD7957ABPT 22
#define NRD7957ATRK 7
+#define NRD7957ACYL 1036
+#define NRD7957ABLK 159544
+
#define NRD7958ABPT 36
#define NRD7958ATRK 7
+#define NRD7958ACYL 1013
+#define NRD7958ABLK 255276
+
#define NRD7957BBPT 18
#define NRD7957BTRK 7
+#define NRD7957BCYL 1269
+#define NRD7957BBLK 159894
+
#define NRD7958BBPT 42
#define NRD7958BTRK 9
+#define NRD7958BCYL 786
+#define NRD7958BBLK 297108
+
#define NRD7959BBPT 42
#define NRD7959BTRK 9
+#define NRD7959BCYL 1572
+#define NRD7959BBLK 594216
+
#define NRD2200ABPT 113
#define NRD2200ATRK 4
+#define NRD2200ACYL 1449
+#define NRD2200ABLK 654948
+
#define NRD2203ABPT 113
#define NRD2203ATRK 8
+#define NRD2203ACYL 1449
+#define NRD2203ABLK 1309896
+
#define NRD2202ABPT 113
#define NRD2202ATRK 8
+#define NRD2202ACYL 1449
+#define NRD2202ABLK 1309896
+
#define NRD7908ABPT 35
#define NRD7908ATRK 5
+#define NRD7908ACYL 185
+#define NRD7908ABLK 32375
/* controller "unit" number */
#define RDCTLR 15
Index: src/sys/arch/hp300/stand/common/rd.c
diff -u src/sys/arch/hp300/stand/common/rd.c:1.13 src/sys/arch/hp300/stand/common/rd.c:1.14
--- src/sys/arch/hp300/stand/common/rd.c:1.13 Mon Nov 21 15:05:44 2022
+++ src/sys/arch/hp300/stand/common/rd.c Mon Nov 21 16:22:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.13 2022/11/21 15:05:44 tsutsui Exp $ */
+/* $NetBSD: rd.c,v 1.14 2022/11/21 16:22:37 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -91,29 +91,29 @@ static int rderror(int, int, int);
static struct rd_softc rd_softc[NHPIB][NRD];
static const struct rdidentinfo rdidentinfo[] = {
- [RD7945A] = { RD7946AID, 0, 108416 },
- [RD9134D] = { RD9134DID, 1, 29088 },
- [RD9122S] = { RD9134LID, 1, 1232 },
- [RD7912P] = { RD7912PID, 0, 128128 },
- [RD7914P] = { RD7914PID, 0, 258048 },
- [RD7958A] = { RD7958AID, 0, 255276 },
- [RD7957A] = { RD7957AID, 0, 159544 },
- [RD7933H] = { RD7933HID, 0, 789958 },
- [RD9134L] = { RD9134LID, 1, 77840 },
- [RD7936H] = { RD7936HID, 0, 600978 },
- [RD7937H] = { RD7937HID, 0, 1116102 },
- [RD7914CT] = { RD7914CTID, 0, 258048 },
- [RD7946A] = { RD7946AID, 0, 108416 },
- [RD9122D] = { RD9134LID, 1, 1232 },
- [RD7957B] = { RD7957BID, 0, 159894 },
- [RD7958B] = { RD7958BID, 0, 297108 },
- [RD7959B] = { RD7959BID, 0, 594216 },
- [RD2200A] = { RD2200AID, 0, 654948 },
- [RD2203A] = { RD2203AID, 0, 1309896 },
- [RD2202A] = { RD2202AID, 0, 1309896 },
- [RD7908A] = { RD7908AID, 0, 32375 },
- [RD7911A] = { RD7911AID, 0, 54912 },
- [RD7941A] = { RD7946AID, 0, 46464 }
+ [RD7945A] = { RD7946AID, 0, NRD7945ABLK },
+ [RD9134D] = { RD9134DID, 1, NRD9134DBLK },
+ [RD9122S] = { RD9134LID, 1, NRD9122SBLK },
+ [RD7912P] = { RD7912PID, 0, NRD7912PBLK },
+ [RD7914P] = { RD7914PID, 0, NRD7914PBLK },
+ [RD7958A] = { RD7958AID, 0, NRD7958ABLK },
+ [RD7957A] = { RD7957AID, 0, NRD7957ABLK },
+ [RD7933H] = { RD7933HID, 0, NRD7933HBLK },
+ [RD9134L] = { RD9134LID, 1, NRD9134LBLK },
+ [RD7936H] = { RD7936HID, 0, NRD7936HBLK },
+ [RD7937H] = { RD7937HID, 0, NRD7937HBLK },
+ [RD7914CT] = { RD7914CTID, 0, NRD7914PBLK },
+ [RD7946A] = { RD7946AID, 0, NRD7945ABLK },
+ [RD9122D] = { RD9134LID, 1, NRD9122SBLK },
+ [RD7957B] = { RD7957BID, 0, NRD7957BBLK },
+ [RD7958B] = { RD7958BID, 0, NRD7958BBLK },
+ [RD7959B] = { RD7959BID, 0, NRD7959BBLK },
+ [RD2200A] = { RD2200AID, 0, NRD2200ABLK },
+ [RD2203A] = { RD2203AID, 0, NRD2203ABLK },
+ [RD2202A] = { RD2202AID, 0, NRD2202ABLK },
+ [RD7908A] = { RD7908AID, 0, NRD7908ABLK },
+ [RD7911A] = { RD7911AID, 0, NRD7911ABLK },
+ [RD7941A] = { RD7946AID, 0, NRD7941ABLK }
};
static const int numrdidentinfo = sizeof(rdidentinfo) / sizeof(rdidentinfo[0]);
