CVS commit: [netbsd-5] src/sys/arch/atari/dev
Module Name:src
Committed By: riz
Date: Sat Nov 20 01:09:27 UTC 2010
Modified Files:
src/sys/arch/atari/dev [netbsd-5]: atari5380.c dma.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1373):
sys/arch/atari/dev/dma.c: revision 1.25
sys/arch/atari/dev/atari5380.c: revision 1.54
Always schedule callback functions via add_sicallback(),
which calls softint_schedule(9).
We cannot use BASEPRI() to check recursive calls any longer
since softint(9) has been reorganized to use kernel thread.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/arch/atari/dev/atari5380.c
cvs rdiff -u -r1.18 -r1.18.54.1 src/sys/arch/atari/dev/dma.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/atari/dev/atari5380.c
diff -u src/sys/arch/atari/dev/atari5380.c:1.46 src/sys/arch/atari/dev/atari5380.c:1.46.2.1
--- src/sys/arch/atari/dev/atari5380.c:1.46 Wed Oct 29 14:31:01 2008
+++ src/sys/arch/atari/dev/atari5380.c Sat Nov 20 01:09:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.46 2008/10/29 14:31:01 abs Exp $ */
+/* $NetBSD: atari5380.c,v 1.46.2.1 2010/11/20 01:09:27 riz Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.46 2008/10/29 14:31:01 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.46.2.1 2010/11/20 01:09:27 riz Exp $");
#include "opt_atariscsi.h"
@@ -1131,14 +1131,7 @@
{
if (GET_5380_REG(NCR5380_DMSTAT) & SC_IRQ_SET) {
scsi_idisable();
- if (!BASEPRI(sr))
- add_sicallback((si_farg)ncr_ctrl_intr,
- (void *)cur_softc, 0);
- else {
- spl1();
- ncr_ctrl_intr(cur_softc);
- spl0();
- }
+ add_sicallback((si_farg)ncr_ctrl_intr, (void *)cur_softc, 0);
}
}
@@ -1152,14 +1145,7 @@
if ((reqp = connected) && (reqp->dr_flag & DRIVER_IN_DMA)) {
scsi_idisable();
- if (!BASEPRI(sr))
- add_sicallback((si_farg)ncr_dma_intr,
- (void *)cur_softc, 0);
- else {
- spl1();
- ncr_dma_intr(cur_softc);
- spl0();
- }
+ add_sicallback((si_farg)ncr_dma_intr, (void *)cur_softc, 0);
}
}
Index: src/sys/arch/atari/dev/dma.c
diff -u src/sys/arch/atari/dev/dma.c:1.18 src/sys/arch/atari/dev/dma.c:1.18.54.1
--- src/sys/arch/atari/dev/dma.c:1.18 Sun Mar 4 05:59:40 2007
+++ src/sys/arch/atari/dev/dma.c Sat Nov 20 01:09:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: dma.c,v 1.18.54.1 2010/11/20 01:09:27 riz Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.18.54.1 2010/11/20 01:09:27 riz Exp $");
#include
#include
@@ -232,14 +232,7 @@
*/
int_func = dma_active.tqh_first->int_func;
softc= dma_active.tqh_first->softc;
-
- if(!BASEPRI(sr))
- add_sicallback((si_farg)int_func, softc, 0);
- else {
- spl1();
- (*int_func)(softc);
- spl0();
- }
+ add_sicallback((si_farg)int_func, softc, 0);
return 1;
}
return 0;
CVS commit: [netbsd-5] src/sys/arch/atari
Module Name:src
Committed By: riz
Date: Sat Nov 20 00:47:56 UTC 2010
Modified Files:
src/sys/arch/atari/conf [netbsd-5]: GENERIC.in
src/sys/arch/atari/dev [netbsd-5]: ser.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1368):
sys/arch/atari/dev/ser.c: revision 1.49
sys/arch/atari/conf/GENERIC.in: revision 1.86
Make options SERCONSOLE (force serial console if DCD is detected)
patchable by binpatch(8) like:
---
serconsole(0x23bac4): 0x0001 (1), at offset 0x23bb44 in /netbsd
new value: 0x (0)
---
May work around PR port-atari/39849
(netbsd-ATARITT kernel fails with serial port connected)
and some old TT030 with early revision boards.
Disable options SERCONSOLE (force serial console if DCD is detected)
because now it's patchable by binpatch(8).
Enabling serial console by DCD signal could be problematic
on some earlier TT030 (with revision A board), and it's also
annoying for users who connect an active device on the serial port
as mentioned in PR port-atari/39849.
XXX: Eventually serial console should be enabled by MD bootloader flags,
XXX: but I have no idea how to build bootloader binaries for TOS.
To generate a diff of this commit:
cvs rdiff -u -r1.73.4.7 -r1.73.4.8 src/sys/arch/atari/conf/GENERIC.in
cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/arch/atari/dev/ser.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/atari/conf/GENERIC.in
diff -u src/sys/arch/atari/conf/GENERIC.in:1.73.4.7 src/sys/arch/atari/conf/GENERIC.in:1.73.4.8
--- src/sys/arch/atari/conf/GENERIC.in:1.73.4.7 Sat Nov 20 00:33:46 2010
+++ src/sys/arch/atari/conf/GENERIC.in Sat Nov 20 00:47:55 2010
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.73.4.7 2010/11/20 00:33:46 riz Exp $
+# $NetBSD: GENERIC.in,v 1.73.4.8 2010/11/20 00:47:55 riz Exp $
#
# Generic atari
#
@@ -231,7 +231,7 @@
options DISKLABEL_AHDI # NetBSD/AHDI disklabels
#if !defined(SMALL030_KERNEL)
#if !defined(FALCON_KERNEL)
-options SERCONSOLE # modem1 console support, breaks Falcon
+#options SERCONSOLE # modem1 console support, breaks Falcon
#endif /* !FALCON_KERNEL */
options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM
options MSGBUFSIZE=32768# size of kernel msg. buffer
Index: src/sys/arch/atari/dev/ser.c
diff -u src/sys/arch/atari/dev/ser.c:1.39 src/sys/arch/atari/dev/ser.c:1.39.6.1
--- src/sys/arch/atari/dev/ser.c:1.39 Wed Jun 11 14:35:53 2008
+++ src/sys/arch/atari/dev/ser.c Sat Nov 20 00:47:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.39 2008/06/11 14:35:53 tsutsui Exp $ */
+/* $NetBSD: ser.c,v 1.39.6.1 2010/11/20 00:47:55 riz Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.39 2008/06/11 14:35:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.39.6.1 2010/11/20 00:47:55 riz Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -262,6 +262,11 @@
serstop, sertty, serpoll, nommap, ttykqfilter, D_TTY
};
+#ifndef SERCONSOLE
+#define SERCONSOLE 0
+#endif
+int serconsole = SERCONSOLE; /* patchable */
+
/*ARGSUSED*/
static int
sermatch(pdp, cfp, auxp)
@@ -316,13 +321,13 @@
callout_init(&sc->sc_diag_ch, 0);
-#if SERCONSOLE > 0
- /*
- * Activate serial console when DCD present...
- */
- if (!(MFP->mf_gpip & MCR_DCD))
- SET(sc->sc_hwflags, SER_HW_CONSOLE);
-#endif /* SERCONSOLE > 0 */
+ if (serconsole) {
+ /*
+ * Activate serial console when DCD present...
+ */
+ if (!(MFP->mf_gpip & MCR_DCD))
+ SET(sc->sc_hwflags, SER_HW_CONSOLE);
+ }
printf("\n");
if (ISSET(sc->sc_hwflags, SER_HW_CONSOLE)) {
@@ -1416,11 +1421,10 @@
/* initialize required fields */
/* XXX: LWP What unit? */
cp->cn_dev = makedev(cdevsw_lookup_major(&ser_cdevsw), 0);
-#if SERCONSOLE > 0
- cp->cn_pri = CN_REMOTE; /* Force a serial port console */
-#else
- cp->cn_pri = CN_NORMAL;
-#endif /* SERCONSOLE > 0 */
+ if (serconsole)
+ cp->cn_pri = CN_REMOTE; /* Force a serial port console */
+ else
+ cp->cn_pri = CN_NORMAL;
}
void
CVS commit: [netbsd-5] src/sys/arch/atari/conf
Module Name:src Committed By: riz Date: Sat Nov 20 00:48:29 UTC 2010 Modified Files: src/sys/arch/atari/conf [netbsd-5]: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen for ticket 1368. To generate a diff of this commit: cvs rdiff -u -r1.86.4.6 -r1.86.4.7 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.84.4.6 -r1.84.4.7 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.76.4.6 -r1.76.4.7 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.53.4.6 -r1.53.4.7 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.57.4.6 -r1.57.4.7 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/atari/conf/SMALL030 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/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.86.4.6 src/sys/arch/atari/conf/ATARITT:1.86.4.7 --- src/sys/arch/atari/conf/ATARITT:1.86.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/ATARITT Sat Nov 20 00:48:26 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: ATARITT,v 1.86.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: ATARITT,v 1.86.4.7 2010/11/20 00:48:26 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -93,8 +93,6 @@ options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels -options SERCONSOLE # modem1 console support, breaks Falcon - options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer Index: src/sys/arch/atari/conf/FALCON diff -u src/sys/arch/atari/conf/FALCON:1.84.4.6 src/sys/arch/atari/conf/FALCON:1.84.4.7 --- src/sys/arch/atari/conf/FALCON:1.84.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/FALCON Sat Nov 20 00:48:27 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: FALCON,v 1.84.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: FALCON,v 1.84.4.7 2010/11/20 00:48:27 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. Index: src/sys/arch/atari/conf/HADES diff -u src/sys/arch/atari/conf/HADES:1.76.4.6 src/sys/arch/atari/conf/HADES:1.76.4.7 --- src/sys/arch/atari/conf/HADES:1.76.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/HADES Sat Nov 20 00:48:27 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: HADES,v 1.76.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: HADES,v 1.76.4.7 2010/11/20 00:48:27 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -99,8 +99,6 @@ options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels -options SERCONSOLE # modem1 console support, breaks Falcon - options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer Index: src/sys/arch/atari/conf/MILAN-ISAIDE diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.6 src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.7 --- src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/MILAN-ISAIDE Sat Nov 20 00:48:28 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-ISAIDE,v 1.53.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: MILAN-ISAIDE,v 1.53.4.7 2010/11/20 00:48:28 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -96,8 +96,6 @@ options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels -options SERCONSOLE # modem1 console support, breaks Falcon - options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer Index: src/sys/arch/atari/conf/MILAN-PCIIDE diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.6 src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.7 --- src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/MILAN-PCIIDE Sat Nov 20 00:48:28 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-PCIIDE,v 1.57.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: MILAN-PCIIDE,v 1.57.4.7 2010/11/20 00:48:28 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -96,8 +96,6 @@ options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels -options SERCONSOLE # modem1 console support, breaks Falcon - options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer Index: src/sys/arch/atari/conf/SMALL030 diff -u src/sys/arch/atari/conf/SMALL030:1.1.2.5 src/sys/arch/atari/conf/SMALL030:1.1.2.6 --- src/sys/arch/atari/conf/SMALL030:1.1.2.5 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/SMALL030 Sat Nov 20 00:48:29 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: SMALL030,v 1.1.2.5 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: SMAL
CVS commit: [netbsd-5] src/sys/arch/atari/conf
Module Name:src Committed By: riz Date: Sat Nov 20 00:34:14 UTC 2010 Modified Files: src/sys/arch/atari/conf [netbsd-5]: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen for ticket 1367. To generate a diff of this commit: cvs rdiff -u -r1.86.4.5 -r1.86.4.6 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.84.4.5 -r1.84.4.6 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.76.4.5 -r1.76.4.6 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.53.4.5 -r1.53.4.6 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.57.4.5 -r1.57.4.6 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/atari/conf/SMALL030 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/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.86.4.5 src/sys/arch/atari/conf/ATARITT:1.86.4.6 --- src/sys/arch/atari/conf/ATARITT:1.86.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/ATARITT Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: ATARITT,v 1.86.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: ATARITT,v 1.86.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -145,6 +145,7 @@ ite2 at grfcc2 # 3rd tty lp0 at mainbus0 # centronics printer ser0 at mainbus0 # UART on first 68901 (ttyB0) +ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot avmebus0 at mainbus0 # VME bus vme0 at avmebus0 Index: src/sys/arch/atari/conf/FALCON diff -u src/sys/arch/atari/conf/FALCON:1.84.4.5 src/sys/arch/atari/conf/FALCON:1.84.4.6 --- src/sys/arch/atari/conf/FALCON:1.84.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/FALCON Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: FALCON,v 1.84.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: FALCON,v 1.84.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -147,6 +147,7 @@ ite2 at grfcc2 # 3rd tty lp0 at mainbus0 # centronics printer ser0 at mainbus0 # UART on first 68901 (ttyB0) +ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot wdc0 at mainbus0 # IDE-bus atabus* at wdc? channel ? wd* at atabus? drive ? Index: src/sys/arch/atari/conf/HADES diff -u src/sys/arch/atari/conf/HADES:1.76.4.5 src/sys/arch/atari/conf/HADES:1.76.4.6 --- src/sys/arch/atari/conf/HADES:1.76.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/HADES Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: HADES,v 1.76.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: HADES,v 1.76.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. Index: src/sys/arch/atari/conf/MILAN-ISAIDE diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.5 src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.6 --- src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/MILAN-ISAIDE Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-ISAIDE,v 1.53.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: MILAN-ISAIDE,v 1.53.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. Index: src/sys/arch/atari/conf/MILAN-PCIIDE diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.5 src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.6 --- src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/MILAN-PCIIDE Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-PCIIDE,v 1.57.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: MILAN-PCIIDE,v 1.57.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. Index: src/sys/arch/atari/conf/SMALL030 diff -u src/sys/arch/atari/conf/SMALL030:1.1.2.4 src/sys/arch/atari/conf/SMALL030:1.1.2.5 --- src/sys/arch/atari/conf/SMALL030:1.1.2.4 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/SMALL030 Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: SMALL030,v 1.1.2.4 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: SMALL030,v 1.1.2.5 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory.
CVS commit: [netbsd-5] src/sys/arch/atari/conf
Module Name:src Committed By: riz Date: Sat Nov 20 00:27:31 UTC 2010 Modified Files: src/sys/arch/atari/conf [netbsd-5]: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen for ticket 1366. To generate a diff of this commit: cvs rdiff -u -r1.86.4.4 -r1.86.4.5 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.84.4.4 -r1.84.4.5 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.76.4.4 -r1.76.4.5 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.53.4.4 -r1.53.4.5 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.57.4.4 -r1.57.4.5 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/atari/conf/SMALL030 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/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.86.4.4 src/sys/arch/atari/conf/ATARITT:1.86.4.5 --- src/sys/arch/atari/conf/ATARITT:1.86.4.4 Thu Mar 12 23:33:48 2009 +++ src/sys/arch/atari/conf/ATARITT Sat Nov 20 00:27:31 2010 @@ -1,23 +1,27 @@ # -# $NetBSD: ATARITT,v 1.86.4.4 2009/03/12 23:33:48 snj Exp $ +# $NetBSD: ATARITT,v 1.86.4.5 2010/11/20 00:27:31 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $ +# NetBSD$ include "arch/atari/conf/std.atari" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 + options HZ=64 # Set the clock-rate (48/64/96) + options INSECURE # disable kernel security levels options M68030 # support for 030 options FPU_EMULATE # Support for MC68881/MC68882 emulator options INET # IP + ICMP + TCP + UDP + options INET6 # IPV6 options PPP_BSDCOMP # BSD-Compress compression support for PPP options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) + options PFIL_HOOKS # pfil(9) packet filter hooks options IPFILTER_LOG # ipmon(8) log support options IPFILTER_LOOKUP # ippool(8) support @@ -25,6 +29,7 @@ file-system MFS # Memory based filesystem file-system MSDOSFS # MSDOS filesystem file-system CD9660 # ISO 9660 filesystem with Rock Ridge + file-system KERNFS # Kernel parameter filesystem file-system NFS # Network File System client side code file-system PROCFS # Process filesystem @@ -35,13 +40,20 @@ file-system UMAPFS # null file system (with uid & gid remapping) file-system PORTAL # portal file system file-system EXT2FS # second extended file system (linux) + file-system PTYFS # /dev/pts/N support + options WAPBL # File system journaling support - Experimental + options SOFTDEP # FFS soft updates support. + options NFSSERVER # Network File System server side code + options PANICWAIT # Require keystroke to dump/reboot + options DDB # Kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB + options COMPAT_43 # 4.3 BSD compatible system calls options COMPAT_10 # Compatibility with NetBSD 1.0 options COMPAT_11 # Compatibility with NetBSD 1.1 @@ -49,71 +61,101 @@ options COMPAT_13 # Compatibility with NetBSD 1.3 options COMPAT_14 # Compatibility with NetBSD 1.4 options COMPAT_15 # Compatibility with NetBSD 1.5 + options COMPAT_16 # Compatibility with NetBSD 1.6 options COMPAT_20 # Compatibility with NetBSD 2.0 options COMPAT_30 # NetBSD 3.0 compatibility. options COMPAT_40 # NetBSD 4.0 compatibility. + options COMPAT_AOUT_M68K # Compatibility to a.out executables options EXEC_AOUT # a.out format executables + options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. + options SYSVSHM # System V shared memory options SYSVMSG # System V messages options SYSVSEM # System V semaphores options P1003_1B_SEMAPHORE # p1003.1b semaphore support + options KTRACE # Add kernel tracing system call + options USERCONF # userconf(4) support + options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel + options SCSIVERBOSE # human readable SCSI error messages options ST_POOL_SIZE=24 # smallest that allows TT-HIGH + options TT_SCSI # SCSI-support for TT options TT_VIDEO # Graphics support for TT + options MEMORY_DISK_HOOKS # Boot RAM-disk options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels + options SERCONSOLE # modem1 console support, breaks Falcon + options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer + options TRY_SCSI_LINKED_COMMANDS=0x7f + config netbsd root on ? type ? + pseudo-device sl # Slip + pseudo-device ppp # ppp + pseudo-device pppoe # PPP over Ethernet (RFC 2516) + pseudo-device pty # pseudo-terminals pseudo-device loop # Loopback network + pseudo-device md 3 # Boot memory disk + pseudo-device vnd # 3 pseudo disks (see vnconfig) pseudo-device bpfilter # berkeley packet filters + pseudo-device tun # network tunnel
CVS commit: [netbsd-5] src/sys/arch/atari/dev
Module Name:src
Committed By: snj
Date: Sun Oct 4 00:33:58 UTC 2009
Modified Files:
src/sys/arch/atari/dev [netbsd-5]: fd.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1058):
sys/arch/atari/dev/fd.c: revision 1.71
Read AD_CFG_SWITCH via volatile pointer so that
the default density is detected correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.6.1 src/sys/arch/atari/dev/fd.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/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.62 src/sys/arch/atari/dev/fd.c:1.62.6.1
--- src/sys/arch/atari/dev/fd.c:1.62 Wed Jun 11 14:35:53 2008
+++ src/sys/arch/atari/dev/fd.c Sun Oct 4 00:33:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.62 2008/06/11 14:35:53 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.62.6.1 2009/10/04 00:33:58 snj Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.62 2008/06/11 14:35:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.62.6.1 2009/10/04 00:33:58 snj Exp $");
#include
#include
@@ -253,7 +253,7 @@
static u_short rd_cfg_switch __P((void));
static u_short rd_cfg_switch(void)
{
- return(*((u_short*)AD_CFG_SWITCH));
+ return(*((volatile u_short *)AD_CFG_SWITCH));
}
/*
CVS commit: [netbsd-5] src/sys/arch/atari/dev
Module Name:src
Committed By: snj
Date: Sun Oct 4 00:31:52 UTC 2009
Modified Files:
src/sys/arch/atari/dev [netbsd-5]: clock.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1057):
sys/arch/atari/dev/clock.c: revision 1.47
Add a workaround for annoying
"WARNING: negative runtime; monotonic clock has gone backwards"
message. Partially taken from hp300.
To generate a diff of this commit:
cvs rdiff -u -r1.41.6.1 -r1.41.6.2 src/sys/arch/atari/dev/clock.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/atari/dev/clock.c
diff -u src/sys/arch/atari/dev/clock.c:1.41.6.1 src/sys/arch/atari/dev/clock.c:1.41.6.2
--- src/sys/arch/atari/dev/clock.c:1.41.6.1 Thu Nov 6 00:15:55 2008
+++ src/sys/arch/atari/dev/clock.c Sun Oct 4 00:31:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.41.6.1 2008/11/06 00:15:55 snj Exp $ */
+/* $NetBSD: clock.c,v 1.41.6.2 2009/10/04 00:31:52 snj Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.41.6.1 2008/11/06 00:15:55 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.41.6.2 2009/10/04 00:31:52 snj Exp $");
#include
#include
@@ -319,21 +319,29 @@
static u_int
clk_getcounter(struct timecounter *tc)
{
- u_int delta;
- u_char ipra, tadr;
- int s, cur_hardclock;
+ uint32_t delta, count, cur_hardclock;
+ uint8_t ipra, tadr;
+ int s;
+ static uint32_t lastcount;
s = splhigh();
+ cur_hardclock = hardclock_ticks;
ipra = MFP->mf_ipra;
tadr = MFP->mf_tadr;
delta = divisor - tadr;
if (ipra & IA_TIMA)
delta += divisor;
- cur_hardclock = hardclock_ticks;
splx(s);
- return (divisor - tadr) + divisor * cur_hardclock;
+ count = (divisor * cur_hardclock) + delta;
+ if ((int32_t)(count - lastcount) < 0) {
+ /* XXX wrapped; maybe hardclock() is blocked more than 2/HZ */
+ count = lastcount + 1;
+ }
+ lastcount = count;
+
+ return count;
}
#define TIMB_FREQ 614400
CVS commit: [netbsd-5] src/sys/arch/atari
Module Name:src
Committed By: snj
Date: Thu Mar 26 17:28:48 UTC 2009
Modified Files:
src/sys/arch/atari/atari [netbsd-5]: atari_init.c pmap_bootstrap.c
src/sys/arch/atari/include [netbsd-5]: pmap.h vmparam.h
Log Message:
Pull up following revision(s) (requested by abs in ticket #612):
sys/arch/atari/atari/pmap_bootstrap.c: revision 1.3
sys/arch/atari/atari/atari_init.c: revision 1.76
sys/arch/atari/include/pmap.h: revision 1.40
sys/arch/atari/include/vmparam.h: revision 1.24
Use separate free lists for TT and ST ram, and give TT a lower id
so all TT ram will be used before any ST ram. (free_list param to
uvm_page_physload())
Tested on a TT with and without TT ram.
To generate a diff of this commit:
cvs rdiff -u -r1.67.54.3 -r1.67.54.4 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/atari/atari/pmap_bootstrap.c
cvs rdiff -u -r1.36.20.2 -r1.36.20.3 src/sys/arch/atari/include/pmap.h
cvs rdiff -u -r1.21.88.1 -r1.21.88.2 src/sys/arch/atari/include/vmparam.h
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/atari/atari/atari_init.c
diff -u src/sys/arch/atari/atari/atari_init.c:1.67.54.3 src/sys/arch/atari/atari/atari_init.c:1.67.54.4
--- src/sys/arch/atari/atari/atari_init.c:1.67.54.3 Thu Jan 8 22:47:06 2009
+++ src/sys/arch/atari/atari/atari_init.c Thu Mar 26 17:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_init.c,v 1.67.54.3 2009/01/08 22:47:06 snj Exp $ */
+/* $NetBSD: atari_init.c,v 1.67.54.4 2009/03/26 17:28:47 snj Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.67.54.3 2009/01/08 22:47:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.67.54.4 2009/03/26 17:28:47 snj Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -475,8 +475,10 @@
*/
usable_segs[0].start = 0;
usable_segs[0].end = stphysize;
+ usable_segs[0].free_list = VM_FREELIST_STRAM;
usable_segs[1].start = ttphystart;
usable_segs[1].end = ttphystart + ttphysize;
+ usable_segs[1].free_list = VM_FREELIST_TTRAM;
usable_segs[2].start = usable_segs[2].end = 0; /* End of segments! */
if(kbase) {
Index: src/sys/arch/atari/atari/pmap_bootstrap.c
diff -u src/sys/arch/atari/atari/pmap_bootstrap.c:1.1.2.2 src/sys/arch/atari/atari/pmap_bootstrap.c:1.1.2.3
--- src/sys/arch/atari/atari/pmap_bootstrap.c:1.1.2.2 Thu Jan 8 22:45:30 2009
+++ src/sys/arch/atari/atari/pmap_bootstrap.c Thu Mar 26 17:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.1.2.2 2009/01/08 22:45:30 snj Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.1.2.3 2009/03/26 17:28:47 snj Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -150,7 +150,7 @@
atop(usable_segs[i].end),
atop(usable_segs[i].start),
atop(usable_segs[i].end),
- VM_FREELIST_DEFAULT);
+ usable_segs[i].free_list);
avail_start = usable_segs[0].start;
avail_end = usable_segs[i - 1].end;
Index: src/sys/arch/atari/include/pmap.h
diff -u src/sys/arch/atari/include/pmap.h:1.36.20.2 src/sys/arch/atari/include/pmap.h:1.36.20.3
--- src/sys/arch/atari/include/pmap.h:1.36.20.2 Thu Jan 8 22:45:30 2009
+++ src/sys/arch/atari/include/pmap.h Thu Mar 26 17:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.36.20.2 2009/01/08 22:45:30 snj Exp $ */
+/* $NetBSD: pmap.h,v 1.36.20.3 2009/03/26 17:28:47 snj Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@@ -88,6 +88,7 @@
paddr_t start; /* PA of first page in segment */
paddr_t end; /* PA of last page in segment */
int first_page; /* relative page# of 'start' */
+ int free_list; /* Memory priority, lower = faster */
};
#ifdef _KERNEL
Index: src/sys/arch/atari/include/vmparam.h
diff -u src/sys/arch/atari/include/vmparam.h:1.21.88.1 src/sys/arch/atari/include/vmparam.h:1.21.88.2
--- src/sys/arch/atari/include/vmparam.h:1.21.88.1 Thu Jan 8 22:45:30 2009
+++ src/sys/arch/atari/include/vmparam.h Thu Mar 26 17:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.21.88.1 2009/01/08 22:45:30 snj Exp $ */
+/* $NetBSD: vmparam.h,v 1.21.88.2 2009/03/26 17:28:47 snj Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -166,8 +166,10 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_RANDOM
#define VM_PHYSSEG_NOADD
-#define VM_NFREELIST 1
+#define VM_NFREELIST 2
#define VM_FREELIST_DEFAULT 0
+#define VM_FREELIST_TTRAM VM_FREELIST_DEFAULT
+#define VM_FREELIST_STRAM 1
#define __HAVE_PMAP_PHYSSEG
