update from netbsd tree

2 files changed, 43 insertions, 8 deletions

diff --git a/sys/arch/vax/mba/hpreg.h b/sys/arch/vax/mba/hpreg.h
index ddf2ed2eed3..3b367afdec1 100644
--- a/sys/arch/vax/mba/hpreg.h
+++ b/sys/arch/vax/mba/hpreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpreg.h,v 1.2 1995/06/16 15:20:11 ragge Exp $ */
+/*	$NetBSD: hpreg.h,v 1.3 1995/10/20 13:43:43 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -55,10 +55,24 @@ struct hp_regs {
 
 #define	hp_drv	hp_regs
 
-#define	HPCS_PA		0x13	/* Pack acknowledge */
-#define	HPCS_SEEK	0x5
-#define	HPCS_READ	0x39
-#define HPCS_DVA       0x800   /* Drive avail, in dual-port config */
+#define HPCS_DVA	4000	/* Drive avail, in dual-port config */
+#define HPCS_WRITE	061	/* Write data */
+#define HPCS_WCHECK	051	/* Write check data */
+#define HPCS_WHEAD	063	/* Write header and data */
+#define HPCS_WCHEAD	053	/* Write check header and data */
+#define	HPCS_READ	071	/* Read data */
+#define HPCS_RHEAD	073	/* Read header and data */
+#define	HPCS_SEEK	005	/* Just seek */
+#define HPCS_RECAL	007	/* Recalibrate */
+#define HPCS_RTC	017	/* Return to centerline */
+#define HPCS_OFFSET	015	/* Offset */
+#define HPCS_SEARCH	031	/* Search */
+#define HPCS_UNLOAD	003	/* Unload pack (removable) */
+#define HPCS_RELEASE	013	/* Release massbuss port */
+#define HPCS_RPS	021	/* Read-in preset */
+#define	HPCS_PA		023	/* Pack acknowledge */
+#define HPCS_DC		011	/* Drive clear */
+
 
 #define HPDS_VV         0x40    /* Volume valid, not changed */
 #define HPDS_DRY        0x80    /* Drive ready to accept commands */
diff --git a/sys/arch/vax/mba/mbareg.h b/sys/arch/vax/mba/mbareg.h
index 79e1acc4eba..77c00757c42 100644
--- a/sys/arch/vax/mba/mbareg.h
+++ b/sys/arch/vax/mba/mbareg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbareg.h,v 1.1 1995/02/13 00:44:03 ragge Exp $ */
+/*	$NetBSD: mbareg.h,v 1.2 1995/10/20 13:43:44 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
  * All rights reserved.
@@ -30,7 +30,14 @@
  */
 
 /* mbareg.h - 940320/ragge */
-#include "vax/mba/hpreg.h"
+
+struct mba_device {
+	u_int	pad1;
+	u_int	md_ds;		/* unit status */
+	u_int	pad2[4];
+	u_int	md_dt;		/* unit type */
+	u_int	pad3[25];
+};
 
 struct mba_regs {
 	u_int	mba_csr;
@@ -42,7 +49,7 @@ struct mba_regs {
 	u_int	mba_smr;
 	u_int	mba_car;
 	u_int	utrymme[248];
-	struct	hp_drv hp_drv[8];
+	struct	mba_device mba_md[8];	/* unit specific regs */
 	u_int	mba_map[256];
 };
 
@@ -78,3 +85,17 @@ struct mba_regs {
 #define MBASR_ERR_STAT	0x8		/* Error status */
 #define	MBASR_NRSTAT	0x2		/* No Response status */
 
+/* Definitions in mba_device md_ds */
+#define	MBADS_DPR	0x100		/* Unit present */
+
+/* Definitions in mba_device md_dt */
+#define	MBADT_RP04	0x10
+#define MBADT_RP05	0x11
+#define MBADT_RP06	0x12
+#define MBADT_RP07	0x22
+#define MBADT_RM02	0x15
+#define MBADT_RM03	0x14
+#define MBADT_RM05	0x17
+#define MBADT_RM80	0x16
+#define	MBADT_DRQ	0x800		/* Dual ported */
+#define	MBADT_MOH	0x2000		/* Moving head device */