update from netbsd tree

6 files changed, 35 insertions, 18 deletions

diff --git a/sys/arch/atari/atari/disksubr.c b/sys/arch/atari/atari/disksubr.c
index 3aed20a794a..6a19dd9af1b 100644
--- a/sys/arch/atari/atari/disksubr.c
+++ b/sys/arch/atari/atari/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.3 1995/08/05 20:24:16 leo Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.3.2.1 1995/10/21 21:34:19 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -85,6 +85,11 @@ int			wlabel;
 
 	pp = &lp->d_partitions[DISKPART(bp->b_dev)];
 	if (bp->b_flags & B_RAW) {
+		if (bp->b_bcount & (DEV_BSIZE - 1)) {
+			bp->b_error = EINVAL;
+			bp->b_flags |= B_ERROR;
+			return (-1);
+		}
 		maxsz = pp->p_size * (lp->d_secsize / DEV_BSIZE);
 		sz = (bp->b_bcount + DEV_BSIZE - 1) >> DEV_BSHIFT;
 	} else {
diff --git a/sys/arch/atari/atari/locore.s b/sys/arch/atari/atari/locore.s
index ebea604a5da..77755e866ae 100644
--- a/sys/arch/atari/atari/locore.s
+++ b/sys/arch/atari/atari/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.9.2.1 1995/10/12 08:15:56 leo Exp $	*/
+/*	$NetBSD: locore.s,v 1.9.2.2 1995/10/21 13:04:54 leo Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -800,10 +800,13 @@ Lstartnot040:
 	movl	a2,a1@(PCB_USP)		| and save it
 	movl	a1,_curpcb		| proc0 is running
 	clrw	a1@(PCB_FLAGS)		| clear flags
-	clrl	a1@(PCB_FPCTX)		|  ensure null FP context
-	pea	a1@(PCB_FPCTX)
-	jbsr	_m68881_restore		|  restore it (does not kill a1)
-	addql	#4,sp
+| LWP: The next part can be savely ommitted I think. The fpu probing
+|      code resets the m6888? fpu. How about a 68040 fpu?
+|
+|	clrl	a1@(PCB_FPCTX)		|  ensure null FP context
+|	pea	a1@(PCB_FPCTX)
+|	jbsr	_m68881_restore		|  restore it (does not kill a1)
+|	addql	#4,sp
 
 	/* flush TLB and turn on caches */
 	jbsr	_TBIA			|  invalidate TLB
@@ -1288,7 +1291,7 @@ Lres5:
 	movl	a1@(PCB_USP),a0
 	movl	a0,usp			|  and USP
 	tstl	_fputype		|  do we have an FPU?
-	jeq	Lresfprest		|  no, don't attempt to restore
+	jeq	Lnofprest		|  no, don't attempt to restore
 	lea	a1@(PCB_FPCTX),a0	|  pointer to FP save area
 	tstb	a0@			|  null state frame?
 	jeq	Lresfprest		|  yes, easy
@@ -1296,6 +1299,8 @@ Lres5:
 	fmovem	a0@(216),fp0-fp7	|  restore FP general registers
 Lresfprest:
 	frestore a0@			|  restore state
+
+Lnofprest:
 	movw	a1@(PCB_PS),sr		|  no, restore PS
 	moveq	#1,d0			|  return 1 (for alternate returns)
 	rts
diff --git a/sys/arch/atari/atari/trap.c b/sys/arch/atari/atari/trap.c
index 1f19decb06a..201fbfaab1a 100644
--- a/sys/arch/atari/atari/trap.c
+++ b/sys/arch/atari/atari/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.9.2.1 1995/10/13 21:04:18 leo Exp $	*/
+/*	$NetBSD: trap.c,v 1.9.2.3 1995/10/23 07:50:11 leo Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -559,6 +559,10 @@ trap(type, code, v, frame)
 #ifdef FPU_EMULATE
 		i = fpu_emulate(&frame, &p->p_addr->u_pcb.pcb_fpregs);
 		/* XXX -- deal with tracing? (frame.f_sr & PSL_T) */
+		if (i == 0) {
+			userret(p, frame.f_pc, sticks); 
+			return;
+		}
 #else
 		uprintf("pid %d killed: no floating point support.\n",
 			p->p_pid);
diff --git a/sys/arch/atari/conf/GENERIC b/sys/arch/atari/conf/GENERIC
index cfffb07a467..5b00bfdbdf7 100644
--- a/sys/arch/atari/conf/GENERIC
+++ b/sys/arch/atari/conf/GENERIC
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.7.2.1 1995/10/12 08:20:14 leo Exp $
+#	$NetBSD: GENERIC,v 1.7.2.2 1995/10/22 21:17:59 leo Exp $
 #
 # Generic atari
 #
@@ -83,7 +83,7 @@ options		GENERIC			# Mini-root boot support
 # Atari specific options
 #
 #options	KFONT_8x8		# Use 8x8 font instead of 8x16
-#options	FPU_EMULATE		# Floating point emulation
+options		FPU_EMULATE		# Floating point emulation
 options		"ST_POOL_SIZE=22"	# smallest that allows TT-HIGH
 options		TT_SCSI			# SCSI-support for TT
 options		FALCON_SCSI		# SCSI-support for Falcon
@@ -95,15 +95,16 @@ options		FALCON_VIDEO		# Graphics support for FALCON
 #
 config		netbsd swap on generic
 
-pseudo-device	mouse	1	# mouse
-pseudo-device	view	2	# View (graphics mapping)
+pseudo-device	mouse	 1	# mouse
+pseudo-device	view	 2	# View (graphics mapping)
 pseudo-device	sl		# Slip
 pseudo-device	ppp		# ppp
-pseudo-device	pty	16	# Pseudo-tty support
+pseudo-device	pty	 16	# Pseudo-tty support
 pseudo-device	loop		# Loopback network
-pseudo-device	vnd	3	# 3 pseudo disks (see vnconfig)
+pseudo-device	vnd	 3	# 3 pseudo disks (see vnconfig)
 pseudo-device	bpfilter 2	# berkeley packet filters
-pseudo-device	tun	2	# network tunnel
+pseudo-device	tun	 2	# network tunnel
+pseudo-device	ccd	 4	# concatenating disk driver
 
 #
 #The following sections describe various hardware options.
diff --git a/sys/arch/atari/conf/Makefile.atari b/sys/arch/atari/conf/Makefile.atari
index 39dcdf5a6a8..9d3dac3c37e 100644
--- a/sys/arch/atari/conf/Makefile.atari
+++ b/sys/arch/atari/conf/Makefile.atari
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.atari,v 1.7 1995/09/23 20:22:01 leo Exp $
+#	$NetBSD: Makefile.atari,v 1.7.2.1 1995/10/22 21:12:22 leo Exp $
 #
 # Makefile for NetBSD Atari-TT
 #
@@ -33,7 +33,7 @@ ATARI=	../..
 
 INCLUDES= -I. -I$S/arch -I$S -I$S/sys 
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Datari
-CFLAGS=	-O2 -Werror -fno-builtin -mc68020 -msoft-float ${COPTS}
+CFLAGS=	-O2 -Werror -mc68020 -msoft-float ${COPTS}
 
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c
index 5d88a1f8c68..7111d6b4ab0 100644
--- a/sys/arch/atari/dev/ncr5380.c
+++ b/sys/arch/atari/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr5380.c,v 1.11 1995/10/08 13:34:23 leo Exp $	*/
+/*	$NetBSD: ncr5380.c,v 1.11.2.1 1995/10/19 09:46:57 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -1189,6 +1189,7 @@ struct ncr_softc *sc;
 	SET_5380_REG(NCR5380_ICOM, SC_A_BSY);
 	len = 1000;
 	while ((GET_5380_REG(NCR5380_IDSTAT) & SC_S_SEL) && (len > 0)) {
+#ifdef notyet /* LWP: Should be looked after */
 		if(!GET_5380_REG(NCR5380_DATA)) {
 			/*
 			 * We stepped into the reselection timeout....
@@ -1196,6 +1197,7 @@ struct ncr_softc *sc;
 			SET_5380_REG(NCR5380_ICOM, 0);
 			return;
 		}
+#endif /* notyet */
 		delay(1);
 		len--;
 	}