From 7f6603085d70b7be5976ff052bb1f6bfcbf6975f Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Fri, 7 Apr 2006 15:03:25 +0000 Subject: [PATCH] removed NV47 references, replaced with G70. Also added G71, G72 and G73 engines. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17038 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../private/graphics/nvidia/DriverInterface.h | 5 +++- headers/private/graphics/nvidia/nv_macros.h | 28 +++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/headers/private/graphics/nvidia/DriverInterface.h b/headers/private/graphics/nvidia/DriverInterface.h index 27ec61c11b..e19835545a 100644 --- a/headers/private/graphics/nvidia/DriverInterface.h +++ b/headers/private/graphics/nvidia/DriverInterface.h @@ -102,7 +102,10 @@ enum { NV43, NV44, NV45, - NV47 + G70, + G71, + G72, + G73 }; /* card_arch in order of date of NV chip design */ diff --git a/headers/private/graphics/nvidia/nv_macros.h b/headers/private/graphics/nvidia/nv_macros.h index 520ba1018d..8e93afdecf 100644 --- a/headers/private/graphics/nvidia/nv_macros.h +++ b/headers/private/graphics/nvidia/nv_macros.h @@ -364,18 +364,18 @@ #define NVACC_NV41_FBTILBED 0x001006b4 #define NVACC_NV41_FBTILBPT 0x001006b8 #define NVACC_NV41_FBTILBST 0x001006bc -#define NVACC_NV47_FBTILCAD 0x001006c0 -#define NVACC_NV47_FBTILCED 0x001006c4 -#define NVACC_NV47_FBTILCPT 0x001006c8 -#define NVACC_NV47_FBTILCST 0x001006cc -#define NVACC_NV47_FBTILDAD 0x001006d0 -#define NVACC_NV47_FBTILDED 0x001006d4 -#define NVACC_NV47_FBTILDPT 0x001006d8 -#define NVACC_NV47_FBTILDST 0x001006dc -#define NVACC_NV47_FBTILEAD 0x001006e0 -#define NVACC_NV47_FBTILEED 0x001006e4 -#define NVACC_NV47_FBTILEPT 0x001006e8 -#define NVACC_NV47_FBTILEST 0x001006ec +#define NVACC_G70_FBTILCAD 0x001006c0 +#define NVACC_G70_FBTILCED 0x001006c4 +#define NVACC_G70_FBTILCPT 0x001006c8 +#define NVACC_G70_FBTILCST 0x001006cc +#define NVACC_G70_FBTILDAD 0x001006d0 +#define NVACC_G70_FBTILDED 0x001006d4 +#define NVACC_G70_FBTILDPT 0x001006d8 +#define NVACC_G70_FBTILDST 0x001006dc +#define NVACC_G70_FBTILEAD 0x001006e0 +#define NVACC_G70_FBTILEED 0x001006e4 +#define NVACC_G70_FBTILEPT 0x001006e8 +#define NVACC_G70_FBTILEST 0x001006ec /* engine tile registers dst */ #define NVACC_NV20_WHAT_T0 0x004009a4 #define NVACC_NV20_WHAT_T1 0x004009a8 @@ -383,8 +383,8 @@ #define NVACC_NV40_WHAT_T3 0x004069a8 #define NVACC_NV40P_WHAT_T0 0x004009f0 #define NVACC_NV40P_WHAT_T1 0x004009f4 -#define NVACC_NV47_WHAT_T0 0x00400df0 -#define NVACC_NV47_WHAT_T1 0x00400df4 +#define NVACC_G70_WHAT_T0 0x00400df0 +#define NVACC_G70_WHAT_T1 0x00400df4 #define NVACC_NV40P_WHAT_T2 0x004069f0 #define NVACC_NV40P_WHAT_T3 0x004069f4 #define NVACC_NV10_TIL0AD 0x00400b00