From 6a571d88ac6ea61e1d0cbcc3d9e1d9d8e61d17a7 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Tue, 18 Sep 2007 19:22:44 +0000 Subject: [PATCH] fixed shared_info problem occuring with the 3D accelerant: the TVencoder list definition is now outside of the definition of shared_info. Greetings.. :-) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22244 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../private/graphics/nvidia/DriverInterface.h | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/headers/private/graphics/nvidia/DriverInterface.h b/headers/private/graphics/nvidia/DriverInterface.h index 6aa8365fd0..17ac4d505d 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-4/2006. + Rudolf Cornelissen 10/2002-9/2007. */ #ifndef DRIVERINTERFACE_H @@ -117,6 +117,27 @@ enum { NV40A }; +/* card info - information gathered from PINS (and other sources) */ +enum +{ // tv_encoder_type in order of capability (more or less) + NONE = 0, + CH7003, + CH7004, + CH7005, + CH7006, + CH7007, + CH7008, + SAA7102, + SAA7103, + SAA7104, + SAA7105, + BT868, + BT869, + CX25870, + CX25871, + NVIDIA +}; + /* handles to pre-defined engine commands */ #define NV_ROP5_SOLID 0x00000000 /* 2D */ #define NV_IMAGE_BLACK_RECTANGLE 0x00000001 /* 2D/3D */ @@ -301,27 +322,6 @@ typedef struct { } threeD; } engine; - /* card info - information gathered from PINS (and other sources) */ - enum - { // tv_encoder_type in order of capability (more or less) - NONE = 0, - CH7003, - CH7004, - CH7005, - CH7006, - CH7007, - CH7008, - SAA7102, - SAA7103, - SAA7104, - SAA7105, - BT868, - BT869, - CX25870, - CX25871, - NVIDIA - }; - struct { /* specialised registers for card initialisation read from NV BIOS (pins) */