bring back all the local OpenBSD changes to the pmax tree since 961107

i hope that i did'nt break anything of the files required for the alpha
(in the dev dir) niklas :-)

13 files changed, 23 insertions, 39 deletions

diff --git a/sys/arch/pmax/dev/sfbreg.h b/sys/arch/pmax/dev/sfbreg.h
index 8942855832c..fdecb7bc71a 100644
--- a/sys/arch/pmax/dev/sfbreg.h
+++ b/sys/arch/pmax/dev/sfbreg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sfb.c	8.1 (Berkeley) 6/10/93
- *      $Id: sfbreg.h,v 1.3 1996/12/22 15:17:40 graichen Exp $
+ *      $Id: sfbreg.h,v 1.4 1996/12/22 15:22:07 graichen Exp $
  */
 
 #define	SFB_OFFSET_VRAM		0x201000	/* from module's base */
diff --git a/sys/arch/pmax/dev/sii.c b/sys/arch/pmax/dev/sii.c
index aadc25d0c94..43185c1b113 100644
--- a/sys/arch/pmax/dev/sii.c
+++ b/sys/arch/pmax/dev/sii.c
@@ -88,7 +88,7 @@ struct  cfdriver sii_cd = {
 	NULL, "sii", DV_DULL
 };
 
-int	siiprint(void*, char*);
+int	siiprint(void*, const char*);
 int siiintr __P((void *sc));
 
 #ifdef USE_NEW_SCSI
diff --git a/sys/arch/pmax/include/ecoff.h b/sys/arch/pmax/include/ecoff.h
index 8838d6462a9..39658907035 100644
--- a/sys/arch/pmax/include/ecoff.h
+++ b/sys/arch/pmax/include/ecoff.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ecoff.h,v 1.4 1996/12/22 15:18:10 graichen Exp $	*/
+/*	$OpenBSD: ecoff.h,v 1.5 1996/12/22 15:22:21 graichen Exp $	*/
 /*	$NetBSD: ecoff.h,v 1.4 1995/06/16 02:07:33 mellon Exp $	*/
 
 /*
diff --git a/sys/arch/pmax/include/endian.h b/sys/arch/pmax/include/endian.h
index 968b1d5c446..17b0253a45b 100644
--- a/sys/arch/pmax/include/endian.h
+++ b/sys/arch/pmax/include/endian.h
@@ -56,7 +56,7 @@
  */
 #define	LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
 #define	BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
-#define	PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
+#define	PDP_ENDIAN	3412	/* LSB first in word, MSW first in int32_t */
 
 #define	BYTE_ORDER	LITTLE_ENDIAN
 
diff --git a/sys/arch/pmax/include/exec.h b/sys/arch/pmax/include/exec.h
index 8a460086e6f..34ffd0bf1d2 100644
--- a/sys/arch/pmax/include/exec.h
+++ b/sys/arch/pmax/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.5 1996/12/22 15:18:13 graichen Exp $	*/
+/*	$OpenBSD: exec.h,v 1.6 1996/12/22 15:22:22 graichen Exp $	*/
 /*	$NetBSD: exec.h,v 1.5 1994/10/26 21:09:39 cgd Exp $	*/
 
 /*-
diff --git a/sys/arch/pmax/include/param.h b/sys/arch/pmax/include/param.h
index 33eb0c3dc82..e677902b4b2 100644
--- a/sys/arch/pmax/include/param.h
+++ b/sys/arch/pmax/include/param.h
@@ -88,8 +88,8 @@
  * of the hardware page size.
  */
 #define	MSIZE		128		/* size of an mbuf */
-#define	MCLBYTES	2048		/* enough for whole Ethernet packet */
-#define	MCLSHIFT	10
+#define	MCLSHIFT	11
+#define	MCLBYTES	(1 << MCLSHIFT)	/* enough for whole Ethernet packet */
 #define	MCLOFSET	(MCLBYTES - 1)
 #ifndef NMBCLUSTERS
 #ifdef GATEWAY
diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c
index ce8b048d180..b3fe13ce40c 100644
--- a/sys/arch/pmax/pmax/conf.c
+++ b/sys/arch/pmax/pmax/conf.c
@@ -47,18 +47,16 @@
 #include <sys/vnode.h>
 
 #include "vnd.h"
-bdev_decl(vnd);
 bdev_decl(sw);
 #include "rz.h"
 bdev_decl(rz);
 #include "tz.h"
 bdev_decl(tz);
 #include "sd.h"
-bdev_decl(sd);
 #include "st.h"
-bdev_decl(st);
+#include "ss.h"
+#include "uk.h"
 #include "ccd.h"
-bdev_decl(ccd);
 
 struct bdevsw	bdevsw[] =
 {
@@ -101,29 +99,13 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 dev_t	swapdev = makedev(4, 0);
 
 
-cdev_decl(cn);
 cdev_decl(sw);
-cdev_decl(random);
-cdev_decl(ctty);
 #define	mmread	mmrw
 #define	mmwrite	mmrw
 dev_type_read(mmrw);
 cdev_decl(mm);
 #include "pty.h"
-#define ptstty ptytty
-#define ptsioctl ptyioctl
-cdev_decl(pts);
-#define ptctty ptytty
-#define ptcioctl ptyioctl
-cdev_decl(ptc);
-cdev_decl(log);
-cdev_decl(fd);
-cdev_decl(sd);
-cdev_decl(st);
-cdev_decl(vnd);
-cdev_decl(ccd);
 #include "bpfilter.h"
-cdev_decl(bpf);
 #include "dtop.h"
 cdev_decl(dtop);
 #include "dc.h"
@@ -253,6 +235,8 @@ struct cdevsw	cdevsw[] =
 	cdev_fbm_init(NFB,fb),	/* 86: frame buffer pseudo-device */
 	cdev_disk_init(NCCD,ccd),	/* 87: concatenated disk driver */
 	cdev_random_init(1,random),     /* 88: random data source */
+	cdev_uk_init(NUK,uk),           /* 98: unknown SCSI */
+	cdev_ss_init(NSS,ss),           /* 99: SCSI scanner */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/pmax/pmax/cpu.c b/sys/arch/pmax/pmax/cpu.c
index 3036250b923..b3fd8ee0dc2 100644
--- a/sys/arch/pmax/pmax/cpu.c
+++ b/sys/arch/pmax/pmax/cpu.c
@@ -83,7 +83,7 @@ cpuattach(parent, dev, aux)
 static int
 cpuprint(aux, pnp)
 	void *aux;
-	char *pnp;
+	const char *pnp;
 {
 	register struct confargs *ca = aux;
 
diff --git a/sys/arch/pmax/pmax/genassym.c b/sys/arch/pmax/pmax/genassym.c
index 5e8652f394b..3b2726c3a83 100644
--- a/sys/arch/pmax/pmax/genassym.c
+++ b/sys/arch/pmax/pmax/genassym.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: genassym.c,v 1.4 1996/12/22 15:18:29 graichen Exp $	*/
+/*	$OpenBSD: genassym.c,v 1.5 1996/12/22 15:22:30 graichen Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	8.2 (Berkeley) 9/23/93
- *      $Id: genassym.c,v 1.4 1996/12/22 15:18:29 graichen Exp $
+ *      $Id: genassym.c,v 1.5 1996/12/22 15:22:30 graichen Exp $
  */
 
 
diff --git a/sys/arch/pmax/pmax/locore.S b/sys/arch/pmax/pmax/locore.S
index df2a2e68b43..92728850a43 100644
--- a/sys/arch/pmax/pmax/locore.S
+++ b/sys/arch/pmax/pmax/locore.S
@@ -561,11 +561,11 @@ NON_LEAF(setrunqueue, STAND_FRAME_SIZE, ra)
 END(setrunqueue)
 
 /*
- * remrq(p)
+ * remrunqueue(p)
  *
  * Call should be made at splclock().
  */
-NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
+NON_LEAF(remrunqueue, STAND_FRAME_SIZE, ra)
 	subu	sp, sp, STAND_FRAME_SIZE
 	.mask	0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE)
 	lbu	t0, P_PRIORITY(a0)	# get from p->p_priority / 4 queue
@@ -577,7 +577,7 @@ NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
 	sw	ra, STAND_RA_OFFSET(sp)	##
 	bne	v0, zero, 1f		##
 	lw	v0, P_BACK(a0)		# v0 = p->p_back
-	PANIC("remrq")		## it wasnt recorded to be on its q
+	PANIC("remrunqueue")		## it wasnt recorded to be on its q
 1:
 	lw	v1, P_FORW(a0)		# v1 = p->p_forw
 	nop
@@ -596,7 +596,7 @@ NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
 	sw	zero, P_BACK(a0)	## for firewall checking
 	j	ra
 	addu	sp, sp, STAND_FRAME_SIZE
-END(remrq)
+END(remrunqueue)
 
 /*
  * switch_exit()
diff --git a/sys/arch/pmax/pmax/mainbus.c b/sys/arch/pmax/pmax/mainbus.c
index 46cc5f27a83..2211578c06d 100644
--- a/sys/arch/pmax/pmax/mainbus.c
+++ b/sys/arch/pmax/pmax/mainbus.c
@@ -54,7 +54,7 @@ struct mainbus_softc {
 /* Definition of the mainbus driver. */
 static int	mbmatch __P((struct device *, void *, void *));
 static void	mbattach __P((struct device *, struct device *, void *));
-static int	mbprint __P((void *, /* const TTTTT */ char *));
+static int	mbprint __P((void *, const char *));
 
 struct cfattach mainbus_ca = {
 	sizeof (struct mainbus_softc), mbmatch, mbattach
@@ -235,7 +235,7 @@ dev slot > number of slots for %s",
 static int
 mbprint(aux, pnp)
 	void *aux;
-	/* const TTTTT */ char *pnp;
+	const char *pnp;
 {
 
 	if (pnp)
diff --git a/sys/arch/pmax/stand/filesystem.c b/sys/arch/pmax/stand/filesystem.c
index f60323a72ef..3d34cb86ca1 100644
--- a/sys/arch/pmax/stand/filesystem.c
+++ b/sys/arch/pmax/stand/filesystem.c
@@ -30,7 +30,7 @@
  *
  *	filesystem.c
  *
- *	$Id: filesystem.c,v 1.3 1996/12/22 15:18:50 graichen Exp $
+ *	$Id: filesystem.c,v 1.4 1996/12/22 15:23:01 graichen Exp $
  */
 
 #include <stand.h>
diff --git a/sys/arch/pmax/tc/asic.c b/sys/arch/pmax/tc/asic.c
index 270de0da728..28771c00e55 100644
--- a/sys/arch/pmax/tc/asic.c
+++ b/sys/arch/pmax/tc/asic.c
@@ -69,7 +69,7 @@ struct asic_softc {
 /* Definition of the driver for autoconfig. */
 int	asicmatch __P((struct device *, void *, void *));
 void	asicattach __P((struct device *, struct device *, void *));
-int     asicprint(void *, /* const TTTTT */ char *);
+int     asicprint(void *, const char *);
 
 /* Device locators. */
 #define	ioasiccf_offset	cf_loc[0]		/* offset */
@@ -248,7 +248,7 @@ asicattach(parent, self, aux)
 int
 asicprint(aux, pnp)
 	void *aux;
-	/* const TTTTT */ char *pnp;
+	const char *pnp;
 {
 	struct ioasicdev_attach_args *d = aux;