Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/amiga AGA: VGAonly timing (GRF_AGA_VGA), by Adam Ci...
details: https://anonhg.NetBSD.org/src/rev/afc14b85732d
branches: trunk
changeset: 467440:afc14b85732d
user: is <is%NetBSD.org@localhost>
date: Wed Mar 24 22:24:42 1999 +0000
description:
AGA: VGAonly timing (GRF_AGA_VGA), by Adam Ciarcinski
diffstat:
sys/arch/amiga/conf/AMIGA | 34 ++++++++++++++++++----------------
sys/arch/amiga/conf/GENERIC | 3 ++-
sys/arch/amiga/dev/grfabs_cc.c | 42 +++++++++++++++++++++++-------------------
3 files changed, 43 insertions(+), 36 deletions(-)
diffs (182 lines):
diff -r a958a04e0f5c -r afc14b85732d sys/arch/amiga/conf/AMIGA
--- a/sys/arch/amiga/conf/AMIGA Wed Mar 24 22:01:38 1999 +0000
+++ b/sys/arch/amiga/conf/AMIGA Wed Mar 24 22:24:42 1999 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: AMIGA,v 1.11 1999/03/09 15:09:00 is Exp $
+# $NetBSD: AMIGA,v 1.12 1999/03/24 22:26:14 is Exp $
#
# This file was automatically created. Changes will be
# lost when running make in this directory.
#
# Created from:
-#$ NetBSD: GENERIC,v 1.118 1999/03/09 12:20:41 is Exp $
+#$ NetBSD: GENERIC,v 1.119 1999/03/24 22:24:42 is Exp $
include "arch/amiga/conf/std.amiga"
@@ -14,11 +14,11 @@
#mainboards to support (in addition to Amiga)
options BB060STUPIDROM # You need this, if you have a non-DraCo
- #MC68060 with an OS ROM up to (at least)
- #V40 (OS3.1) and want to boot with the
- #bootblock.
- #You do not need this if you have a DraCo,
- #have no 68060 or NEVER use the bootblock
+ # MC68060 with an OS ROM up to (at least)
+ # V40 (OS3.1) and want to boot with the
+ # bootblock.
+ # You do not need this if you have a DraCo,
+ # have no 68060 or NEVER use the bootblock
#processors this kernel should support
@@ -95,7 +95,7 @@
options NKMEMCLUSTERS=256 # Size of kernel malloc area
options UCONSOLE # anyone can redirect a virtual console
#options INSECURE # allow, among other insecure stuff, LKM
- #loading in multi-user mode.
+ # loading in multi-user mode.
options SCSIVERBOSE # Verbose SCSI errors
options NTP # NTP phase/frequency locked loop
@@ -113,13 +113,14 @@
#Amiga specific options
#options LIMITMEM=24 # Do not use more than LIMITMEM MB of the
- #first bank of RAM. (default: unlimited)
+ # first bank of RAM. (default: unlimited)
#options NKPTADD=4 # set this for 4 additional KPT pages
#options NKPTADDSHIFT=24 # set this for 1 additional KPT page
- #per 16 MB (1<<24 bytes) of RAM
-
- #increase NKPTADD if you get "out of PT pages"
- #panics.
+ # per 16 MB (1<<24 bytes) of RAM
+ # define and decrease this, or define and
+ # increase NKPTADD if you get "out of PT pages"
+ # panics.
+
#ATTENTION: There is NO WARRANTY AT ALL that the sync will be complete
#before the 10 secondinterval ends, or that KBDRESET does work at all.
#options KBDRESET # sync on Ctrl-Amiga-Amiga
@@ -143,12 +144,13 @@
options GRF_PAL # PAL
options GRF_A2024 # Support for the A2024
options GRF_AGA # AGA Chip Set
+options GRF_AGA_VGA # AGA VGAONLY timing
options GRF_SUPER72 # AGA Super-72
#options KFONT_8X11 # 8x11 font
#This is how you would tell the kernel the A2410 oscillator frequencies:
-#The used frequencies are the defaults, decrease this, or define and do not need option setting
+#The used frequencies are the defaults, and do not need option setting
#options ULOWELL_OSC1=36000000
#options ULOWELL_OSC2=66667000
@@ -213,7 +215,7 @@
com* at hyper? port ? # Hypercom3/4 serial ports
#lpt* at hyper? port ? # not yet: Hypercom3 parallel port
-#Amiga Mainboard devices (sans graphics decrease this, or define and keyboard)
+#Amiga Mainboard devices (sans graphics and keyboard)
ser0 at mainbus0 # Amiga onboard serial
par0 at mainbus0 # Amiga onboard parallel
@@ -312,7 +314,7 @@
#pseudo-device raid 4 # RAIDframe disk driver
#rnd is EXPERIMENTAL at this point.
-#pseudo-device rnd # /dev/random decrease this, or define and in-kernel generator
+#pseudo-device rnd # /dev/random and in-kernel generator
#options RND_COM # use "com" randomness as well (BROKEN)
config netbsd root on ? type ?
diff -r a958a04e0f5c -r afc14b85732d sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC Wed Mar 24 22:01:38 1999 +0000
+++ b/sys/arch/amiga/conf/GENERIC Wed Mar 24 22:24:42 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.118 1999/03/09 12:20:41 is Exp $
+# $NetBSD: GENERIC,v 1.119 1999/03/24 22:24:42 is Exp $
#
#if 0
@@ -165,6 +165,7 @@
options GRF_PAL # PAL
options GRF_A2024 # Support for the A2024
options GRF_AGA # AGA Chip Set
+options GRF_AGA_VGA # AGA VGAONLY timing
options GRF_SUPER72 # AGA Super-72
#endif
#options KFONT_8X11 # 8x11 font
diff -r a958a04e0f5c -r afc14b85732d sys/arch/amiga/dev/grfabs_cc.c
--- a/sys/arch/amiga/dev/grfabs_cc.c Wed Mar 24 22:01:38 1999 +0000
+++ b/sys/arch/amiga/dev/grfabs_cc.c Wed Mar 24 22:24:42 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_cc.c,v 1.17 1997/09/19 03:27:10 mhitch Exp $ */
+/* $NetBSD: grfabs_cc.c,v 1.18 1999/03/24 22:24:43 is Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -1877,18 +1877,15 @@
int AGA_hsstrt = 0xc;
int AGA_hsstop = 0x16;
int AGA_hbstrt = 0x5;
+int AGA_vtotal = 0x1c1;
#else
int AGA_htotal = 0x79;
int AGA_hsstrt = 0xe;
int AGA_hsstop = 0x1c;
int AGA_hbstrt = 0x8;
+int AGA_vtotal = 0x1ec;
#endif
int AGA_hbstop = 0x1e;
-#ifdef GRF_AGA_VGA
-int AGA_vtotal = 0x1c1;
-#else
-int AGA_vtotal = 0x1ec;
-#endif
int AGA_vsstrt = 0x3;
int AGA_vsstop = 0x6;
int AGA_vbstrt = 0x0;
@@ -3301,19 +3298,26 @@
return (paga_this);
}
-/* static, so I can patch and play (VGAOnly is commented-out) */
-
-int pAGA_htotal = 0x081; /* 0x079 */
-int pAGA_hsstrt = 0x00f; /* 0x00f */
-int pAGA_hsstop = 0x019; /* 0x019 */
-int pAGA_hbstrt = 0x001; /* 0x001 */
-int pAGA_hbstop = 0x021; /* 0x021 */
-int pAGA_vtotal = 0x23d; /* 0x24d */
-int pAGA_vsstrt = 0x001; /* 0x001 */
-int pAGA_vsstop = 0x008; /* 0x008 */
-int pAGA_vbstrt = 0x000; /* 0x000 */
-int pAGA_vbstop = 0x017; /* 0x019 */
-int pAGA_hcenter = 0x04f; /* 0x04b */
+/* static, so I can patch and play */
+
+#ifdef GRF_AGA_VGA
+int pAGA_htotal = 0x079;
+int pAGA_vtotal = 0x24d;
+int pAGA_vbstop = 0x019;
+int pAGA_hcenter = 0x04b;
+#else
+int pAGA_htotal = 0x081;
+int pAGA_vtotal = 0x23d;
+int pAGA_vbstop = 0x017;
+int pAGA_hcenter = 0x04f;
+#endif
+int pAGA_hsstrt = 0x00f;
+int pAGA_hsstop = 0x019;
+int pAGA_hbstrt = 0x001;
+int pAGA_hbstop = 0x021;
+int pAGA_vsstrt = 0x001;
+int pAGA_vsstop = 0x008;
+int pAGA_vbstrt = 0x000;
void
display_pal_aga_view(v)
Home |
Main Index |
Thread Index |
Old Index