merge latest (4.3.99.16) from XFree86 (vendor) branch

1 files changed, 1 insertions, 63 deletions

diff --git a/src/riva_hw.h b/src/riva_hw.h
index 8d53d4f..ec2b90b 100644
--- a/src/riva_hw.h
+++ b/src/riva_hw.h
@@ -36,18 +36,13 @@
 |*     those rights set forth herein.                                        *|
 |*                                                                           *|
 \***************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.h,v 1.24 2003/02/10 23:42:51 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.h,v 1.26 2003/07/31 20:24:31 mvojkovi Exp $ */
 #ifndef __RIVA_HW_H__
 #define __RIVA_HW_H__
-#define RIVA_SW_VERSION 0x00010003
 
 /*
  * Define supported architectures.
  */
-#define NV_ARCH_03  0x03
-#define NV_ARCH_04  0x04
-#define NV_ARCH_10  0x10
-#define NV_ARCH_20  0x20
 /***************************************************************************\
 *                                                                           *
 *                             FIFO registers.                               *
@@ -60,12 +55,8 @@
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop;
-#endif
     U032 reserved01[0x0BB];
     U032 Rop3;
 } RivaRop;
@@ -75,12 +66,8 @@ typedef volatile struct
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop;
-#endif
     U032 reserved01[0x0BD];
     U032 Shape;
     U032 reserved03[0x001];
@@ -94,12 +81,8 @@ typedef volatile struct
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop;
-#endif
     U032 reserved01[0x0BB];
     U032 TopLeft;
     U032 WidthHeight;
@@ -110,12 +93,8 @@ typedef volatile struct
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop[1];
-#endif
     U032 reserved01[0x0BC];
     U032 Color;
     U032 reserved03[0x03E];
@@ -128,12 +107,8 @@ typedef volatile struct
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop;
-#endif
     U032 reserved01[0x0BB];
     U032 TopLeftSrc;
     U032 TopLeftDst;
@@ -145,12 +120,8 @@ typedef volatile struct
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop[1];
-#endif
     U032 reserved01[0x0BC];
     U032 TopLeft;
     U032 WidthHeight;
@@ -164,12 +135,8 @@ typedef volatile struct
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop;
-#endif
     U032 reserved01[0x0BB];
     U032 reserved03[(0x040)-1];
     U032 Color1A;
@@ -230,12 +197,8 @@ typedef volatile struct
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop[1];
-#endif
     U032 reserved01[0x0BC];
     U032 Color;             /* source color               0304-0307*/
     U032 Reserved02[0x03e];
@@ -265,24 +228,16 @@ typedef volatile struct
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop;
-#endif
     U032 reserved01[0x0BE];
     U032 Offset;
 } RivaSurface;
 typedef volatile struct
 {
     U032 reserved00[4];
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    U032 FifoFree;
-#else
     U016 FifoFree;
     U016 Nop;
-#endif
     U032 reserved01[0x0BD];
     U032 Pitch;
     U032 RenderBufferOffset;
@@ -308,9 +263,6 @@ typedef struct _riva_hw_inst
     /*
      * Chip specific settings.
      */
-    U032 Architecture;
-    U032 Version;
-    U032 Chipset;
     U032 CrystalFreqKHz;
     U032 RamAmountKBytes;
     U032 MaxVClockFreqKHz;
@@ -321,14 +273,10 @@ typedef struct _riva_hw_inst
     U032 FifoFreeCount;
     U032 FifoEmptyCount;
     U032 CursorStart;
-    U032 flatPanel;
-    Bool twoHeads;
     /*
      * Non-FIFO registers.
      */
-    volatile U032 *PCRTC0;
     volatile U032 *PCRTC;
-    volatile U032 *PRAMDAC0;
     volatile U032 *PFB;
     volatile U032 *PFIFO;
     volatile U032 *PGRAPH;
@@ -338,10 +286,8 @@ typedef struct _riva_hw_inst
     volatile U032 *PRAMIN;
     volatile U032 *FIFO;
     volatile U032 *CURSOR;
-    volatile U008 *PCIO0;
     volatile U008 *PCIO;
     volatile U008 *PVIO;
-    volatile U008 *PDIO0;
     volatile U008 *PDIO;
     volatile U032 *PRAMDAC;
     /*
@@ -381,22 +327,14 @@ typedef struct _riva_hw_state
     U032 repaint0;
     U032 repaint1;
     U032 screen;
-    U032 scale;
-    U032 dither;
     U032 extra;
     U032 pixel;
     U032 horiz;
     U032 arbitration0;
     U032 arbitration1;
     U032 vpll;
-    U032 vpll2;
-    U032 vpllB;
-    U032 vpll2B;
     U032 pllsel;
     U032 general;
-    U032 crtcOwner;
-    U032 head; 
-    U032 head2; 
     U032 config;
     U032 cursorConfig;
     U032 cursor0;