From 16c2f5b1c8872c979d94f2e1b94243874544eba2 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Sat, 17 Jan 2004 10:48:18 +0000 Subject: [PATCH] more dualhead updates git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6113 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/graphics/nvidia/DriverInterface.h | 6 +----- headers/private/graphics/nvidia/nv_macros.h | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/headers/private/graphics/nvidia/DriverInterface.h b/headers/private/graphics/nvidia/DriverInterface.h index 40c41771ed..63d947da3e 100644 --- a/headers/private/graphics/nvidia/DriverInterface.h +++ b/headers/private/graphics/nvidia/DriverInterface.h @@ -5,7 +5,7 @@ Other authors: Mark Watson; Apsed; - Rudolf Cornelissen 10/2002-12/2003. + Rudolf Cornelissen 10/2002-1/2004. */ #ifndef DRIVERINTERFACE_H @@ -145,7 +145,6 @@ typedef struct { /*more display mode stuff*/ display_mode dm; /* current display mode configuration: head1 */ display_mode dm2; /* current display mode configuration: head2 */ - bool switched_crtcs; /* dualhead stretch and switch mode info */ bool acc_mode; /* signals (non)accelerated mode */ bool interlaced_tv_mode;/* signals interlaced CRTC TV output mode */ @@ -256,9 +255,6 @@ typedef struct { /* mirror of the ROM (copied in driver, because may not be mapped permanently - only over fb) */ uint8 rom_mirror[32768]; - /* CRTC delay -> used in timing for MAVEN, depending on which CRTC is driving it */ - uint8 crtc_delay; - /* NV31 (FX5600) tweak to get pixelPLL going (unknown register) */ uint16 pixpll_vco_div2; diff --git a/headers/private/graphics/nvidia/nv_macros.h b/headers/private/graphics/nvidia/nv_macros.h index 81ce4c875b..5c156e67ed 100644 --- a/headers/private/graphics/nvidia/nv_macros.h +++ b/headers/private/graphics/nvidia/nv_macros.h @@ -719,6 +719,8 @@ /* read and write from the dac registers */ #define DACR(A) (NV_REG32(NVDAC_##A)) #define DACW(A,B) (NV_REG32(NVDAC_##A)=B) + +/* read and write from the secondary dac registers */ #define DAC2R(A) (NV_REG32(NVDAC2_##A)) #define DAC2W(A,B) (NV_REG32(NVDAC2_##A)=B)