From 77354258ede715103c949d0e62dedd8161142d5e Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Tue, 6 Apr 2004 09:37:21 +0000 Subject: [PATCH] various fixes tested on NM2070 (works now) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7171 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/graphics/neomagic/nm_macros.h | 8 ++++++-- src/add-ons/kernel/drivers/graphics/neomagic/UPDATE.html | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/headers/private/graphics/neomagic/nm_macros.h b/headers/private/graphics/neomagic/nm_macros.h index 912149e01e..1a9fe9d9a8 100644 --- a/headers/private/graphics/neomagic/nm_macros.h +++ b/headers/private/graphics/neomagic/nm_macros.h @@ -94,6 +94,7 @@ /* VGA standard registers: */ #define NMSEQX_RESET 0x00 #define NMSEQX_CLKMODE 0x01 +#define NMSEQX_MAPMASK 0x02 #define NMSEQX_MEMMODE 0x04 /* NeoMagic BES registers: (> NM2070) (accessible via mapped I/O: >= NM2097) */ #define NMSEQX_BESCTRL2 0x08 @@ -122,6 +123,7 @@ #define NMATBX_COLPLANE_EN 0x12 #define NMATBX_HORPIXPAN 0x13 #define NMATBX_COLSEL 0x14 +#define NMATBX_0x16 0x16 /* neomagic ISA GRAPHICS indexed registers */ /* VGA standard registers: */ @@ -135,8 +137,10 @@ #define NMGRPHX_GRPHXLOCK 0x09 #define NMGRPHX_GENLOCK 0x0a #define NMGRPHX_FBSTADDE 0x0e -#define NMGRPHX_CRTC_PITCHE 0x0f -#define NMGRPHX_IFACECTRL 0x11 +#define NMGRPHX_CRTC_PITCHE 0x0f /* > NM2070 */ +#define NMGRPHX_IFACECTRL1 0x10 +#define NMGRPHX_IFACECTRL2 0x11 +#define NMGRPHX_0x15 0x15 #define NMGRPHX_PANELCTRL1 0x20 #define NMGRPHX_PANELTYPE 0x21 #define NMGRPHX_PANELCTRL2 0x25 diff --git a/src/add-ons/kernel/drivers/graphics/neomagic/UPDATE.html b/src/add-ons/kernel/drivers/graphics/neomagic/UPDATE.html index 55677b440e..9533191d55 100644 --- a/src/add-ons/kernel/drivers/graphics/neomagic/UPDATE.html +++ b/src/add-ons/kernel/drivers/graphics/neomagic/UPDATE.html @@ -4,7 +4,7 @@

Changes done for each driverversion:

-

head (0.06-7, Rudolf)

+

head (0.06-8, Rudolf)

Note:
Acceleration engine benchmarked and tested for errors with BeRoMeter V1.2.6.