From 2dbc30d68be6011fa0eb0ea33c4f9827b2d08dc9 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Mon, 13 Sep 2004 11:45:03 +0000 Subject: [PATCH] minor PLL code mods. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8928 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/graphics/nvidia/DriverInterface.h | 5 +++-- headers/private/graphics/nvidia/nv_macros.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/headers/private/graphics/nvidia/DriverInterface.h b/headers/private/graphics/nvidia/DriverInterface.h index 793410debb..79db36dee2 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-7/2004. + Rudolf Cornelissen 10/2002-9/2004. */ #ifndef DRIVERINTERFACE_H @@ -248,11 +248,12 @@ typedef struct { /* PINS */ float f_ref; /* PLL reference-oscillator frequency (Mhz) */ + bool ext_pll; /* the extended PLL contains more dividers */ uint32 max_system_vco; /* graphics engine PLL VCO limits (Mhz) */ uint32 min_system_vco; uint32 max_pixel_vco; /* dac1 PLL VCO limits (Mhz) */ uint32 min_pixel_vco; - uint32 max_video_vco; /* dac2, maven PLL VCO limits (Mhz) */ + uint32 max_video_vco; /* dac2 PLL VCO limits (Mhz) */ uint32 min_video_vco; uint32 std_engine_clock; /* graphics engine clock speed needed (Mhz) */ uint32 std_memory_clock; /* card memory clock speed needed (Mhz) */ diff --git a/headers/private/graphics/nvidia/nv_macros.h b/headers/private/graphics/nvidia/nv_macros.h index 0b1ccfad03..4ae0bfe508 100644 --- a/headers/private/graphics/nvidia/nv_macros.h +++ b/headers/private/graphics/nvidia/nv_macros.h @@ -484,7 +484,7 @@ #define NVDAC_PIXPLLC 0x00680508 #define NVDAC_PLLSEL 0x0068050c #define NVDAC_OUTPUT 0x0068052c -#define NVDAC_PIXPLLC2 0x00680578 /* NV31, NV36 only */ +#define NVDAC_PIXPLLC2 0x00680578 #define NVDAC_GENCTRL 0x00680600 #define NVDAC_TSTCTRL 0x00680608 #define NVDAC_TSTDATA 0x00680610 @@ -514,7 +514,7 @@ #define NVDAC2_CURPOS 0x00682300 #define NVDAC2_PIXPLLC 0x00680520 #define NVDAC2_OUTPUT 0x0068252c -#define NVDAC2_PIXPLLC2 0x0068057c /* NV31, NV36 only */ +#define NVDAC2_PIXPLLC2 0x0068057c #define NVDAC2_GENCTRL 0x00682600 #define NVDAC2_TSTCTRL 0x00682608 /* (flatpanel registers) */