Changeset 6653 for trunk/src/opengl/glide/sst1/init

trunk/src/opengl/glide/sst1/init/h3drvr.c

-              r2885
+              r6653
+/* $Id: h3drvr.c,v 1.2 2001-09-05 14:31:00 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:26 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:00 $
 **
 */
 …
 static InitSwapType_t FX_CALL swapBuffers( FxU32 code ) {
   return 0;
+}
+}
 static FxU32 FX_CALL status( void ) {
   return 0;
+}
+}
 static FxBool FX_CALL busy(void) {
   return 0;
+}
+}
 static void FX_CALL idle( void ) {

trunk/src/opengl/glide/sst1/init/init.c

-              r2885
+              r6653
+/* $Id: init.c,v 1.2 2001-09-05 14:31:00 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:26 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:00 $
 **
 */
 …
   if ( !libInitialized ) {
     /* When initializing the Library snoop out all 3Dfx devices
+    /* When initializing the Library snoop out all 3Dfx devices
        and fill a static data structure with pertinant data.  */
 …
               hwInfo[numDevicesInSystem-1].hwDep.vgInfo.slaveBaseAddr =
                 (FxU32)sst1InitMapBoard( numSst1s );
               hwInfo[numDevicesInSystem-1].regs.hwDep.VGRegDesc.slavePtr =
+              hwInfo[numDevicesInSystem-1].regs.hwDep.VGRegDesc.slavePtr =
                 (FxU32*)hwInfo[numDevicesInSystem-1].hwDep.vgInfo.slaveBaseAddr;
               numSst1s++;
 …
             _outp(0x3d4, 0x3f);
             regVal = _inp(0x3d5);
             if (!(regVal & (1 << 2))) /* we're not there */
               continue;
 …
 #endif
           hwInfo[numDevicesInSystem].hwDep.vg96Info.vgaBaseAddr =
+          hwInfo[numDevicesInSystem].hwDep.vg96Info.vgaBaseAddr =
             (FxU32)hwInfo[numDevicesInSystem].regs.hwDep.VG96RegDesc.partnerRegPtr;
           hwInfo[numDevicesInSystem].hwDep.vg96Info.vg96BaseAddr =
+          hwInfo[numDevicesInSystem].hwDep.vg96Info.vg96BaseAddr =
             (FxU32)hwInfo[numDevicesInSystem].regs.hwDep.VG96RegDesc.baseAddress;
           numDevicesInSystem++;
+        }
+        }
 #else
 #  error "Do hardware enumeration for this chip!"
 …
+      }
+    }
     /* Sanity Check for SLI detection */
 …
     libInitialized = FXTRUE;
+  }
   if ( cb ) {
     for( device = 0; device < numDevicesInSystem; device++ ) {
       cb( &hwInfo[device] );
+    }
+    }
+  }
   return;
 …
    volatile FxU32* retVal = NULL;
    FxBool okP = (boardNum < INIT_MAX_DEVICES);
    if (okP) {
       InitDeviceInfo* infoP = (hwInfo + boardNum);
       const FxU32 vId = infoP->vendorID;
       const FxU32 dId = infoP->deviceID;
 #if defined(SST1)
       okP = ((vId == TDFXVID) &&
 …
         pciClose();
         libInitialized = FXFALSE;
+    }
+    }
 } /* initClose */
 …
   Implementor(s): jdt
   Library: init
   Description:
   Selects a 3Dfx device ( potentially from among many in the system ) and
+  Description:
+  Selects a 3Dfx device ( potentially from among many in the system ) and
   initializes the internal init driver functions with behavior appropriate
   to the type of the selected device.
 …
 FxBool
 initDeviceSelect( FxU32 devNumber )
+initDeviceSelect( FxU32 devNumber )
+{
   FxBool rv = FXFALSE;
   if ( devNumber < numDevicesInSystem ) {
     context = &contexts[hwInfo[devNumber].hwClass];
     context->info = hwInfo[devNumber];
     rv =  FXTRUE;
+  }
+  }
   return rv;
 …
         prior to rendering.
   Arguments:
   hwnd - pointer to a window handle or null.  If NULL, then
+  hwnd - pointer to a window handle or null.  If NULL, then
          the application window handle will be inferred though
          the GetActiveWindow() api.
 …
     FxBool rv;
     if ( context ) {
         rv = context->setVideo( hWnd, sRes, vRefresh, cFormat,
+        rv = context->setVideo( hWnd, sRes, vRefresh, cFormat,
                                 yOrigin, nColBuffers, nAuxBuffers,
                                 xres, yres, fbStride, vidTimings);
 …
   -------------------------------------------------------------------*/
 void initRestoreVideo( void ) {
     if ( context )
+    if ( context )
         context->restoreVideo();
 } /* initRestoreVideo */
 …
   Library: init
   Description:
   Enable the command transport mechanism for the underlying
+  Enable the command transport mechanism for the underlying
   hardware and return information about accessing the transport
   to the caller
 …
   -------------------------------------------------------------------*/
 void initDisableTransport( void ) {
     if ( context )
+    if ( context )
         context->disableTransport();
 } /* initDisableTransport */
 …
   Library: init
   Description:
   Initiate a buffer swap.
   Arguments:
+  Initiate a buffer swap.
+  Arguments:
   code - code describing type of swap, wether to sync to vretrace, how
          many vretraces to wait, etc.
 …
   Library: init
   Description:
   Returns only when graphics pipeline is completely idle.
+  Returns only when graphics pipeline is completely idle.
   May hang software if hardware is permanently busy.
   Arguments:
 …
   Get the current pointer to a particular buffer
   Arguments:
   buffer - which buffer to get pointer to
+  buffer - which buffer to get pointer to
   Return:
   integer pointer
 …
   Date: 2/25
   Implementor(s): jdt
   Library: init
+  Library: init
   Description:
   Sets the current render buffer
 …
   Library: init
   Description:
   CYA function so that emergency functionality may be added w/o
+  CYA function so that emergency functionality may be added w/o
   corrupting dll interface
   Arguments:
 …
   Description:
         This will re-attach new buffers for the rendering context, used
         typically only in a windowing system where buffers need to move
+        typically only in a windowing system where buffers need to move
         and resize. Also, implicitly detach old associated buffers.
   Arguments:

trunk/src/opengl/glide/sst1/init/init96/dxdrvr.c

-              r2885
+              r6653
+/* $Id: dxdrvr.c,v 1.2 2001-09-05 14:31:01 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 ** $Log: dxdrvr.c,v $
+** Revision 1.1  2000-02-25 00:31:28  sandervl
+** Revision 1.2  2001-09-05 14:31:01  bird
+** Added $Id:$ keyword.
+**
+** Revision 1.1  2000/02/25 00:31:28  sandervl
 ** Created new Voodoo 1 Glide dir
 **
+ *
+ *
  * 34    1/12/98 10:22p Dow
  * H3D Stereo Support
+ *
+ *
  * 33    11/06/97 9:51a Jdt
  * Fixes window resize events to not crash/hang
+ *
+ *
  * 32    10/01/97 3:21p Atai
  * fix 819, DOS tests flicker on glide
+ *
+ *
  * 31    9/08/97 12:05p Atai
  * fixed resize problem in dxControl()
+ *
+ *
  * 30    8/28/97 10:24a Odo
  * moved debugging varaible
+ *
+ *
  * 29    8/27/97 10:32a Dow
  * added more debugging info
+ *
+ *
  * 28    8/21/97 4:24p Dow
  * Fixed @#$%! C++ Comments, Added Debugging info
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:28 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:01 $
 **
 */
 …
 #if defined( __WIN32__) && defined(INIT_ACCESS_DDRAW)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <ddraw.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <ddraw.h>
 #define NUM_BUFS 6
 …
 static HWND                 hWndApp     = 0;
 static FxU32                FifoOffset  = 0;
 static FxU32                Width       = 0;
+static FxU32                Width       = 0;
 static FxU32                Height      = 0;
 static FxBool               IsFullScreen = 0;
 …
+{
   DDSURFACEDESC   ddsd;
   ddsd.dwSize = sizeof(ddsd);
   if (IDirectDrawSurface2_Lock(lpSurf, NULL, &ddsd, DDLOCK_WAIT, NULL)
+  if (IDirectDrawSurface2_Lock(lpSurf, NULL, &ddsd, DDLOCK_WAIT, NULL)
       !=DD_OK) {
     return ErrorMessage(hWndApp, "_dxSurfaceToBufDesc: DdrawSurface Lock failed\n");
+  }
   /* pDesc->bufType should be filled in by caller */
   pDesc->bufOffset = (FxU32) (ddsd.lpSurface);        /* virtual address. */
   pDesc->bufStride = (FxI32) (ddsd.lPitch);           /* in bytes         */
   pDesc->bufBPP    = (FxI32) 16;
   IDirectDrawSurface2_Unlock(lpSurf, NULL);
   return FXTRUE;
 …
   InitBufDesc_t   *dScreen = &pDesc[4];
   InitBufDesc_t   *dTriple = &pDesc[5];
   GDBG_INFO((80, "_dxDDrawToGlide entry\n"));
   /* Initialize all descriptors. */
   dScreen->bufMagic  = VG96_BUF_MAGIC;
 …
   dScreen->bufStride = 0;
   dScreen->bufBPP    = 0;
   /* Get info about screen (primary display) */
   dScreen->bufType  = INIT_BUFFER_SCREENBUFFER;
   if (!_dxSurfaceToBufDesc( lpFront, dScreen))
     return ErrorMessage(hWndApp, "Couldn't get Screen Info");
   *dFront = *dBack = *dAux = *dFifo =
   *dTriple =
   *dScreen;
   dFront->bufType   = INIT_BUFFER_FRONTBUFFER;
 …
   if (!_dxSurfaceToBufDesc( lpBack, dBack))
     return ErrorMessage(hWndApp, "Couldn't get Backbuffer Info");
   /* Get info about aux buffer */
   dAux->bufType = INIT_BUFFER_AUXBUFFER;
   if (!_dxSurfaceToBufDesc( lpAux, dAux))
+  if (!_dxSurfaceToBufDesc( lpAux, dAux))
     return ErrorMessage(hWndApp, "Couldn't get AuxBuffer Info");
   /* Get info about triple buffer */
   if (tripleBuffering) {
 …
   dFifo->bufOffset = FifoOffset;
   dFifo->bufStride = 65536 << 1; /* Fixme!!! what's this? */
   /* Now convert buf addresses for draw buffers into video memory offsets */
   dFront->bufOffset -= dScreen->bufOffset;
 …
   if (tripleBuffering)
     dTriple->bufOffset -= dScreen->bufOffset;
   GDBG_INFO((80, "_dxDDrawToGlideDesc: dFront->bufOffset = 0x%x\n", dFront->bufOffset));
   GDBG_INFO((80, "_dxDDrawToGlideDesc: dBack->bufOffset = 0x%x\n", dBack->bufOffset));
 …
+{
   DDSURFACEDESC   ddsd;
 #ifdef H3D
   GDBG_INFO((80, "_dxAS: hWnd = %x, fs=%d, xRes=%d, yRes=%d, vRefresh=%d, pageFlip=%d\n",
+  GDBG_INFO((80, "_dxAS: hWnd = %x, fs=%d, xRes=%d, yRes=%d, vRefresh=%d, pageFlip=%d\n",
              hWndApp, IsFullScreen, xRes, yRes, vRefresh, pageFlip));
 #else
   GDBG_INFO((80, "_dxAS: hWnd = %x, fs=%d, xRes=%d, yRes=%d, vRefresh=%d\n",
+  GDBG_INFO((80, "_dxAS: hWnd = %x, fs=%d, xRes=%d, yRes=%d, vRefresh=%d\n",
              hWndApp, IsFullScreen, xRes, yRes, vRefresh));
 #endif
   if (lpDD1 == NULL) {
     if (DirectDrawCreate( NULL, &lpDD1, NULL ) != DD_OK) {
 …
+  }
   if (IDirectDraw_QueryInterface( lpDD1, &IID_IDirectDraw2,
+  if (IDirectDraw_QueryInterface( lpDD1, &IID_IDirectDraw2,
                                    (LPVOID*)&lpDD) !=DD_OK) {
 …
     GDBG_INFO((80, "_dxAS: DDraw2 Obj created!\n"));
+  }
   /*
    * Make sure this is done after creating direct draw object!!!
 …
     FifoOffset = init96GetFBVram() - 65536*3; /* fixme!!! why 3? */
+  }
   /*
    * If there are any previously allocated surfaces, free them now
 …
   if( lpTriple ) IDirectDrawSurface2_Release( lpTriple    );
   if( lpFront  ) IDirectDrawSurface2_Release( lpFront  );
   lpClipper = NULL;
   lpFront   = NULL;
 …
   lpTriple    = NULL;
   lpAux     = NULL;
   if ( !IsFullScreen ) {        /* In a window */
 …
       return ErrorMessage(hWndApp,  "Couldn't get display mode!");
     if (ddsd.ddpfPixelFormat.dwRGBBitCount / 8 != 2)
+    if (ddsd.ddpfPixelFormat.dwRGBBitCount / 8 != 2)
       return ErrorMessage(hWndApp,  "Display is not in 16bpp format!");
 …
     ddsd.dwFlags        = DDSD_CAPS;
     ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE;
     if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpFront, 0 ) != DD_OK)
+    if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpFront, 0 ) != DD_OK)
       return ErrorMessage(hWndApp, "Couldn't allocate primary surface!");
 …
                xRes, yRes, ddsd.lPitch));
     /* From jdt */
     if (IDirectDraw2_CreateClipper( lpDD, 0, &lpClipper, 0 ) != DD_OK)
+    if (IDirectDraw2_CreateClipper( lpDD, 0, &lpClipper, 0 ) != DD_OK)
       return ErrorMessage(hWndApp, "Create Clipper failed!\n");
     if (IDirectDrawClipper_SetHWnd( lpClipper, 0, hWndApp ) != DD_OK)
+    if (IDirectDrawClipper_SetHWnd( lpClipper, 0, hWndApp ) != DD_OK)
       return ErrorMessage(hWndApp, "Clipper SethWnd failed!\n");
     if (IDirectDrawSurface2_SetClipper( lpFront, lpClipper ) != DD_OK)
+    if (IDirectDrawSurface2_SetClipper( lpFront, lpClipper ) != DD_OK)
       return ErrorMessage(hWndApp, "Set Clipper failed!\n");
 …
     ddsd.ddsCaps.dwCaps =
       DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_3DDEVICE;
     if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpBack, 0 ) != DD_OK)
+    if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpBack, 0 ) != DD_OK)
       return ErrorMessage(hWndApp,  "Couldn't allocate secondary surface!" );
     GDBG_INFO((80, "_dxAS: Back buffer allocated!\n"));
     /*
      * Always allocate Aux Buffer Surface
+    /*
+     * Always allocate Aux Buffer Surface
      * XXX - (use nAuxBuffers, and deal with 8bpp for alpha)
      */
 …
     ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY
         | DDSCAPS_3DDEVICE;
     if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpAux, 0 ) != DD_OK)
+    if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpAux, 0 ) != DD_OK)
       return ErrorMessage(hWndApp,  "Couldn't allocate aux surface" );
 …
   } else {
     /* Full screen - Set Exclusive Mode, change resolution,  */
     GDBG_INFO((80, "_dxAS: Setting Full screen exclusive mode!\n"));
     if (IDirectDraw2_SetCooperativeLevel(lpDD, hWndApp,
+    if (IDirectDraw2_SetCooperativeLevel(lpDD, hWndApp,
                                          DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN ) != DD_OK)
       return ErrorMessage(hWndApp, "Couldn't set cooperative level!");
     if (IDirectDraw2_SetDisplayMode( lpDD, xRes, yRes, 16, 0,0) != DD_OK)
       return ErrorMessage(hWndApp,  "Couldn't set display mode!");
     /* Allocate Front/Back Buffer Surfaces, skip triple buffer XXX */
     ddsd.dwSize            = sizeof( ddsd );
     ddsd.dwFlags           = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
     ddsd.dwBackBufferCount = 1;
     ddsd.ddsCaps.dwCaps    = DDSCAPS_PRIMARYSURFACE |
       DDSCAPS_FLIP |
+    ddsd.ddsCaps.dwCaps    = DDSCAPS_PRIMARYSURFACE |
+      DDSCAPS_FLIP |
         DDSCAPS_COMPLEX |
           DDSCAPS_VIDEOMEMORY | DDSCAPS_3DDEVICE;
     if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpFront, 0 ) != DD_OK)
+    if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpFront, 0 ) != DD_OK)
       return ErrorMessage(hWndApp, "Couldn't allocate primary surface!");
     /* Get back buffer information */
     ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER;
     if (IDirectDrawSurface2_GetAttachedSurface( lpFront, &ddsd.ddsCaps,
+    if (IDirectDrawSurface2_GetAttachedSurface( lpFront, &ddsd.ddsCaps,
                                                &lpBack) != DD_OK)
       return ErrorMessage(hWndApp, "Couldn't get back buffer info!\n");
     GDBG_INFO((80, "_dxAS: Full Screen: front/back buffer allocated!\n"));
     /* Allocate Aux Buffer Surface - XXX */
     ddsd.dwSize         = sizeof( ddsd );
 …
     ddsd.dwWidth        = xRes;
     ddsd.dwHeight       = yRes;
     ddsd.ddsCaps.dwCaps =
+    ddsd.ddsCaps.dwCaps =
       DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_3DDEVICE;
     if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpAux, 0 ) != DD_OK)
+    if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpAux, 0 ) != DD_OK)
       return ErrorMessage(hWndApp,  "Couldn't allocate aux surface" );
     GDBG_INFO((80, "_dxAS: Full Screen: aux buffer allocated!\n"));
 /*
  * Triple buffer hack: full-screen only for now.  Allocate as Aux DD surf,
 …
  */
     if (tripleBuffering) {
       if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpTriple, 0 ) != DD_OK)
+      if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpTriple, 0 ) != DD_OK)
         return ErrorMessage(hWndApp,  "Couldn't allocate triple buffer" );
 …
+    }
+  }
   /* Convert direct draw surfaces to Glide's idea of buffer descriptors */
   return _dxDDrawToGlideDesc(pDesc);
 …
   const char      *errorMessage = "no error";
   /* for now this is a goddamn baseball bat
+  /* for now this is a goddamn baseball bat
      it can be trimmed down */
   if ( !IsFullScreen ) { /* this *REALLY* should be called for fullscreen */
 …
     if( lpTriple ) IDirectDrawSurface2_Release( lpTriple    );
     if( lpFront  ) IDirectDrawSurface2_Release( lpFront  );
     lpClipper = NULL;
     lpFront   = NULL;
 …
     lpTriple  = NULL;
     lpAux     = NULL;
     /* Verify screen pixel format is 16bpp, and set cooperative level */
     ddsd.dwSize = sizeof( ddsd );
 …
     ddsd.dwFlags        = DDSD_CAPS;
     ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE;
     if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpFront, 0 ) != DD_OK) {
       errorMessage =  "Couldn't allocate primary surface!";
 …
     ddsd.ddsCaps.dwCaps =
       DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_3DDEVICE;
     if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpBack, 0 ) != DD_OK) {
       errorMessage = "Couldn't allocate secondary surface!";
 …
+    }
     /*
      * Always allocate Aux Buffer Surface
+    /*
+     * Always allocate Aux Buffer Surface
      * XXX - (use nAuxBuffers, and deal with 8bpp for alpha)
      */
 …
     ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY
         | DDSCAPS_3DDEVICE;
     if (IDirectDraw2_CreateSurface( lpDD, &ddsd, &lpAux, 0 ) != DD_OK) {
       errorMessage = "Couldn't allocate aux surface";
 …
+{
   if (lpDD == NULL) return TRUE;
   if (IDirectDrawSurface2_IsLost(lpFront) == DDERR_SURFACELOST) {
     if (IDirectDrawSurface2_Restore(lpFront) != DD_OK)
+    if (IDirectDrawSurface2_Restore(lpFront) != DD_OK)
       return ErrorMessage(hWndApp, "Front Buffer restore failure\n");
+  }
   if (!IsFullScreen) {
     if (IDirectDrawSurface2_IsLost(lpBack) == DDERR_SURFACELOST) {
       if (IDirectDrawSurface2_Restore(lpBack) != DD_OK)
+      if (IDirectDrawSurface2_Restore(lpBack) != DD_OK)
         return ErrorMessage(hWndApp, "Back  Buffer restore failure\n");
+    }
+  }
   if (IDirectDrawSurface2_IsLost(lpAux) == DDERR_SURFACELOST) {
     if (IDirectDrawSurface2_Restore(lpAux) != DD_OK)
+    if (IDirectDrawSurface2_Restore(lpAux) != DD_OK)
       return ErrorMessage(hWndApp, "Aux   Buffer restore failure\n");
+  }
   if (!IsFullScreen) {
     if (IDirectDrawSurface2_IsLost(lpTriple) == DDERR_SURFACELOST) {
       if (IDirectDrawSurface2_Restore(lpTriple) != DD_OK)
+      if (IDirectDrawSurface2_Restore(lpTriple) != DD_OK)
         return ErrorMessage(hWndApp, "Back  Buffer restore failure\n");
+    }
+  }
   GDBG_INFO((80, "_dxRS: restore surfaces OK\n"));
   return _dxDDrawToGlideDesc(pDesc);
 …
   /*
    * Get ourselves a valid window handle
+   * Get ourselves a valid window handle
    */
   hWndApp = (hWindow == 0) ? GetActiveWindow() : (HWND) hWindow;
 …
     if ((sRes <  GR_RESOLUTION_MIN) ||
         (sRes >  GR_RESOLUTION_MAX) &&
         (!GR_RESOLUTION_IS_AUTOFLIPPED(sRes)) )
+        (!GR_RESOLUTION_IS_AUTOFLIPPED(sRes)) )
 #else
     if ((sRes <  GR_RESOLUTION_320x200) ||
         (sRes >  GR_RESOLUTION_512x256))
+        (sRes >  GR_RESOLUTION_512x256))
 #endif
       return ErrorMessage(hWndApp, "Bad Fullscreen resolution");
 …
     GDBG_INFO((80, "\tbufType = 0x%x\n", pBufDesc[i].bufType));
     GDBG_INFO((80, "\tbufOffset = 0x%x\n", pBufDesc[i].bufOffset));
     GDBG_INFO((80, "\tbufStride = 0x%x\n", pBufDesc[i].bufStride));
+    GDBG_INFO((80, "\tbufStride = 0x%x\n", pBufDesc[i].bufStride));
     GDBG_INFO((80, "\tbufBPP = 0x%x\n", pBufDesc[i].bufBPP));
+  }
 …
   if ( curHALData->initSetVideo ) {
     curHALData->initSetVideo( sRes, vRefresh,
+    curHALData->initSetVideo( sRes, vRefresh,
                              (FxU32*)width, (FxU32*)height );
+  }
 …
   RECT    rect;
   int     i;
   GDBG_INFO((80, "dxControl: code = %d\n", code));
   /* dx is not initizized */
   if ( lpDD== NULL ) {
     return TRUE;
+  }
   /* Why was I called? */
   switch(code) {
 …
       Width = rect.right;
       Height = rect.bottom;
       GDBG_INFO((120, "W and H changed to %d %d\n",
                  Width, Height));
+      GDBG_INFO((120, "W and H changed to %d %d\n",
+                 Width, Height));
       if (!_dxReallocSurfaces(Width, Height, 0, BufDesc)) {
 …
   GDBG_INFO((80, "dxControl: code = %d, w = %d, h = %d\n", code,
              Width, Height));
   return FXTRUE;
 } /* dxControl */
 …
     lpDD1     = NULL;
+  }
   lpClipper = NULL;
   lpFront   = NULL;
 …
   lpAux     = NULL;
   lpDD      = NULL;
 #endif /* 0 */
   GDBG_INFO((80, "dxClose:  Returning TRUE\n"));
 …
   static POINT   point;
   static HRESULT hr;
   GDBG_INFO((80, "dxSwap:\n"));
   if ( !IsFullScreen ) {
 …
     src.top    = 0;
     src.bottom = Height-1;
     dest = src;
     point.x = 0;
 …
     dest.bottom += point.y;
     hr = IDirectDrawSurface_Blt( lpFront,
+    hr = IDirectDrawSurface_Blt( lpFront,
                                 &dest,
                                 lpBack,
 …
                                 DDBLT_WAIT,
                                 NULL );
     while( IDirectDrawSurface_GetBltStatus( lpFront, DDGBS_ISBLTDONE ) !=
           DD_OK );
     if ( hr != DD_OK ) {
       ErrorMessage(hWndApp, "Couldn't blit!\n");
 …
+  }
   return;
 } /* dxSwap */
 #else /* it's either DOS or the Hoopti Lab Setup */
 …
     break;
+  }
 #define WAITLOOP {\
 …
   if ( curHALData->initSetVideo ) {
     rv = curHALData->initSetVideo( sRes, vRefresh,
+    rv = curHALData->initSetVideo( sRes, vRefresh,
                                   (FxU32*)width, (FxU32*)height );
     if ( !rv ) goto BAIL;
+  }
   /* Initialize all descriptors. */
   dFront->bufMagic  = VG96_BUF_MAGIC;
 …
 #ifdef GDBG_INFO_ON
+  {
     int i;
+    int i;
     for (i = 0; i < 5; i++) {
 …
       GDBG_INFO((80, "%s:  pBufDesc.bufType = %s\n",
                  FN_NAME, bufTypeNames[pBufDesc[i].bufType]));
       GDBG_INFO((80, "%s:  pBufDesc.bufOffset = 0x%x\n",
+      GDBG_INFO((80, "%s:  pBufDesc.bufOffset = 0x%x\n",
                  FN_NAME, pBufDesc[i].bufOffset ));
       GDBG_INFO((80, "%s:  pBufDesc.bufStride = 0x%x\n",
+      GDBG_INFO((80, "%s:  pBufDesc.bufStride = 0x%x\n",
                  FN_NAME, pBufDesc[i].bufStride));
       GDBG_INFO((80, "%s:  pBufDesc.bufBPP = 0x%x\n",

trunk/src/opengl/glide/sst1/init/init96/init96.c

-              r2885
+              r6653
+/* $Id: init96.c,v 1.2 2001-09-05 14:31:01 bird Exp $ */
 /*
  ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
  ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
  ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
  ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
  ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
  ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+ ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+ ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+ ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
  ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
  ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
  **
+ ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+ **
  ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
  ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
  ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
  ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
  ** THE UNITED STATES.
  **
+ ** THE UNITED STATES.
+ **
  ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
  ** $Revision: 1.1 $
  ** $Date: 2000-02-25 00:31:28 $
+ ** $Revision: 1.2 $
+ ** $Date: 2001-09-05 14:31:01 $
  **
  */
 static char revString[] = "@#%$Workfile: INIT96.C $ $Revision: 1.1 $";
+static char revString[] = "@#%$Workfile: INIT96.C $ $Revision: 1.2 $";
 /* ANSI Headers */
 …
 #define RFB 0
+#define RFB 0
 #define DFB 1
 extern FxBool tripleBuffering;
 …
 oldVidMode;
 static FxU32
 devNum,
+static FxU32
+devNum,
 physAddr,
 fifoMTRRNum = 0xffffffff;
 …
 #ifdef GDBG_INFO_ON
 /* NOTE:
    This array is HIGHLY important to debugging.  Delete it at your
    extreme peril.
 …
 #ifdef GDBG_INFO_ON
 FxU32
 get96(FxU32 *addr)
+get96(FxU32 *addr)
+{
   FxU32
 …
 static FxBool
 init96LoadBufRegs(int nBuffers,
                   InitBufDesc_t *pBufDesc,
                   int xRes, int yRes,
+init96LoadBufRegs(int nBuffers,
+                  InitBufDesc_t *pBufDesc,
+                  int xRes, int yRes,
                   InitRegisterDesc *rd);
 …
   SET(sstPtr->vC.x, x);
   SET(sstPtr->vC.y, y+XY_ONE*tSize/2);
   SET(sstPtr->s, 0);
   SET(sstPtr->t, 0);
 …
   *(texAddr + (8 << 15)) = init;
   /*
+  /*
      write to 2 consequtive locations in lod0 to alter the data
      on the memory signals
+     on the memory signals
   */
   WAITLOOP;
   *(texAddr + (0)) = 0xffffffff;
+  *(texAddr + (0)) = 0xffffffff;
   WAITLOOP;
   *(texAddr + (1)) = 0xffffffff;
   WAITLOOP;
 …
+{
   FxU32 data;
   if(myGetenv(("SST96_TMUMEM_SIZE"))) {
     *TmuMemorySize = atoi(myGetenv(("SST96_TMUMEM_SIZE")));
 …
   /* set lod8 */
   SET(sstPtr->tLOD, ((8 << 2) | (8 << 7)));
   /*
+  /*
      first see if we have 4 Mbytes by writing a texel at 2MB followed by
      a texel at 1MB and 0MB and then rendering using the texel at 2MB
 …
     data = sense(sstbase,info,tmu,0x200000, SENSE1);
     if (data) {
       *TmuMemorySize = 4;
+      *TmuMemorySize = 4;
       return(FXTRUE);
+    }
 …
+    }
+  }
   data = sense(sstbase,info,tmu,0x000000, SENSE0);
   if (data) {
     data = sense(sstbase,info,tmu,0x000000, SENSE1);
     if (data) {
       *TmuMemorySize = 1;
+      *TmuMemorySize = 1;
       return(FXTRUE);
+    }
 …
 #undef WAITLOOP
   return(FXFALSE);
+}
 …
 sst96InitGetTmuInfo(FxU32 *sstbase, VG96Info *info)
+{
   sstPtr =
+  sstPtr =
     (volatile Sstregs *)(SST96_COMMAND_REGS(sstbase));
 …
   VG96Info *vg96Info = (VG96Info *) info;
   FxU32
     vendorID = vID,
     deviceID = dID;
   GDBG_INFO((80, "SST-96 Initialization code %s\n", revString));
   /* Watcom warning suppression */
   revString[0] = revString[0];
 …
   /* !!! FIXME hack for vxd bug */
   putenv( "SST_DUALHEAD=1" );
   switch (vID) {
   case AT3DVID:
 …
   GDBG_INFO((80, "init96MapBoard:  Mapping card into linear memory\n"));
   regDesc->hwDep.VG96RegDesc.baseAddress =
     pciMapCardMulti( vendorID, deviceID, curHALData->memSize, &devNum, 0 , 0);
 …
   sstHW  = regDesc->hwDep.VG96RegDesc.baseAddress;
   GDBG_INFO((80, "%s:  Mapped Voodoo Rush board at 0x%x\n",
+  GDBG_INFO((80, "%s:  Mapped Voodoo Rush board at 0x%x\n",
              FN_NAME, regDesc->hwDep.VG96RegDesc.baseAddress));
 …
   GDBG_INFO((88, "init96MapBoard sstHW = %x\n", sstHW));
   /* CHD NOTE:  The routine init96SetupRendering MUST Be called from this
      routine or all hell brakes loose.
 …
     GrScreenResolution_t    res = GR_RESOLUTION_640x480;
     static void init96SetupRendering(InitRegisterDesc *regDesc,
                                      GrScreenResolution_t sRes);
+                     GrScreenResolution_t sRes);
     if (curHALData->initAperture)
 …
     if ( !rv )
       return FXFALSE;
     init96SetupRendering(regDesc, res);
     sst96InitGetTmuInfo((FxU32 *)sstHW, vg96Info);
+    }
 …
     /* In dos mode, we do it the way it is supposed to be.
        In windows mode, calling initEnableRegs() will change the clock
        rate and it makes the refresh looks bad. So we still use the
+       rate and it makes the refresh looks bad. So we still use the
        init96SetVideo() to set up the rendering mode etc.
        */
 …
       union REGS
         inR, outR;
       inR.w.ax = 0x4f03;
       int386(0x10, &inR, &outR);
       oldVidMode = outR.w.bx;
       GDBG_INFO((80, "%s:  Saving Current video mode (0x%x).\n",
                  FN_NAME, oldVidMode));
+                 FN_NAME, oldVidMode));
+    }
     if ( !rv )
       return FXFALSE;
     if ( curHALData->initEnableRegs )
       rv = curHALData->initEnableRegs( regDesc );
     if ( !rv )
       return FXFALSE;
     init96SetupRendering(regDesc, res);
     sst96InitGetTmuInfo((FxU32 *)sstHW, vg96Info);
+  }
 …
     GrScreenResolution_t    res = GR_RESOLUTION_NONE;
     init96SetVideo(0, res,
 , 2, 1,
+, 2, 1,
 , 1, regDesc,
                    &xres, &yres, &fbStride );
 …
   GDBG_INFO((80, "init96MapBoard:  returning FXTRUE\n"));
   return FXTRUE;
 …
   }\
+}
 #endif
+#endif
 #define SWAPPENDING(status) ((status & 0x70) >> 4)
 …
   Library: Init Code for 96
   Description:
   Arguments:
   Return:
   -------------------------------------------------------------------*/
 …
   sstHW  = regDesc->hwDep.VG96RegDesc.baseAddress;
   sstPtr =
+  sstPtr =
     (volatile Sstregs *)(SST96_COMMAND_REGS(regDesc->hwDep.VG96RegDesc.baseAddress));
 …
   GDBG_INFO((80, "%s:  Software reset\n", FN_NAME));
   SET(sstHW[0x90 + 0x100000], 0xf601); /* (0xf601) init0, sw reset. */
   WAITLOOP;
 …
   SET(sstHW[0x100000 + 0x94], 0);
   SET(sstHW[0x100000 + 0x93], 0);
   GDBG_INFO((80, "%s:  Setting up Mem FIFO\n", FN_NAME));
 …
   SET(sstHW[0x92 + 0x100000], regVal);
   /* Off for Host Blt, On for LFB command traffic
+  /* Off for Host Blt, On for LFB command traffic
      Low Priority Request Aging - wait 64 cycles
      before answering low priority requests from
 …
      [24]   - PUMA Texture Address Space Mode      - 0x1 - 2MB
      [23]   - PUMA Texture Base Address Mode       - 0x1 - 6MB
      [12:7] - PUMA Low Priority Grant Limit Cnt    - 0x0
      [6]    - PUMA Low Prorirty Grant Limit Enable - 0x0
+     [12:7] - PUMA Low Priority Grant Limit Cnt    - 0x0
+     [6]    - PUMA Low Prorirty Grant Limit Enable - 0x0
      [5:0]  - PUMA Low Priority Request Delay Cnt  - 0x1f - 32 ccls
      Setting to 0x3f ( max ) seems to cripple windows/d3d
 …
      */
   GDBG_INFO((80, "%s:  Setting low priority request aging.\n", FN_NAME));
   /*
    * If we're running at a high resolution, don't starve AT3D's
+  /*
+   * If we're running at a high resolution, don't starve AT3D's
    * video refresh.   XXX FIXME for AT3d only
    */
 …
     SET(sstHW[0x91 + 0x100000],regVal);
+  }
   /* Come out of Reset
+  /* Come out of Reset
      [17]    - Serial Status Xfer Mode     - 0x0 - rising edge
      [16:12] - TREX-To-FBI High Water Mark - 0xf
      [11:8]  - TREX-To-FBI Bus Clock Delay - 0x6
      */
+     */
   GDBG_INFO((80, "%s:  Coming out of FBI reset\n", FN_NAME));
   GETREGVALFROMENV(regVal, "SST96_FBIJRINIT0", 0xf600);
   SET(sstHW[0x90 + 0x100000], regVal); /* Bit 1 disables tmu */
   WAITLOOP;
 …
+  {
     FxU32 trexinit0, trexinit1;
     if(myGetenv(("SST_TREX0INIT0"))) {
       sscanf(myGetenv(("SST_TREX0INIT0")), "%i", &trexinit0);
 …
       trexinit0 = 0x05441;      /* TREXINIT0 */
+    }
     if(myGetenv(("SST_TREX0INIT1"))) {
       sscanf(myGetenv(("SST_TREX0INIT1")), "%i", &trexinit1);
 …
       trexinit1 = 0x3643c; /* TREXINIT1 */
+    }
     SET(sstHW[0xc7 + 0x100000], trexinit0); /* TREXINIT0 */
     SET(sstHW[0xc8 + 0x100000], trexinit1); /* TREXINIT1 */
+  }
   WAITLOOP;
 #undef FN_NAME
 } /* init96SetupRendering */
 …
   Library: init96
   Description:
 - Set video mode
 - Enable Direct Writes to Jr
 - Put Jr registers in Reset
 - Set up Color Buffer Registers
   Arguments
   Return:
   FXFALSE - fail
+  FXFALSE - fail
   FXTRUE  - pass
   -------------------------------------------------------------------*/
 INITVG96ENTRY(init96SetVideo, FxBool ,
+INITVG96ENTRY(init96SetVideo, FxBool ,
               (  FxU32                   hWnd,
                GrScreenResolution_t    sRes,
 …
   GDBG_INFO((80, "%s:  %d Color Buffers\n", FN_NAME, nColBuffers));
   GDBG_INFO((80, "(%s) hWnd=%x, sRes=%d, yOrg=%d, ncb=%d, nab=%d\n",
+  GDBG_INFO((80, "(%s) hWnd=%x, sRes=%d, yOrg=%d, ncb=%d, nab=%d\n",
              FN_NAME, hWnd, sRes, yOrigin, nColBuffers, nAuxBuffers));
 …
   if (curHALData->initAperture)
     (*curHALData->initAperture)(regDesc);
 #if defined( __DOS32__ )
+  {
 …
     oldVidMode = outR.w.bx;
     GDBG_INFO((80, "%s:  Saving Current video mode (0x%x).\n",
                FN_NAME, oldVidMode));
+  }
 #endif
+               FN_NAME, oldVidMode));
+  }
+#endif
   /*-------------------------------------
     Set Video Mode
 …
      this does not have anything to do with directX */
 #ifdef __linux__
   if (!linOpen(hWnd, sRes, vRefresh, cFormat, yOrigin,
               nColBuffers, nAuxBuffers, bufDesc,
+  if (!linOpen(hWnd, sRes, vRefresh, cFormat, yOrigin,
+              nColBuffers, nAuxBuffers, bufDesc,
               xres, yres, &swapType)) {
 #else
   if (!dxOpen(hWnd, sRes, vRefresh, cFormat, yOrigin,
               nColBuffers, nAuxBuffers, bufDesc,
+  if (!dxOpen(hWnd, sRes, vRefresh, cFormat, yOrigin,
+              nColBuffers, nAuxBuffers, bufDesc,
               xres, yres, &swapType)) {
 #endif
 …
     goto BAIL;
+  }
 #ifdef GDBG_INFO_ON
+#ifdef GDBG_INFO_ON
   for (i = 0; i < nColBuffers; i++) {
     GDBG_INFO((80, "%s:  bufDesc[%d]:\n", FN_NAME, i));
     GDBG_INFO((80, "%s:  bufDesc.bufType = %s\n",
                FN_NAME, bufTypeNames[bufDesc[i].bufType]));
     GDBG_INFO((80, "%s:  bufDesc.bufOffset = 0x%x\n",
+    GDBG_INFO((80, "%s:  bufDesc.bufOffset = 0x%x\n",
                FN_NAME, bufDesc[i].bufOffset ));
     GDBG_INFO((80, "%s:  bufDesc.bufStride = 0x%x\n",
+    GDBG_INFO((80, "%s:  bufDesc.bufStride = 0x%x\n",
                FN_NAME, bufDesc[i].bufStride));
     GDBG_INFO((80, "%s:  bufDesc.bufBPP = 0x%x\n",
 …
     FxU32
       pending = 7;              /* # Swaps pending */
     GDBG_INFO((80,
                "%s:  Sending %d swapbufferCMDs\n",
                FN_NAME,
+    GDBG_INFO((80,
+               "%s:  Sending %d swapbufferCMDs\n",
+               FN_NAME,
                pending));
     while (pending) {
       FxU32
         tries = 0;
       GDBG_INFO((80, "%s: %d swaps pending\n", FN_NAME, pending))  ;
 …
         WAITLOOP;
+      }
       do {
         ++tries;
         status =  sstHW[0x100000];
         GDBG_INFO((120, "%s:  Serial status = 0x%x\n", FN_NAME, status));
         pending = SWAPPENDING(status);
 …
       } while (pending);
+    }
     /* Clear counters with a NOP */
     SET(sstHW[0x42 + 0x100000], 1); /* NOP cmd */
 …
     do {
       if (nTries > MAXTRIES) {
         GDBG_INFO((80,
+        GDBG_INFO((80,
                    "%s: Bailing out and returning false after %d checks for idle.\n", FN_NAME, nTries-1));
         return FXFALSE;
 …
       ++nTries;
       status = sstHW[0x100000];
       GDBG_INFO((80,
                  "%s: Serial status after soft reset: 0x%x\n",
                  FN_NAME,
+      GDBG_INFO((80,
+                 "%s: Serial status after soft reset: 0x%x\n",
+                 FN_NAME,
                  status));
     } while (status & 0x1);
   } /* end of swap buffer block */
   if (tripleBuffering) {
     GETREGVALFROMENV(regVal, "SST96_FBIJRINIT0", 0xf600);
 …
   dfbFrontIdx =   0;
   dfbBackIdx  =   1;
+  dfbBackIdx  =   1;
   dfbRenderIdx =  dfbBackIdx;
   rfbFrontIdx =   0;
   rfbBackIdx  =   1;
+  rfbBackIdx  =   1;
   rfbRenderIdx =  rfbBackIdx;
 …
     goto BAIL;
+  }
   /*-------------------------------------
     Set up Page Flipping
 …
     if (curHALData->initUseTiles && (swapType == INIT_SWAP_FLIP)) {
 #ifdef H3D
       (*curHALData->initUseTiles)(regDesc,
+      (*curHALData->initUseTiles)(regDesc,
                                 buf,
                                 maxBuffer,
                                 bI[0].dfbStride,
                                 *xres,
+                                *xres,
                                 *yres,
                                 GR_RESOLUTION_IS_AUTOFLIPPED(sRes) );
 #else
       (*curHALData->initUseTiles)(regDesc,
+      (*curHALData->initUseTiles)(regDesc,
                                 buf,
                                 maxBuffer,
                                 bI[0].dfbStride,
                                 *xres,
+                                *xres,
                                 *yres );
 #endif
 …
+  }
 #endif
   *fbStride = (bI[1].dfbStride>>1);
   GDBG_INFO(( 200, "frame buffer stride: %d\n", *fbStride ));
  BAIL:
   return rv;
 …
   Library: init96
   Description:
   Disable Direct Hardware Access
   Restore the video to it's initial state
   Arguments:
   none
 …
   -------------------------------------------------------------------*/
 INITVG96ENTRY(init96RestoreVideo, void, ( InitRegisterDesc *regDesc )) {
 #define FN_NAME "init96RestoreVideo"
+#define FN_NAME "init96RestoreVideo"
   if ( curHALData->initDisableRegs )
     curHALData->initDisableRegs( regDesc );
 #if  defined( __WIN32__ ) && !defined( INIT_HOOPTI )
+#if  defined( __WIN32__ ) && !defined( INIT_HOOPTI )
   dxClose();
 #elif defined( __DOS32__ )
+#elif defined( __DOS32__ )
+  {
     static union REGS
 …
   Library: init96
   Description:
   Enable the JR command transport and return pertinant fifo
+  Enable the JR command transport and return pertinant fifo
   information to the caller
   Arguments:
   info - structure to fill with info about the FIFO
 …
   FXFALSE - fail
   -------------------------------------------------------------------*/
 INITVG96ENTRY(init96EnableTransport, FxBool, ( InitFIFOData *info, InitRegisterDesc* regDesc))
+INITVG96ENTRY(init96EnableTransport, FxBool, ( InitFIFOData *info, InitRegisterDesc* regDesc))
+{
 #define FN_NAME "init96EnableTransport"
 …
   PciMemType
     fifoMemType;
   GDBG_INFO((80, "%s\n", FN_NAME));
   /*------------------------------------------------------------
     Enable the Off Chip Fifo
     ------------------------------------------------------------*/
   /* These are defined in sst.c for now */
   lo = (fifoStart >> 12);     /* physaddr of 1st 4k page */
 …
   sz = (hi - lo + 1) << 12;   /* bytes */
   th = (hi - lo) - 3;         /* threshold, in 4k pages. */
   /* Generate virtual addresses for the pointers. */
   fifovirt = (FxU32 *)&sstHW[lo << 10];
 …
   fifomax  = sz;
   fifocur  = 0;
   fifoptr  = fifovirt;
   fifosize = 4096;            /* initially, set to 4k */
   fifolfb = 1;
   /* First disable the off-chip fifo */
   GDBG_INFO((80, "%s:  Disabling off-chip FIFO\n", FN_NAME));
   SET(sstHW[0x100000 + 0x93], 0);
   /* FbijrInit4 - 0x94 - entry count */
   SET(sstHW[0x100000 + 0x94], 0);
   /* FbijrInit5 - 0x95 - read pointer */
   SET(sstHW[0x100000 + 0x95], lo << 9);
   /* Default size to page checking mode.
+  /* Default size to page checking mode.
+   *
    * NB: This will get overwritten later if we're using
 …
   info->hwDep.vg96FIFOData.fifoLfb  = fifolfb;
   /* Set up alternate wrapping values.
+  /* Set up alternate wrapping values.
+   *
    * NB: This *MUST* come before the processor dependent
 …
   /*
   **  NOTE TO ALL FOOLS WHO TREAD HERE
   **
+  **  NOTE TO ALL FOOLS WHO TREAD HERE
+  **
   **  It is VITALLY important to enable the FIFO AFTER the
   **  P6 Lag Of Love(tm), instead of before, otherwise the FIFO will
 …
   /* Set the fifo ptr now that we really know where its going to start
    * for the client code.
+   * for the client code.
    */
   info->hwDep.vg96FIFOData.fifoPtr  = (FxU32*)fifoptr;
 …
     Return:
     -------------------------------------------------------------------*/
 INITVG96ENTRY(init96DisableTransport, void, ( void ))
+INITVG96ENTRY(init96DisableTransport, void, ( void ))
+{
 #define FN_NAME "init96DisableTransport"
   while (*(volatile FxU32 *)sstPtr & 1);
   SET(sstHW[0x100000 + 0x90], 0xf601); /* (0xf601) init0, sw reset. */
   SET(sstHW[0x100000 + 0x95], 0);
 …
     sstPtr->swappendCMD = 0x1;
     if (gotEnv == FXFALSE) {
 …
     CRTC_GET(AR_CRTC_SERIAL_OVERFLOW_INDEX, serialOverflow);
     serialOverflow &= 0xF0;
     /* Make sure scanout within active display */
     do {
       INP(VGA_INPUT_STATUS_1C, tmp);
     } while (tmp & VIS1C_PIXEL_DISPLAY_INACTIVE);
     /* Set serial address */
     /* For some reason unknown to me, this is set to the byte offset / 4,
        or perhaps the offset in dwords */
     /* Top nibble */
     tmp = (FxU8) ((offset >> (2+16)) & 0x0F);
     CRTC_SET(AR_CRTC_SERIAL_OVERFLOW_INDEX, serialOverflow | tmp);
     /* Middle byte */
     tmp = (FxU8) ((offset >> (2+8)) & 0xFF);
     CRTC_SET(VR_CRTC_SERIAL_START_ADDRESS_HI_INDEX, tmp);
     /* Low byte */
     tmp = (FxU8) ((offset >> 2) & 0xFF);
     CRTC_SET(VR_CRTC_SERIAL_START_ADDRESS_LO_INDEX, tmp);
     /* Save away */
     do {
 …
 #endif
 #endif
     /* dpc - 26 jan 1998
      * Some hw, macronix, requires that we diddle w/ even more bits
      * when we do the swap.
+     * when we do the swap.
      */
     if(curHALData->initSwapTiles != NULL) (*curHALData->initSwapTiles)(rd);
     ADVANCE_BUFFERS(rfb);
 …
                bI[rfbRenderIdx].rfb));
     wcb( (FxU32*)&(sstPtr->colBufferSetup), bI[rfbRenderIdx].rfb );
   } else {
 …
   Library: Init Code for VG96
   Description:
   Arguments:
   Return:
   -------------------------------------------------------------------*/
 …
 #define LFB_OFFSET( X ) ( X & 0x3fffff )
 INITVG96ENTRY(init96GetBufferPtr, void*, (InitBuffer_t buffer, int *strideBytes))
+INITVG96ENTRY(init96GetBufferPtr, void*, (InitBuffer_t buffer, int *strideBytes))
+{
 #define FN_NAME "init96GetBufferPtr"
 …
   Date: 2/25
   Implementor(s): jdt
   Library: init96
+  Library: init96
   Description:
   Set the current render buffer
 …
   none
   -------------------------------------------------------------------*/
 INITVG96ENTRY(init96RenderBuffer, void, (InitBuffer_t buffer,Init96WriteMethod *wcb))
+INITVG96ENTRY(init96RenderBuffer, void, (InitBuffer_t buffer,Init96WriteMethod *wcb))
+{
 #define FN_NAME "init96RenderBuffer"
 …
   none
   -------------------------------------------------------------------*/
 INITVG96ENTRY(init96Origin, void, (InitOriginLocation_t origin,Init96WriteMethod *wcb))
+INITVG96ENTRY(init96Origin, void, (InitOriginLocation_t origin,Init96WriteMethod *wcb))
+{
 #define FN_NAME "init96Origin"
 …
   GDBG_INFO((80, "(%s)\n", FN_NAME));
   if ( !sstHW ) return FXFALSE;
 …
                                       (*((volatile FxU32*)(((FxU32)(__regP)) + (0x95 << 12))) << 3))
 INITVG96ENTRY(init96WrapFIFO,
               FxBool,
+INITVG96ENTRY(init96WrapFIFO,
+              FxBool,
               (InitRegisterDesc* rd, InitFIFOData* fifoP))
+{
 …
+  {
     const FxI32 writes = (MIN(fifoP->hwDep.vg96FIFOData.roomToReadPtr,
+    const FxI32 writes = (MIN(fifoP->hwDep.vg96FIFOData.roomToReadPtr,
                               fifoP->hwDep.vg96FIFOData.roomToEnd) -
                           fifoP->hwDep.vg96FIFOData.fifoSize);
     fifoP->hwDep.vg96FIFOData.roomToReadPtr -= writes;
     fifoP->hwDep.vg96FIFOData.roomToEnd -= writes;
 …
       const FxU32 curReadPtr = SST96_HW_FIFO(sstHW, sstPtr);
       const FxU32 curReadDist = curReadPtr - lastHwRead;
       roomToReadPtr += curReadDist;
       if (lastHwRead > curReadPtr) roomToReadPtr += fifoP->hwDep.vg96FIFOData.fifoMax;
 …
+    }
     GDBG_INFO((80, FN_NAME"_Wait : (0x%X : 0x%X) : (0x%X : 0x%X)\n",
+    GDBG_INFO((80, FN_NAME"_Wait : (0x%X : 0x%X) : (0x%X : 0x%X)\n",
                (FxU32)fifoP->hwDep.vg96FIFOData.fifoPtr, blockSize,
                fifoP->hwDep.vg96FIFOData.roomToReadPtr,
 …
 #else
 #define JU_JU_STALL /* Do Nothing */
 #endif
+#endif
+      {
          volatile FxU32* fifoPtr = fifoP->hwDep.vg96FIFOData.fifoPtr;
 …
             volatile FxU32* serialStatus =
               fifoP->hwDep.vg96FIFOData.regDesc->hwDep.VG96RegDesc.serialStatus;
             if ((*serialStatus & 0x80) != 0x00) {
                GDBG_INFO((85, FN_NAME": fifo close to full. Waiting(0x%X)...\n", numJuJuStalls));
 …
 #undef kFifoPadDelay
       GDBG_INFO((80, FN_NAME"_Wrap : (0x%X : 0x%X) : (0x%X : 0x%X)\n",
+      GDBG_INFO((80, FN_NAME"_Wrap : (0x%X : 0x%X) : (0x%X : 0x%X)\n",
                  (FxU32)fifoP->hwDep.vg96FIFOData.fifoPtr, blockSize,
                  fifoP->hwDep.vg96FIFOData.roomToReadPtr,
                  fifoP->hwDep.vg96FIFOData.roomToEnd));
       fifoP->hwDep.vg96FIFOData.roomToReadPtr -= fifoP->hwDep.vg96FIFOData.roomToEnd;
       fifoP->hwDep.vg96FIFOData.roomToEnd = fifoP->hwDep.vg96FIFOData.fifoMax;
       /* Reset fifo ptr to start */
+      /* Reset fifo ptr to start */
       fifoP->hwDep.vg96FIFOData.fifoPtr = fifoP->hwDep.vg96FIFOData.fifoVirt;
       goto again;
+  }
   /* compute room left */
   fifoP->hwDep.vg96FIFOData.roomToEnd -= blockSize;
 …
   fifoP->hwDep.vg96FIFOData.fifoSize = MIN(fifoP->hwDep.vg96FIFOData.roomToReadPtr,
                                            fifoP->hwDep.vg96FIFOData.roomToEnd) + blockSize;
   GDBG_INFO((80, FN_NAME": (0x%X : 0x%X) : (0x%X : 0x%X) : 0x%X\n",
              (FxU32)fifoP->hwDep.vg96FIFOData.fifoPtr, blockSize,
 …
   return FXTRUE;
 #undef FN_NAME
+}
+}
 #else /* !SST96_ALT_FIFO_WRAP */
 …
 #define FN_NAME "init96FIFOWait"
   volatile FxU32 *pstatus;
   /* Check for more room. */
   pstatus = (volatile FxU32 *) rd->hwDep.VG96RegDesc.serialStatus;
   if (*pstatus & 0x80) {        /* 0x80 is the FIFO threshold */
     int  timeout;
 …
     if (*pstatus & 0x80) {
       GDBG_INFO((80, "Lost patience in %s.  Status is 0x%x\n",
                  FN_NAME, *pstatus));
+                 FN_NAME, *pstatus));
       goto again;
+    }
+  }
 #undef FN_NAME
+#undef FN_NAME
 } /* init96FIFOWait */
 …
 #define FN_NAME "init96WrapFIFO"
   FxBool rVal;
   GDBG_INFO((80,"%s\n", FN_NAME));
   while (fifoData->hwDep.vg96FIFOData.fifoSize > 0) {
     *fifoData->hwDep.vg96FIFOData.fifoPtr++ = 0L;
     fifoData->hwDep.vg96FIFOData.fifoSize -= 4;
+  }
   fifoData->hwDep.vg96FIFOData.fifoCur += 4096;
   /* Wrap back to beginning? */
   if (fifoData->hwDep.vg96FIFOData.fifoCur >= fifoData->hwDep.vg96FIFOData.fifoMax ) {
     static int fifowraps = 0;
     fifoData->hwDep.vg96FIFOData.fifoCur = 0;
     if ((fifowraps = (fifowraps + 1) & 0xf) == 0) {
       GDBG_INFO((80, "%s:  Wrapping %s FIFO\n",
                  FN_NAME,
                  (fifoData->hwDep.vg96FIFOData.fifoLfb
                   ? "LFB"
+      GDBG_INFO((80, "%s:  Wrapping %s FIFO\n",
+                 FN_NAME,
+                 (fifoData->hwDep.vg96FIFOData.fifoLfb
+                  ? "LFB"
                   : "Video Aperture")));
+    }
     if (fifoData->hwDep.vg96FIFOData.fifoLfb)
+    if (fifoData->hwDep.vg96FIFOData.fifoLfb)
       fifoData->hwDep.vg96FIFOData.fifoPtr = fifoData->hwDep.vg96FIFOData.fifoVirt;
+  }
   /*  */
+  {
     FxU32
       fbiJrInit5;
     GDBG_INFO((125, "%s:  Write = 0x%x\n", FN_NAME,
                (FxU32) fifoData->hwDep.vg96FIFOData.fifoPtr -
                (FxU32) fifoData->hwDep.vg96FIFOData.fifoVirt));
     fbiJrInit5 = *((volatile FxU32 *) (((FxU32) sstPtr) + (0x95 << 12)));
 …
   GDBG_INFO((80, "%s:  Got more room.\n", FN_NAME));
   /* At this point, we have atleast 1 more page of fifo. */
   fifoData->hwDep.vg96FIFOData.fifoSize = 4096;
   rVal = FXTRUE;
   GDBG_INFO((80, "%s:  returning %s\n", FN_NAME, rVal ? "FXTRUE" : "FXFALSE"));
   return rVal;
 #undef FN_NAME
 } /* init96WrapFIFO */
 …
 #endif /* !SST96_ALT_FIFO_WRAP */
 /*
  * This function is used only locally, so none of Chris's decorations
+/*
+ * This function is used only locally, so none of Chris's decorations
  * Load colbufSetup and auxBufSetup registers, given a InitBufDesc_t
  */
 static FxBool
+static FxBool
 init96LoadBufRegs(int nBuffers, InitBufDesc_t *pBufDesc, int xRes,
                   int yRes, InitRegisterDesc *rd)
+                  int yRes, InitRegisterDesc *rd)
+{
 #define FN_NAME "init96LoadBufRegs"
 …
   InitBufDesc_t   *pFifo   = NULL;
   int i;
   GDBG_INFO((80, "(%s) w = %d, h = %d, n = %d\n",
              FN_NAME, xRes, yRes, nBuffers));
   if ( !sstHW ) return FXFALSE;
   /* Take pBufDesc apart */
   while (nBuffers-- > 0) {
     switch (pBufDesc->bufType) {
     case INIT_BUFFER_FRONTBUFFER:
       GDBG_INFO((80, "%s: %s: 0x%x\n",
+      GDBG_INFO((80, "%s: %s: 0x%x\n",
                  FN_NAME, bufTypeNames[pBufDesc->bufType], pBufDesc));
       pFront = pBufDesc;
       break;
     case INIT_BUFFER_BACKBUFFER:
       GDBG_INFO((80, "%s: %s: 0x%x\n",
+      GDBG_INFO((80, "%s: %s: 0x%x\n",
                  FN_NAME, bufTypeNames[pBufDesc->bufType], pBufDesc));
       pBack  = pBufDesc;
       break;
     case INIT_BUFFER_AUXBUFFER:
       GDBG_INFO((80, "%s: %s: 0x%x\n",
+      GDBG_INFO((80, "%s: %s: 0x%x\n",
                  FN_NAME, bufTypeNames[pBufDesc->bufType], pBufDesc));
       pAux   = pBufDesc;
+      pAux   = pBufDesc;
       break;
     case INIT_BUFFER_FIFOBUFFER:
       GDBG_INFO((80, "%s: %s: 0x%x\n",
+    case INIT_BUFFER_FIFOBUFFER:
+      GDBG_INFO((80, "%s: %s: 0x%x\n",
                  FN_NAME, bufTypeNames[pBufDesc->bufType], pBufDesc));
       pFifo  = pBufDesc;
       break;
     case INIT_BUFFER_TRIPLEBUFFER:
       GDBG_INFO((80, "%s: %s: 0x%x\n",
+      GDBG_INFO((80, "%s: %s: 0x%x\n",
                  FN_NAME, bufTypeNames[pBufDesc->bufType], pBufDesc));
       pTriple = pBufDesc;
 …
   GDBG_INFO((80,"pFront = %.08x, pBack = %.08x, pTriple = %.08x, pAux = %.08x, pFifo = %.08x\n",
              pFront, pBack, pTriple, pAux, pFifo));
   if (myGetenv("SST96_FORCEALIGN")) {
     FxU32 F, B, T, A;
     sscanf(myGetenv("SST96_FORCEALIGN"), "%x,%x,%x,%x", &F, &B, &T, &A);
     GDBG_INFO((80, "!!!!!GROSS HACK... forcing values!!!!!\n"));
 …
   if (pFifo)
     GDBG_INFO((80,"C = %.08x, s= %6d\n", pFifo ->bufOffset, pFifo ->bufStride));
   /* Fill the arrays here */
   bI[0].dfbBase   = pFront->bufOffset;
+  bI[0].dfbBase   = pFront->bufOffset;
   bI[0].dfbStride = pFront->bufStride;
   bI[0].dfbTop    = pFront->bufOffset + (yRes-1) * pFront->bufStride;
   bI[1].dfbBase   = pBack->bufOffset;
   bI[1].dfbStride = pBack->bufStride;
 …
     fifoEnd   = pFifo->bufOffset + pFifo->bufStride;
+  }
   GDBG_INFO((80, "%s:  Returning TRUE\n", FN_NAME));
   return FXTRUE;
 …
   success. Zero is returned of the board is not mapped.
   XXX This should be refined in the future. XXX
   Arguments: none
   Return: n, where n == available VRAM in bytes on the board
   -------------------------------------------------------------------*/

trunk/src/opengl/glide/sst1/init/init96/initmcrx.c

-              r2885
+              r6653
+/* $Id: initmcrx.c,v 1.2 2001-09-05 14:31:02 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:31 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:02 $
 **
 */
 static char revString[] = "@#%$Workfile: initmcrx.c $ $Revision: 1.1 $";
+static char revString[] = "@#%$Workfile: initmcrx.c $ $Revision: 1.2 $";
 #include <3dfx.h>
 …
   Library: Init Code for MCRX
   Description:
   Arguments:
   Return:
         address of mcrxHALData
 …
   Initialize rd pointers to access apertures
   Arguments:
   Return:
   -------------------------------------------------------------------*/
 …
 x2000000 - 0x20000);
   GDBG_INFO((80, "%s:  Setting partnerRegPtr to 0x%x\n",
+  GDBG_INFO((80, "%s:  Setting partnerRegPtr to 0x%x\n",
              FN_NAME, rd->hwDep.VG96RegDesc.partnerRegPtr));
 #if 1
   rd->hwDep.VG96RegDesc.serialStatus = (FxU32 *)
 …
   rd->hwDep.VG96RegDesc.fifoApertureBase =
     (FxU32 *) (((FxU32)rd->hwDep.VG96RegDesc.baseAddress) + 0x400000);
   GDBG_INFO((80, "%s:  returning TRUE\n", FN_NAME));
   return rVal;
 …
 /* FIXME !! jdt - need to add more resolutions to dos */
 INITMCRXENTRY(initMCRXSetVideo, FxBool, (GrScreenResolution_t res, GrScreenRefresh_t refresh, FxU32 *xr, FxU32 *yr ))
+INITMCRXENTRY(initMCRXSetVideo, FxBool, (GrScreenResolution_t res, GrScreenRefresh_t refresh, FxU32 *xr, FxU32 *yr ))
+{
 #define FN_NAME "initMCRXSetVideo"
   FxBool rv = FXTRUE;
 #if defined(INIT_ACCESS_DIRECT) && defined( __DOS32__ )
+#if defined(INIT_ACCESS_DIRECT) && defined( __DOS32__ )
   union REGS r0, r1;
 #endif
   GDBG_INFO((80, "%s: \n", FN_NAME));
 #if defined(INIT_ACCESS_DIRECT) && defined( __DOS32__ )
+#if defined(INIT_ACCESS_DIRECT) && defined( __DOS32__ )
   switch( res ) {
   case GR_RESOLUTION_320x200:
 …
 #endif
   GDBG_INFO((80, "%s: returning %s\n", FN_NAME, rv?"TRUE":"FALSE"));
+  GDBG_INFO((80, "%s: returning %s\n", FN_NAME, rv?"TRUE":"FALSE"));
   return rv;
 #undef FN_NAME
+#undef FN_NAME
 } /* initMCRXSetVideo */
 …
   Do all setup necessary to enable direct writes to JR Space
   Arguments:
   rd - pointer to register description
   Return:
   True if success, False if Failure
   -------------------------------------------------------------------*/
 INITMCRXENTRY(initMCRXEnableRegs, FxBool, (InitRegisterDesc *rd))
+INITMCRXENTRY(initMCRXEnableRegs, FxBool, (InitRegisterDesc *rd))
+{
 #define FN_NAME "initMCRXEnableRegs"
   FxU32
+  FxU32
     tmp;
   FxU8
 …
   GDBG_INFO((80, "%s:    Save Extended Registers Protection State\n",
              FN_NAME));
   OUTP(0x3d4, 0x19);
   INP(0x3d5, protState);
 …
   OUTP(0x3C4, 0x1B);
   INP(0x3C5, rd->hwDep.VG96RegDesc.mclockLo);
   GDBG_INFO((80, "%s: mclock registers: (0x%X : 0x%X)\n", FN_NAME,
+  GDBG_INFO((80, "%s: mclock registers: (0x%X : 0x%X)\n", FN_NAME,
              (FxU32)rd->hwDep.VG96RegDesc.mclockHi, (FxU32)rd->hwDep.VG96RegDesc.mclockHi));
   GDBG_INFO((80, "%s:  Enabling FBI Jr.\n", FN_NAME));
   OUTPW(0x3C4, 0x001F);
 …
 /* FIXME!!! jdt - puma/ram timing fixes need to go here */
 INITMCRXENTRY(initMCRXDisableRegs,FxBool,(InitRegisterDesc *rd))
+INITMCRXENTRY(initMCRXDisableRegs,FxBool,(InitRegisterDesc *rd))
+{
 #define FN_NAME "initMCRXDisableRegs"
   FxU8
     seqSave, crtcSave;
   FxU16
     protState;
 …
   CRTC_GET(0x28, tmp);
   GDBG_INFO((80, "%s:  crtc 0x28: 0x%X\n", FN_NAME, tmp));
   tmp &= ~1;
+  tmp &= ~1;
   CRTC_SET(0x28, tmp);
 …
+  {
     FxU16 tempMclock;
     GDBG_INFO((80, "%s:  Restoring mclock\n", FN_NAME));
     tempMclock = (0x1A | (rd->hwDep.VG96RegDesc.mclockHi << 8));
     OUTPW(0x3C4, tempMclock);
     tempMclock = (0x1B | (rd->hwDep.VG96RegDesc.mclockLo << 8));
     OUTPW(0x3C4, tempMclock);
 …
     OUTPW(0x3C4, 0x001C);
+  }
   GDBG_INFO((80, "%s:  Restoring Protection\n", FN_NAME));
   OUTPW(0x3df, protState);
 …
   return FXTRUE;
 #undef FN_NAME
 } /* initMCRXDisableRegs */
 …
   Library: Init Code for MCRX
   Description:
   Arguments:
   Return:
   -------------------------------------------------------------------*/
 …
   { 0x0d, 0x0c, 0x21 },
   { 0x71, 0x72, 0x73 },
   /* chd - Fixme!
+  /* chd - Fixme!
    * Bogus numbers.  Does triple buffering work on Macronix?
+   *
    * dpc - 23 jan 1998 -
+   *
+   * dpc - 23 jan 1998 -
    * Donny just told me this so hopefully this will work.
    */
 …
     const FxU8 maxBufferBits = (((crtcSwapControl & 0x08) == 0) ? 1 : 2);
     crtcSwapStatus = ((crtcSwapStatus & ~0x03) |
+    crtcSwapStatus = ((crtcSwapStatus & ~0x03) |
                       ((bufferBits == maxBufferBits) ? 0x00 : bufferBits + 1));
     CRTC_SET(0x7A, crtcSwapStatus);
+  }
   /* We have no way of knowing that this worked so of course we always
    * return success.
 …
   Library: Init Code for MCRX
   Description:
   Arguments:
   atmm:                 Pointer to base of MCRX
 …
                                       FxU32 nBuffers,
                                       FxU32 strideInBytes,
                                       FxU32 Width, FxU32 Height, FxU32 PageFlipping))
+                                      FxU32 Width, FxU32 Height, FxU32 PageFlipping))
 #else
 INITMCRXENTRY(initMCRXUseTiles, int, (InitRegisterDesc *rd,
 …
                                       FxU32 nBuffers,
                                       FxU32 strideInBytes,
                                       FxU32 Width, FxU32 Height))
+                                      FxU32 Width, FxU32 Height))
 #endif
+{
 …
   const char *envVal;
   GDBG_INFO((80, "%s:\n", FN_NAME));
 …
    * If we are triple buffering we need to enable this on the actual
    * macronix part as well. This is set by enabling bit 3 of the crtc
    * register.
+   * register.
    */
   if (nBuffers == 3) tmp |= 0x08;
   mcrxHALData.initSwapTiles = initMCRXSwapTiles;
   if (envVal = myGetenv("MRCX_71"))
+  if (envVal = myGetenv("MRCX_71"))
     sscanf(envVal, "%x", &tmp);
   CRTC_SET(0x70, tmp);
 …
 #undef FN_NAME
 } /* initMCRXUseTiles */
 /*-------------------------------------------------------------------
 …
   get information about MCRX
   Arguments:
   info - pointer to info struct
   Return:
   True if success, False if Failure
   -------------------------------------------------------------------*/
 INITMCRXENTRY(initMCRXGetInfo,FxBool,(VG96Info *info))
+INITMCRXENTRY(initMCRXGetInfo,FxBool,(VG96Info *info))
+{
 #define FN_NAME "initMCRXGetInfo"
 …
   /* Watcom warning suppression */
   revString[0] = revString[0];
   info->vgaChip = 0;
   info->vg96Rev = 0;
 …
   info->tfxRev  = 1;
   info->tfxRam  = 2;
   info->vg96Ram = (0x100000 << mBytesPow);
   GDBG_INFO((80, "%s: frame buffer has 0x%x bytes\n", FN_NAME, info->vg96Ram));
   return FXTRUE;
 #undef FN_NAME
 } /* initMCRXGetInfo */

trunk/src/opengl/glide/sst1/init/init96/lindrvr.c

-              r2885
+              r6653
+/* $Id: lindrvr.c,v 1.2 2001-09-05 14:31:03 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 …
 #ifndef DUMMY
 static Display              *dpy        = 0;
 static int                  screenNum   = 0;
 static int                  screenWidth = 0;
 static void*                screenPhys  = 0;
 static int                  screenMem   = 0;
 static GC                   xgc         = 0;
+static Display          *dpy    = 0;
+static int          screenNum   = 0;
+static int          screenWidth = 0;
+static void*            screenPhys  = 0;
+static int          screenMem   = 0;
+static GC           xgc     = 0;
 static Window               hWndApp     = 0;
 static FxU32                Width       = 0;
+static FxU32                Width       = 0;
 static FxU32                Height      = 0;
 static FxBool               IsFullScreen = 0;
 …
   screenNum=XDefaultScreen(dpy);
   XF86DGAGetVideoLL(dpy, screenNum, (int*)&screenPhys, &screenWidth, &banksize,
                     &screenMem);
+            &screenMem);
   screenMem*=1024;
   return FXTRUE;
 …
+}
 static int
+static int
 cvtXToGlideDesc(InitBufDesc_t *pDesc) {
   InitBufDesc_t   *dFront  = &pDesc[0];
 …
     return ErrorMessage(hWndApp, "Couldn't get Backbuffer Info");
   dBack->bufOffset -= dScreen->bufOffset;
   /* Get info about aux buffer (pixmap) */
   dAux->bufType = INIT_BUFFER_AUXBUFFER;
   if (!cvtAddrToBufDesc(addrAux, dAux))
+  if (!cvtAddrToBufDesc(addrAux, dAux))
     return ErrorMessage(hWndApp, "Couldn't get AuxBuffer Info");
   dAux->bufOffset -= dScreen->bufOffset;
   /* Get info about triple buffer (pixmap if used) */
   if (tripleBuffering) {
 …
   dFifo->bufOffset = (int)addrFifo-dScreen->bufOffset;
   dFifo->bufStride = FIFOSIZE;
   GDBG_INFO((80, "cvtXToGlideDesc: dFront->bufOffset = 0x%x\n", dFront->bufOffset));
   GDBG_INFO((80, "cvtXToGlideDesc: dBack->bufOffset = 0x%x\n", dBack->bufOffset));
 …
 static int
 doAllocPixmaps(int xRes, int yRes, int vRefresh,
                       InitBufDesc_t *pDesc) {
     GDBG_INFO((80, "doAllocPixmaps: hWnd = %x, fs=%d, xRes=%d, yRes=%d, vRefresh=%d\n",
+doAllocPixmaps(int xRes, int yRes, int vRefresh,
+              InitBufDesc_t *pDesc) {
+    GDBG_INFO((80, "doAllocPixmaps: hWnd = %x, fs=%d, xRes=%d, yRes=%d, vRefresh=%d\n",
              hWndApp, IsFullScreen, xRes, yRes, vRefresh));
 …
   pixFifo=XCreatePixmap(dpy, hWndApp, screenWidth,
                         (FIFOSIZE/2+4096+screenWidth-1)/screenWidth, 16);
+            (FIFOSIZE/2+4096+screenWidth-1)/screenWidth, 16);
   if ((XF86RushLockPixmap(dpy, screenNum, pixFifo, &addrFifo)==FXFALSE)
       || !addrFifo) {
 …
   pixBack=XCreatePixmap(dpy, hWndApp, xRes, yRes, 16);
   if ((XF86RushLockPixmap(dpy, screenNum, pixBack,
                           &addrBack)==FXFALSE) || !addrBack) {
+              &addrBack)==FXFALSE) || !addrBack) {
     doReleasePixmaps();
     return ErrorMessage(hWndApp, "Failed to lock back pixmap\n");
 …
   pixAux=XCreatePixmap(dpy, hWndApp, xRes, yRes, 16);
   if ((XF86RushLockPixmap(dpy, screenNum, pixAux,
                           &addrAux)==FXFALSE) || !addrAux) {
+              &addrAux)==FXFALSE) || !addrAux) {
     doReleasePixmaps();
     return ErrorMessage(hWndApp, "Failed to lock aux pixmap\n");
 …
     pixTriple=XCreatePixmap(dpy, hWndApp, xRes, yRes, 16);
     if ((XF86RushLockPixmap(dpy, screenNum, pixTriple,
                             &addrTriple)==FXFALSE) || !addrTriple) {
+                &addrTriple)==FXFALSE) || !addrTriple) {
       doReleasePixmaps();
       return ErrorMessage(hWndApp, "Failed to lock triple pixmap\n");
 …
+}
 static FxBool
+static FxBool
 getWindowSize(int *width, int *height) {
     XWindowAttributes attr;
 …
     /*
      * Get ourselves a valid window handle
+     * Get ourselves a valid window handle
      */
     hWndApp = (Window)hWindow;
 …
     if ((sRes <  GR_RESOLUTION_320x200) ||
         (sRes >  GR_RESOLUTION_512x256))
+        (sRes >  GR_RESOLUTION_512x256))
       return ErrorMessage(hWndApp, "Bad Fullscreen resolution");
 …
       return ErrorMessage(hWndApp, "Screen depth must be 16\n");
     if (XF86DGAQueryDirectVideo(dpy, DefaultScreen(dpy), &flags)==False ||
         !flags) {
+    !flags) {
       GDBG_INFO((0, "Could query Direct Video"));
       return ErrorMessage(hWndApp, "Direct video not supported\n");
+    }
     if (XF86VidModeGetAllModeLines(dpy, DefaultScreen(dpy), &numModes,
                                    &vidModes)==False) {
+                   &vidModes)==False) {
       return ErrorMessage(hWndApp, "Couldn't query vidmode list\n");
       return 1;
 …
     for (i=0; i<numModes; i++)
       if ((vidModes[i]->hdisplay==Width) && (vidModes[i]->vdisplay==Height))
         break;
+    break;
     if (i==numModes) {
       return ErrorMessage(hWndApp, "Server doesn't support requested resolution\n");
       if (vidModes) {
         XFree(vidModes);
         vidModes=0;
+    XFree(vidModes);
+    vidModes=0;
+      }
       return 1;
 …
     GDBG_INFO((80, "\tbufType = 0x%x\n", pBufDesc[i].bufType));
     GDBG_INFO((80, "\tbufOffset = 0x%x\n", pBufDesc[i].bufOffset));
     GDBG_INFO((80, "\tbufStride = 0x%x\n", pBufDesc[i].bufStride));
+    GDBG_INFO((80, "\tbufStride = 0x%x\n", pBufDesc[i].bufStride));
     GDBG_INFO((80, "\tbufBPP = 0x%x\n", pBufDesc[i].bufBPP));
+  }
 …
   if ( curHALData->initSetVideo ) {
     curHALData->initSetVideo( sRes, vRefresh,
+    curHALData->initSetVideo( sRes, vRefresh,
                              (FxU32*)width, (FxU32*)height );
+  }
 …
+{
   int     i, w, h;
   GDBG_INFO((80, "linControl: code = %d\n", code));
 …
     getWindowSize(&w, &h);
     if ((Width != w) || (Height != h)) {
       GDBG_INFO((120, "W and H changed to %d %d\n",
                  Width, Height));
+      GDBG_INFO((120, "W and H changed to %d %d\n",
+                 Width, Height));
       if (!doAllocPixmaps(w, h, 0, BufDesc)) {
         w=Width;
         h=Height;
         if (!doAllocPixmaps(w, h, 0, BufDesc)) {
           /* ErrorMessage(hWndApp, "linControl: Resize failed\n"); */
           return FXFALSE;
+        }
+    w=Width;
+    h=Height;
+    if (!doAllocPixmaps(w, h, 0, BufDesc)) {
+      /* ErrorMessage(hWndApp, "linControl: Resize failed\n"); */
+      return FXFALSE;
+    }
+      }
       Width = w;
 …
   GDBG_INFO((80, "linControl: code = %d, w = %d, h = %d\n", code,
              Width, Height));
   return FXTRUE;
 } /* linControl */

trunk/src/opengl/glide/sst1/init/initvg/dac.c

-              r2885
+              r6653
+/* $Id: dac.c,v 1.2 2001-09-05 14:31:03 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:32 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:03 $
 **
 ** Initialization code for initializing supported SST-1 DACs
 …
 **  Read external DAC registers
 **  NOTE: The video unit of FBI must be in reset before calling this routine.
 **        The rendering engines of FBI and TREX must be idle before calling
+**        The rendering engines of FBI and TREX must be idle before calling
 **        this routine.
 **        fbiInit23 register remapping (PCI config. initEnable[2]=1) must be
 …
 **  Write to external DAC registers
 **  NOTE: The video unit of FBI must be in reset before calling this routine.
 **        The rendering engines of FBI and TREX must be idle before calling
+**        The rendering engines of FBI and TREX must be idle before calling
 **        this routine.
 **
 …
+    {
         float calc;
         calc = ((float) 14.318 * (float) (m + 2)) /
             ((float) (n + 2) * vcoFreqDivide);

trunk/src/opengl/glide/sst1/init/initvg/gamma.c

-              r2885
+              r6653
+/* $Id: gamma.c,v 1.2 2001-09-05 14:31:04 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:33 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:04 $
 **
 ** Initialization code for loading SST-1 gamma tables
 …
         else
             sstVideoIsReset = FXFALSE;
         ISET(sst->fbiInit1, IGET(sst->fbiInit1) & ~SST_VIDEO_RESET);
         /* wait for video reset to be deasserted */
 …
         FxU32 gcG = gammaTableG[(x<<3)];
         FxU32 gcB = gammaTableB[(x<<3)];
         ISET(sst->clutData, ((x<<SST_CLUTDATA_INDEX_SHIFT) |
+        ISET(sst->clutData, ((x<<SST_CLUTDATA_INDEX_SHIFT) |
                          (gcR<<SST_CLUTDATA_RED_SHIFT) |
                          (gcG<<SST_CLUTDATA_GREEN_SHIFT) |
 …
+}
 FX_EXPORT FxBool FX_CSTYLE sst1InitGammaTable(FxU32 *sstbase, FxU32 nentries,
+FX_EXPORT FxBool FX_CSTYLE sst1InitGammaTable(FxU32 *sstbase, FxU32 nentries,
 FxU32 *r, FxU32 *g, FxU32 *b)
+{
 …
         else
             sstVideoIsReset = FXFALSE;
         ISET(sst->fbiInit1, IGET(sst->fbiInit1) & ~SST_VIDEO_RESET);
         /* wait for video reset to be deasserted */
 …
         FxU32 gcG = gammaTableG[(x<<3)];
         FxU32 gcB = gammaTableB[(x<<3)];
         ISET(sst->clutData, ((x<<SST_CLUTDATA_INDEX_SHIFT) |
+        ISET(sst->clutData, ((x<<SST_CLUTDATA_INDEX_SHIFT) |
                          (gcR<<SST_CLUTDATA_RED_SHIFT) |
                          (gcG<<SST_CLUTDATA_GREEN_SHIFT) |

trunk/src/opengl/glide/sst1/init/initvg/gdebug.c

-              r2885
+              r6653
+/* $Id: gdebug.c,v 1.2 2001-09-05 14:31:04 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:33 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:04 $
 */
 …
     /* I can't init gdbg_msgfile to stdout since it isn't constant so
      * I do it now */
     gdbg_msgfile = stdout;
+    gdbg_msgfile = stdout;
     done = 1;
 …
 gdbg_vprintf (const char *format,va_list args)
+{
     if (gdbg_msgfile != NULL) {
         if (!UseDebugString) {
 …
             vfprintf(gdbg_msgfile,format,args);
             fflush(gdbg_msgfile);
+        }
+            fflush(gdbg_msgfile);
+        }
 #ifdef __WIN32__
         else {
 …
         if (outf) gdbg_msgfile = outf;
         return outf != NULL;
+    }
+}
+    }
+}

trunk/src/opengl/glide/sst1/init/initvg/info.c

-              r2885
+              r6653
+/* $Id: info.c,v 1.2 2001-09-05 14:31:04 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:33 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:04 $
 **
 ** Routines to detect memory size, strapping pin, and other initialization
 …
 #define XY_ONE (1<<SST_XY_FRACBITS)
 static FxBool
 readAndSum4x4(FxU32 *sstbase, FxU32 x, FxU32 y,
                 FxU32 *r_sum, FxU32 *g_sum, FxU32 *b_sum)
+static FxBool
+readAndSum4x4(FxU32 *sstbase, FxU32 x, FxU32 y,
+            FxU32 *r_sum, FxU32 *g_sum, FxU32 *b_sum)
+{
     FxU32 rd_x, rd_y;
 …
     sst1InitIdle(sstbase);
     if (x & 1) {
         INIT_PRINTF(("ERROR: readAndSum4x4 must have an even X (%d)\n", x));
         return(FXFALSE);
+    INIT_PRINTF(("ERROR: readAndSum4x4 must have an even X (%d)\n", x));
+    return(FXFALSE);
+    }
 …
     *b_sum = 0;
     for (rd_y = 0; rd_y < 4; rd_y++) {          /* read 4 scanlines */
         for (rd_x = 0; rd_x < 4; rd_x ++) {
             if ((rd_x & 1)==0) {                /* read 2 pixels at a time */
                 rd_col =
                   IGET(sstbase[(SST_LFB_ADDR + (y+rd_y)*2048 + (x+rd_x)*2) >> 2]);
+            }
             else rd_col >>= 16;
             rd_r = ((rd_col >> 11) & 0x1f) << 3;
             rd_g = ((rd_col >>  5) & 0x3f) << 2;
             rd_b = ((rd_col >>  0) & 0x1f) << 3;
             *r_sum += rd_r;
             *g_sum += rd_g;
             *b_sum += rd_b;
             INIT_INFO((4,"%d,%d = rd_col: 0x%04x   rgb: %02x %02x %02x\n",
                     rd_x, rd_y, (rd_col & 0xffff), rd_r, rd_g, rd_b));
+        }
+    for (rd_y = 0; rd_y < 4; rd_y++) {      /* read 4 scanlines */
+    for (rd_x = 0; rd_x < 4; rd_x ++) {
+        if ((rd_x & 1)==0) {        /* read 2 pixels at a time */
+        rd_col =
+          IGET(sstbase[(SST_LFB_ADDR + (y+rd_y)*2048 + (x+rd_x)*2) >> 2]);
+        }
+        else rd_col >>= 16;
+        rd_r = ((rd_col >> 11) & 0x1f) << 3;
+        rd_g = ((rd_col >>  5) & 0x3f) << 2;
+        rd_b = ((rd_col >>  0) & 0x1f) << 3;
+        *r_sum += rd_r;
+        *g_sum += rd_g;
+        *b_sum += rd_b;
+        INIT_INFO((4,"%d,%d = rd_col: 0x%04x   rgb: %02x %02x %02x\n",
+            rd_x, rd_y, (rd_col & 0xffff), rd_r, rd_g, rd_b));
+    }
+    }
     INIT_INFO((3,"sums:  r_sum=0x%03x  g_sum=0x%03x  b_sum=0x%03x\n",
                     *r_sum, *g_sum, *b_sum));
         return(FXTRUE);
+            *r_sum, *g_sum, *b_sum));
+    return(FXTRUE);
+}
 …
     /* init sum array */
     for (r_sum = 0; r_sum <= 0xfff; r_sum++) {
         rb_tbl[r_sum] = -1;
         g_tbl[r_sum] = -1;
+    rb_tbl[r_sum] = -1;
+    g_tbl[r_sum] = -1;
+    }
 …
     /* fill sum array */
     for (tst_color = 0; tst_color <= 255; tst_color++) {
         INIT_INFO((2,"tst_color=0x%02x\n", tst_color));
         ISET(sst->c1, (tst_color << 16) | (tst_color << 8) | tst_color);
         drawTriangle(sst, x,y,36);
         if(readAndSum4x4(sstbase, x,y, &r_sum,&g_sum,&b_sum) == FXFALSE)
                 return(FXFALSE);
         /* check sums for uniqueness and then store away */
         if (r_sum != b_sum) {
             INIT_PRINTF(("ERROR:  b_sum=0x%03x  r_sum=0x%03x\n", r_sum, b_sum));
                 return(FXFALSE);
+        }
         if (rb_tbl[r_sum] != -1) {
             INIT_PRINTF(("ERROR:  non-unique r/b_sum=0x%03x\n", r_sum));
                 return(FXFALSE);
+        }
         rb_tbl[r_sum] = tst_color;
         if (g_tbl[g_sum] != -1) {
             INIT_PRINTF(("ERROR:  non-unique g_sum=0x%03x\n", g_sum));
                 return(FXFALSE);
+        }
         g_tbl[g_sum] = tst_color;
+    }
         return(FXTRUE);
+    INIT_INFO((2,"tst_color=0x%02x\n", tst_color));
+    ISET(sst->c1, (tst_color << 16) | (tst_color << 8) | tst_color);
+    drawTriangle(sst, x,y,36);
+    if(readAndSum4x4(sstbase, x,y, &r_sum,&g_sum,&b_sum) == FXFALSE)
+        return(FXFALSE);
+    /* check sums for uniqueness and then store away */
+    if (r_sum != b_sum) {
+        INIT_PRINTF(("ERROR:  b_sum=0x%03x  r_sum=0x%03x\n", r_sum, b_sum));
+        return(FXFALSE);
+    }
+    if (rb_tbl[r_sum] != -1) {
+        INIT_PRINTF(("ERROR:  non-unique r/b_sum=0x%03x\n", r_sum));
+        return(FXFALSE);
+    }
+    rb_tbl[r_sum] = tst_color;
+    if (g_tbl[g_sum] != -1) {
+        INIT_PRINTF(("ERROR:  non-unique g_sum=0x%03x\n", g_sum));
+        return(FXFALSE);
+    }
+    g_tbl[g_sum] = tst_color;
+    }
+    return(FXTRUE);
+}
 …
     if (rb_tbl[r_sum] == -1 || g_tbl[g_sum] == -1 || rb_tbl[b_sum] == -1)
+    {
         INIT_PRINTF(("ERROR: unDither: invalid color sum\n"));
         return(FXFALSE);
+    INIT_PRINTF(("ERROR: unDither: invalid color sum\n"));
+    return(FXFALSE);
+    }
     *result = (rb_tbl[r_sum] << 16) | (g_tbl[g_sum] << 8) | rb_tbl[b_sum];
         return(FXTRUE);
+    return(FXTRUE);
+}
 …
     /* render into the frame buffer */
     ISET(sst->fbzColorPath,
           SST_RGBSEL_TREXOUT | SST_CC_PASS | SST_ENTEXTUREMAP);
+      SST_RGBSEL_TREXOUT | SST_CC_PASS | SST_ENTEXTUREMAP);
     ISET(sst->texBaseAddr, 0);
     ISET(sst->textureMode, SST_AI88 | SST_TC_PASS | SST_TCA_PASS);
 …
     readAndSum4x4(sstbase, x,y, &r_sum,&g_sum,&b_sum);
     if(unDither(r_sum,g_sum,b_sum,&info->tmuConfig) == FXFALSE)
                 return(FXFALSE);
         if(GETENV(("SST_TMUCFG")))
+        return(FXFALSE);
+    if(GETENV(("SST_TMUCFG")))
         SSCANF(GETENV(("SST_TMUCFG")), "%i", &info->tmuConfig);
 …
     ISET(SST_TREX(sst,2)->trexInit1, info->tmuInit1[2]);
         return(FXTRUE);
+    return(FXTRUE);
+}
 …
 static FxU32 sense(FxU32 *sstbase, sst1DeviceInfoStruct *info, FxU32 tmu,
                    FxU32 mem, FxU32 init)
+           FxU32 mem, FxU32 init)
+{
     volatile Sstregs *sst = (Sstregs *) sstbase;
 …
     sst1InitIdle(sstbase);
     ISET(sst->texBaseAddr, 0x200000>>3);        /* set to 2 MB */
     texAddr[0] = SENSE2;                /* write a random value */
     ISET(sst->texBaseAddr, 0x100000>>3);        /* set to 1 MB */
     texAddr[0] = SENSE1;                /* write a random value */
     ISET(sst->texBaseAddr, 0x000000>>3);        /* set to 0 MB */
     texAddr[0] = SENSE0;                /* write a random value */
     ISET(sst->texBaseAddr, mem>>3);             /* reset to 2 MB */
     drawTriangle(sst,0,0,4);            /* draw a 4x4 right triangle */
+    ISET(sst->texBaseAddr, 0x200000>>3);    /* set to 2 MB */
+    texAddr[0] = SENSE2;        /* write a random value */
+    ISET(sst->texBaseAddr, 0x100000>>3);    /* set to 1 MB */
+    texAddr[0] = SENSE1;        /* write a random value */
+    ISET(sst->texBaseAddr, 0x000000>>3);    /* set to 0 MB */
+    texAddr[0] = SENSE0;        /* write a random value */
+    ISET(sst->texBaseAddr, mem>>3);     /* reset to 2 MB */
+    drawTriangle(sst,0,0,4);        /* draw a 4x4 right triangle */
     sst1InitIdle(sstbase);
 …
 FX_EXPORT FxBool FX_CSTYLE
 sst1InitGetTmuMemory(FxU32 *sstbase, sst1DeviceInfoStruct *info, FxU32 tmu,
         FxU32 *TmuMemorySize)
+    FxU32 *TmuMemorySize)
+{
     FxU32 i,data;
 …
     INIT_INFO((1,"sst1InitGetTmuMemory(0x%x, , %d)\n", sstbase,tmu));
         if(GETENV(("SST_TMUMEM_SIZE"))) {
                 *TmuMemorySize = ATOI(GETENV(("SST_TMUMEM_SIZE")));
                 return(FXTRUE);
+        }
+    if(GETENV(("SST_TMUMEM_SIZE"))) {
+        *TmuMemorySize = ATOI(GETENV(("SST_TMUMEM_SIZE")));
+        return(FXTRUE);
+    }
     ISET(sst->lfbMode, SST_LFB_RGBALANES_ARGB | SST_LFB_READFRONTBUFFER);
     ISET(sst->fbzMode, SST_DRAWBUFFER_FRONT | SST_RGBWRMASK);
     ISET(sst->fbzColorPath,
           SST_RGBSEL_TREXOUT | SST_CC_PASS | SST_ENTEXTUREMAP);
+      SST_RGBSEL_TREXOUT | SST_CC_PASS | SST_ENTEXTUREMAP);
     ISET(sst->textureMode, SST_RGB565 | SST_TC_REPLACE | SST_TCA_REPLACE);
     ISET(sst->tLOD, 0);
 …
     /* setup all downstream TMUs to be in pass-thru mode */
     for (i=0; i<tmu; i++)
         ISET(SST_TREX(sst,i)->textureMode, SST_TC_PASS | SST_TCA_PASS);
+    ISET(SST_TREX(sst,i)->textureMode, SST_TC_PASS | SST_TCA_PASS);
     /* first see if we have 4 Mbytes by writing a texel at 2MB followed by
 …
     INIT_PRINTF(("sst1InitGetTmuMemory() ERROR: Could not detect memory size.\n"));
         return(FXFALSE);
+    return(FXFALSE);
+}
 /*---------------------------------------------------------------------------
    NOTES:
         assumes that board and registers are initialized
         destroys part of the framebuffer
+    assumes that board and registers are initialized
+    destroys part of the framebuffer
   ---------------------------------------------------------------------------*/
 FX_EXPORT FxBool FX_CSTYLE
 …
     if(initSumTables(sstbase) == FXFALSE)
                 return(FXFALSE);
+        return(FXFALSE);
     if(getTmuConfigData(sstbase,info) == FXFALSE)
                 return(FXFALSE);
         /* TMU memory speed */
         /* tmuClkFixed is no longer used... */
         info->tmuClkFixed = 0x0;
         /* tmuMemSpeed is legacy, and is not used by either Obsidian GE or Pro Fab */
         info->tmuMemSpeed = 0;
+        return(FXFALSE);
+    /* TMU memory speed */
+    /* tmuClkFixed is no longer used... */
+    info->tmuClkFixed = 0x0;
+    /* tmuMemSpeed is legacy, and is not used by either Obsidian GE or Pro Fab */
+    info->tmuMemSpeed = 0;
     /* count the TMUs and verify that all TMUs are the same revision */
 …
     info->numberTmus = 1;
     if(sst1InitGetTmuMemory(sstbase, info, 0, &info->tmuMemSize[0]) == FXFALSE)
                 return(FXFALSE);
+        return(FXFALSE);
     INIT_INFO((1,"TMU0 memory = %d MB\n", info->tmuMemSize[0]));
     if (info->tmuConfig & FXBIT(6)) {           /* if TMU 1 exists */
         info->numberTmus++;                     /* increment TMU count */
         trev = (info->tmuConfig>>7) & 0x7;      /* get its revision */
         if (info->tmuRevision != trev) {
             INIT_PRINTF(("sst1InitGetDeviceInfo: ERROR, multiple different TMU revision IDs detected\n"));
             return(FXFALSE);
+        }
+    if (info->tmuConfig & FXBIT(6)) {       /* if TMU 1 exists */
+    info->numberTmus++;         /* increment TMU count */
+    trev = (info->tmuConfig>>7) & 0x7;  /* get its revision */
+    if (info->tmuRevision != trev) {
+        INIT_PRINTF(("sst1InitGetDeviceInfo: ERROR, multiple different TMU revision IDs detected\n"));
+        return(FXFALSE);
+    }
     if(sst1InitGetTmuMemory(sstbase, info, 1, &info->tmuMemSize[1]) == FXFALSE)
                 return(FXFALSE);
+    }
     if (info->tmuConfig & FXBIT(13)) {          /* if TMU 2 exists */
         info->numberTmus++;                     /* increment TMU count */
         trev = (info->tmuConfig>>14) & 0x7;     /* get its revision */
         if (info->tmuRevision != trev) {
             INIT_PRINTF(("sst1InitGetDeviceInfo: ERROR, multiple different TMU revision IDs detected\n"));
             return(FXFALSE);
+        }
+        return(FXFALSE);
+    }
+    if (info->tmuConfig & FXBIT(13)) {      /* if TMU 2 exists */
+    info->numberTmus++;         /* increment TMU count */
+    trev = (info->tmuConfig>>14) & 0x7; /* get its revision */
+    if (info->tmuRevision != trev) {
+        INIT_PRINTF(("sst1InitGetDeviceInfo: ERROR, multiple different TMU revision IDs detected\n"));
+        return(FXFALSE);
+    }
     if(sst1InitGetTmuMemory(sstbase, info, 2, &info->tmuMemSize[2]) == FXFALSE)
                 return(FXFALSE);
+        return(FXFALSE);
+    }
     INIT_INFO((1,"numberTMus = %d\n", info->numberTmus));
 …
 **
 */
 #define LFB_PUTPIXEL(X, Y, DATA)        \
         ISET(lfbptr[((SST_LFB_ADDR+(X<<1)+(Y<<11))>>1)], DATA)
 #define LFB_GETPIXEL(X, Y)                      \
         IGET(lfbptr[((SST_LFB_ADDR+(X<<1)+(Y<<11))>>1)])
+#define LFB_PUTPIXEL(X, Y, DATA)    \
+    ISET(lfbptr[((SST_LFB_ADDR+(X<<1)+(Y<<11))>>1)], DATA)
+#define LFB_GETPIXEL(X, Y)          \
+    IGET(lfbptr[((SST_LFB_ADDR+(X<<1)+(Y<<11))>>1)])
 static int fbiMemSize(FxU32 *sstbase)
+{
         volatile Sstregs *sst = (Sstregs *) sstbase;
         volatile unsigned short *lfbptr = (unsigned short *) sstbase;
         FxU32 init0Save = IGET(sst->fbiInit0);
         FxU32 init1Save = IGET(sst->fbiInit1);
         FxU32 init2Save = IGET(sst->fbiInit2);
         int retval = 0;
         if(GETENV(("SST_FBIMEM_SIZE")))
                 return(ATOI(GETENV(("SST_FBIMEM_SIZE"))));
         /* Enable dram refresh, disable memory fifo, and setup memory */
         /* for rendering */
         ISET(sst->fbiInit0, IGET(sst->fbiInit0) & ~SST_MEM_FIFO_EN);
+    volatile Sstregs *sst = (Sstregs *) sstbase;
+    volatile unsigned short *lfbptr = (unsigned short *) sstbase;
+    FxU32 init0Save = IGET(sst->fbiInit0);
+    FxU32 init1Save = IGET(sst->fbiInit1);
+    FxU32 init2Save = IGET(sst->fbiInit2);
+    int retval = 0;
+    if(GETENV(("SST_FBIMEM_SIZE")))
+        return(ATOI(GETENV(("SST_FBIMEM_SIZE"))));
+    /* Enable dram refresh, disable memory fifo, and setup memory */
+    /* for rendering */
+    ISET(sst->fbiInit0, IGET(sst->fbiInit0) & ~SST_MEM_FIFO_EN);
     ISET(sst->fbiInit2, IGET(sst->fbiInit2) | SST_EN_DRAM_REFRESH);
         sst1InitIdleFBI(sstbase);
         /* Setup Basic rendering datapath */
         ISET(sst->fbzColorPath, SST_CC_MONE);
         ISET(sst->fogMode, 0x0);
         ISET(sst->fbzMode, SST_RGBWRMASK | SST_ZAWRMASK | SST_DRAWBUFFER_FRONT);
         sst1InitIdleFBI(sstbase);
         if(sst1InitSliDetect(sstbase))
                 /* SLI cannot support 4 MBytes... */
                 goto check2MByte;
+    sst1InitIdleFBI(sstbase);
+    /* Setup Basic rendering datapath */
+    ISET(sst->fbzColorPath, SST_CC_MONE);
+    ISET(sst->fogMode, 0x0);
+    ISET(sst->fbzMode, SST_RGBWRMASK | SST_ZAWRMASK | SST_DRAWBUFFER_FRONT);
+    sst1InitIdleFBI(sstbase);
+    if(sst1InitSliDetect(sstbase))
+        /* SLI cannot support 4 MBytes... */
+        goto check2MByte;
     sst1InitSetResolution(sstbase, &SST_VREZ_800X600_60, 1);
         sst1InitIdleFBI(sstbase);
         ISET(sst->lfbMode, SST_LFB_ZZ | SST_LFB_WRITEFRONTBUFFER |
                 SST_LFB_READDEPTHABUFFER);
         sst1InitIdleFBI(sstbase);
         /* Check for 4 MBytes... */
         /* Write to Zbuffer in 800x600 resolution in upper 2 MBytes of memory */
         LFB_PUTPIXEL(128, 100, 0xdead); /* maps to row:0x216, col:0x80, bank:0x1 */
         LFB_PUTPIXEL(0, 0, 0x0);
         LFB_PUTPIXEL(798, 599, 0xffff);
         LFB_PUTPIXEL(200, 200, 0x55aa); /* maps to row:0x23d, col:0x104, bank:0x0 */
         LFB_PUTPIXEL(20, 20, 0xffff);
         LFB_PUTPIXEL(400, 400, 0x0);
         sst1InitIdleFBI(sstbase);
         if((LFB_GETPIXEL(128, 100) == 0xdead) &&
            (LFB_GETPIXEL(200, 200) == 0x55aa)) {
                 retval = 4;
                 ISET(sst->lfbMode, (SST_LFB_565 | SST_LFB_READBACKBUFFER));
                 sst1InitIdleFBI(sstbase);
                 goto fbiMemSizeDone;
+        }
+    sst1InitIdleFBI(sstbase);
+    ISET(sst->lfbMode, SST_LFB_ZZ | SST_LFB_WRITEFRONTBUFFER |
+        SST_LFB_READDEPTHABUFFER);
+    sst1InitIdleFBI(sstbase);
+    /* Check for 4 MBytes... */
+    /* Write to Zbuffer in 800x600 resolution in upper 2 MBytes of memory */
+    LFB_PUTPIXEL(128, 100, 0xdead); /* maps to row:0x216, col:0x80, bank:0x1 */
+    LFB_PUTPIXEL(0, 0, 0x0);
+    LFB_PUTPIXEL(798, 599, 0xffff);
+    LFB_PUTPIXEL(200, 200, 0x55aa); /* maps to row:0x23d, col:0x104, bank:0x0 */
+    LFB_PUTPIXEL(20, 20, 0xffff);
+    LFB_PUTPIXEL(400, 400, 0x0);
+    sst1InitIdleFBI(sstbase);
+    if((LFB_GETPIXEL(128, 100) == 0xdead) &&
+       (LFB_GETPIXEL(200, 200) == 0x55aa)) {
+        retval = 4;
+        ISET(sst->lfbMode, (SST_LFB_565 | SST_LFB_READBACKBUFFER));
+        sst1InitIdleFBI(sstbase);
+        goto fbiMemSizeDone;
+    }
 check2MByte:
         /* Check for 2 MBytes... */
         /* Write to color buffer in 640x480 resolution */
+    /* Check for 2 MBytes... */
+    /* Write to color buffer in 640x480 resolution */
     sst1InitSetResolution(sstbase, &SST_VREZ_640X480_60, 0);
         ISET(sst->lfbMode, SST_LFB_565 | SST_LFB_WRITEFRONTBUFFER |
                 SST_LFB_READFRONTBUFFER);
         sst1InitIdleFBI(sstbase);
         LFB_PUTPIXEL(50, 100, 0xdead);  /* maps to row:0x1e, col:0x99, bank:0x0 */
         LFB_PUTPIXEL(0, 0, 0x0);
         LFB_PUTPIXEL(638, 479, 0xffff);
         ISET(sst->lfbMode, SST_LFB_565 | SST_LFB_WRITEBACKBUFFER |
                 SST_LFB_READFRONTBUFFER);
         sst1InitIdleFBI(sstbase);
         LFB_PUTPIXEL(178, 436, 0xaa55); /* maps to row:0x11e, col:0x99, bank:0x0 */
         LFB_PUTPIXEL(20, 20, 0x0);
         LFB_PUTPIXEL(400, 400, 0xffff);
         sst1InitIdleFBI(sstbase);
         if(LFB_GETPIXEL(50, 100) != 0xdead)
                 goto check1MByte;
         ISET(sst->lfbMode, (SST_LFB_565 | SST_LFB_READBACKBUFFER));
         sst1InitIdleFBI(sstbase);
         if(LFB_GETPIXEL(178, 436) == 0xaa55) {
                 retval = 2;
                 goto fbiMemSizeDone;
+        }
+    ISET(sst->lfbMode, SST_LFB_565 | SST_LFB_WRITEFRONTBUFFER |
+        SST_LFB_READFRONTBUFFER);
+    sst1InitIdleFBI(sstbase);
+    LFB_PUTPIXEL(50, 100, 0xdead);  /* maps to row:0x1e, col:0x99, bank:0x0 */
+    LFB_PUTPIXEL(0, 0, 0x0);
+    LFB_PUTPIXEL(638, 479, 0xffff);
+    ISET(sst->lfbMode, SST_LFB_565 | SST_LFB_WRITEBACKBUFFER |
+        SST_LFB_READFRONTBUFFER);
+    sst1InitIdleFBI(sstbase);
+    LFB_PUTPIXEL(178, 436, 0xaa55); /* maps to row:0x11e, col:0x99, bank:0x0 */
+    LFB_PUTPIXEL(20, 20, 0x0);
+    LFB_PUTPIXEL(400, 400, 0xffff);
+    sst1InitIdleFBI(sstbase);
+    if(LFB_GETPIXEL(50, 100) != 0xdead)
+        goto check1MByte;
+    ISET(sst->lfbMode, (SST_LFB_565 | SST_LFB_READBACKBUFFER));
+    sst1InitIdleFBI(sstbase);
+    if(LFB_GETPIXEL(178, 436) == 0xaa55) {
+        retval = 2;
+        goto fbiMemSizeDone;
+    }
 check1MByte:
         ISET(sst->lfbMode, SST_LFB_565 | SST_LFB_WRITEFRONTBUFFER |
                 SST_LFB_READFRONTBUFFER);
         sst1InitIdleFBI(sstbase);
         LFB_PUTPIXEL(10, 10, 0xdead);   /* maps to row:0x0, col:0x145, bank:0x0 */
         LFB_PUTPIXEL(8, 8, 0x0);
         LFB_PUTPIXEL(340, 340, 0xffff);
         LFB_PUTPIXEL(100, 200, 0x5a5a); /* maps to row:0x3c, col:0x112, bank:0x1 */
         LFB_PUTPIXEL(66, 0, 0x0);
         LFB_PUTPIXEL(360, 360, 0xffff);
         sst1InitIdleFBI(sstbase);
         if((LFB_GETPIXEL(10, 10) == 0xdead) &&
            (LFB_GETPIXEL(100, 200) == 0x5a5a))
                 retval = 1;
+    ISET(sst->lfbMode, SST_LFB_565 | SST_LFB_WRITEFRONTBUFFER |
+        SST_LFB_READFRONTBUFFER);
+    sst1InitIdleFBI(sstbase);
+    LFB_PUTPIXEL(10, 10, 0xdead);   /* maps to row:0x0, col:0x145, bank:0x0 */
+    LFB_PUTPIXEL(8, 8, 0x0);
+    LFB_PUTPIXEL(340, 340, 0xffff);
+    LFB_PUTPIXEL(100, 200, 0x5a5a); /* maps to row:0x3c, col:0x112, bank:0x1 */
+    LFB_PUTPIXEL(66, 0, 0x0);
+    LFB_PUTPIXEL(360, 360, 0xffff);
+    sst1InitIdleFBI(sstbase);
+    if((LFB_GETPIXEL(10, 10) == 0xdead) &&
+       (LFB_GETPIXEL(100, 200) == 0x5a5a))
+        retval = 1;
 fbiMemSizeDone:
         /* Restore init registers to original state */
         ISET(sst->fbiInit0, init0Save);
         ISET(sst->fbiInit1, init1Save);
         ISET(sst->fbiInit2, init2Save);
         sst1InitIdleFBI(sstbase);
         return(retval);
+    /* Restore init registers to original state */
+    ISET(sst->fbiInit0, init0Save);
+    ISET(sst->fbiInit1, init1Save);
+    ISET(sst->fbiInit2, init2Save);
+    sst1InitIdleFBI(sstbase);
+    return(retval);
+}
 …
 sst1InitGetFbiInfo(FxU32 *sstbase, sst1DeviceInfoStruct *info)
+{
         volatile Sstregs *sst = (Sstregs *) sstbase;
+    volatile Sstregs *sst = (Sstregs *) sstbase;
     info->fbiMemSize = fbiMemSize(sstbase);
         /* Detect board identification and memory speed */
         if(GETENV(("SST_FBICFG")))
+    /* Detect board identification and memory speed */
+    if(GETENV(("SST_FBICFG")))
         SSCANF(GETENV(("SST_FBICFG")), "%i", &info->fbiConfig);
     else
                 info->fbiConfig = (IGET(sst->fbiInit3) & SST_FBI_MEM_TYPE) >>
                         SST_FBI_MEM_TYPE_SHIFT;
         info->fbiBoardID = (info->fbiConfig >> 2) & 0x1;
         /* fbiMemSpeed is legacy, and is not used by either Obsidian GE or Pro Fab */
         info->fbiMemSpeed = 0;
         /* Detect scanline interleaving */
         info->sstSliDetect = sst1InitSliDetect(sstbase);
+        info->fbiConfig = (IGET(sst->fbiInit3) & SST_FBI_MEM_TYPE) >>
+            SST_FBI_MEM_TYPE_SHIFT;
+    info->fbiBoardID = (info->fbiConfig >> 2) & 0x1;
+    /* fbiMemSpeed is legacy, and is not used by either Obsidian GE or Pro Fab */
+    info->fbiMemSpeed = 0;
+    /* Detect scanline interleaving */
+    info->sstSliDetect = sst1InitSliDetect(sstbase);
     return FXTRUE;
 …
     if(GETENV(("SST_NODEVICEINFO"))) {
         /* fill device info struct with sane values... */
         INIT_PRINTF(("sst1DeviceInfo: Filling info Struct with default values...\n"));
                 if(GETENV(("SST_FBICFG")))
                 SSCANF(GETENV(("SST_FBICFG")), "%i", &info->fbiConfig);
                 else
                 info->fbiConfig = 0x0;
                 if(GETENV(("SST_TMUCFG")))
                 SSCANF(GETENV(("SST_TMUCFG")), "%i", &info->tmuConfig);
                 else
                 info->tmuConfig = 0x0;
+        INIT_PRINTF(("sst1DeviceInfo: Filling info Struct with default values...\n"));
+        if(GETENV(("SST_FBICFG")))
+            SSCANF(GETENV(("SST_FBICFG")), "%i", &info->fbiConfig);
+        else
+            info->fbiConfig = 0x0;
+        if(GETENV(("SST_TMUCFG")))
+            SSCANF(GETENV(("SST_TMUCFG")), "%i", &info->tmuConfig);
+        else
+            info->tmuConfig = 0x0;
         info->numberTmus = 1;
         if (info->tmuConfig & FXBIT(6)) /* if TMU 1 exists */
                         info->numberTmus++;
             if (info->tmuConfig & FXBIT(13)) /* if TMU 2 exists */
                         info->numberTmus++;
         info->tmuRevision = info->tmuConfig & 0x7;
                 if(GETENV(("SST_FBIMEM_SIZE")))
                         info->fbiMemSize = ATOI(GETENV(("SST_FBIMEM_SIZE")));
                 else
                 info->fbiMemSize = 2;
                 if(GETENV(("SST_TMUMEM_SIZE")))
                         info->tmuMemSize[0] = ATOI(GETENV(("SST_TMUMEM_SIZE")));
                 else
                 info->tmuMemSize[0] = 2;
                 info->tmuMemSize[1] = info->tmuMemSize[0];
                 info->tmuMemSize[2] = info->tmuMemSize[0];
+        if (info->tmuConfig & FXBIT(6)) /* if TMU 1 exists */
+            info->numberTmus++;
+        if (info->tmuConfig & FXBIT(13)) /* if TMU 2 exists */
+            info->numberTmus++;
+        info->tmuRevision = info->tmuConfig & 0x7;
+        if(GETENV(("SST_FBIMEM_SIZE")))
+            info->fbiMemSize = ATOI(GETENV(("SST_FBIMEM_SIZE")));
+        else
+            info->fbiMemSize = 2;
+        if(GETENV(("SST_TMUMEM_SIZE")))
+            info->tmuMemSize[0] = ATOI(GETENV(("SST_TMUMEM_SIZE")));
+        else
+            info->tmuMemSize[0] = 2;
+        info->tmuMemSize[1] = info->tmuMemSize[0];
+        info->tmuMemSize[2] = info->tmuMemSize[0];
     } else {
                 int i;
                 for(i=0; i<5; i++) {
                         if(i)
                                 INIT_PRINTF(("sst1InitFillDeviceInfo(): Retry #%d for chip GetInfo()...\n", i));
                 /* GetFbiInfo() must be called before GetTmuInfo() */
                 if(sst1InitGetFbiInfo(sstbase, info) == FXFALSE)
                                 continue;
                 /* get the revision ID of each TMU and verify that they are all the
                            same */
                 if(sst1InitGetTmuInfo(sstbase, info) == FXFALSE)
                                 continue;
                         break;
+                }
                 if(i == 5)
                         return(FXFALSE);
+        int i;
+        for(i=0; i<5; i++) {
+            if(i)
+                INIT_PRINTF(("sst1InitFillDeviceInfo(): Retry #%d for chip GetInfo()...\n", i));
+            /* GetFbiInfo() must be called before GetTmuInfo() */
+            if(sst1InitGetFbiInfo(sstbase, info) == FXFALSE)
+                continue;
+            /* get the revision ID of each TMU and verify that they are all the
+               same */
+            if(sst1InitGetTmuInfo(sstbase, info) == FXFALSE)
+                continue;
+            break;
+        }
+        if(i == 5)
+            return(FXFALSE);
+    }
     INIT_PRINTF(("sst1DeviceInfo: Board ID: Obsidian %s\n",
 …
     if(sst1InitUseVoodooFile == FXTRUE) {
         if(iniDac == (sst1InitDacStruct *) NULL)
                         INIT_PRINTF(("sst1DeviceInfo: Dac Type: Unknown"));
                 else
+                INIT_PRINTF(("sst1DeviceInfo: Dac Type: %s %s\n",
                           iniDac->dacManufacturer, iniDac->dacDevice));
         } else {
             INIT_PRINTF(("sst1DeviceInfo: Dac Type: "));
             if(info->fbiDacType == SST_FBI_DACTYPE_ATT)
                 INIT_PRINTF(("AT&T ATT20C409\n"));
             else if(info->fbiDacType == SST_FBI_DACTYPE_ICS)
                 INIT_PRINTF(("ICS ICS5342\n"));
             else if(info->fbiDacType == SST_FBI_DACTYPE_TI)
                 INIT_PRINTF(("TI TVP3409\n"));
             else
                 INIT_PRINTF(("Unknown\n"));
+        }
+            INIT_PRINTF(("sst1DeviceInfo: Dac Type: Unknown"));
+        else
+            INIT_PRINTF(("sst1DeviceInfo: Dac Type: %s %s\n",
+              iniDac->dacManufacturer, iniDac->dacDevice));
+    } else {
+        INIT_PRINTF(("sst1DeviceInfo: Dac Type: "));
+        if(info->fbiDacType == SST_FBI_DACTYPE_ATT)
+            INIT_PRINTF(("AT&T ATT20C409\n"));
+        else if(info->fbiDacType == SST_FBI_DACTYPE_ICS)
+            INIT_PRINTF(("ICS ICS5342\n"));
+        else if(info->fbiDacType == SST_FBI_DACTYPE_TI)
+            INIT_PRINTF(("TI TVP3409\n"));
+        else
+            INIT_PRINTF(("Unknown\n"));
+    }
     INIT_PRINTF(("sst1DeviceInfo: SliDetect:%d\n", info->sstSliDetect));

trunk/src/opengl/glide/sst1/init/initvg/parse.c

-              r2885
+              r6653
+/* $Id: parse.c,v 1.2 2001-09-05 14:31:05 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:34 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:05 $
 **
 ** Parsing code for grabbing information from "voodoo.ini" initialization file
 …
     /* Override voodoo.ini name */
     strcpy(filename, getenv("VOODOO_FILE"));
     if (!(file = fopen(filename, "r")))
+    if (!(file = fopen(filename, "r")))
       goto __errExit;
   } else {
 …
     while(1) {
       if (!i) {
         if ((tmpPtr = strtok(path, ":")) == NULL)
           break;
+    if ((tmpPtr = strtok(path, ":")) == NULL)
+      break;
       } else {
         if ((tmpPtr = strtok(NULL, ":")) == NULL)
           break;
+    if ((tmpPtr = strtok(NULL, ":")) == NULL)
+      break;
+      }
       strcpy(filename, tmpPtr);
       if (filename[strlen(filename)-1] == '\\')
         sprintf(filename, "%voodoo", filename);
+    sprintf(filename, "%voodoo", filename);
       else
         sprintf(filename, "%s/voodoo", filename);
+    sprintf(filename, "%s/voodoo", filename);
       i++;
       if ((file = fopen(filename, "r")))
         break;
+    break;
+    }
+  }
 …
                 break;
+            }
             if(!(dacRdWrPtr->nextRdWr = malloc(sizeof(sst1InitDacRdWrStruct))))
+            if(!(dacRdWrPtr->nextRdWr = malloc(sizeof(sst1InitDacRdWrStruct))))
                 return(0);
 …
    * string table has been freed by the c runtime but has not been set
    * to NULL. Bad things happen if this memory has been unmapped by
    * the system or if the string cannot be found.
+   * the system or if the string cannot be found.
    */
+  {

trunk/src/opengl/glide/sst1/init/initvg/print.c

-              r2885
+              r6653
+/* $Id: print.c,v 1.2 2001-09-05 14:31:05 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:34 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:05 $
 **
 ** Print functions for SST-1 Initialization routines
 …
     if(firstPass == FXTRUE) {
         firstPass = FXFALSE;
         if (sst1InitMsgFile == NULL)
+        {
           /* I couldn't initialize to stdout because stdout is not constant */
           sst1InitMsgFile = stdout;
+        }
+    if (sst1InitMsgFile == NULL)
+    {
+      /* I couldn't initialize to stdout because stdout is not constant */
+      sst1InitMsgFile = stdout;
+    }
         if(GETENV(("SST_INITDEBUG")))
             printIt = FXTRUE;

trunk/src/opengl/glide/sst1/init/initvg/sli.c

-              r2885
+              r6653
+/* $Id: sli.c,v 1.2 2001-09-05 14:31:05 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:34 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:05 $
 **
 ** Initialization code for initializing scanline interleaving
 …
         PCICFG_RD(SST1_PCI_INIT_ENABLE, j);
         PCICFG_WR(SST1_PCI_INIT_ENABLE,
             (j | SST_SCANLINE_SLV_OWNPCI | SST_SCANLINE_SLI_SLV));
+            (j | SST_SCANLINE_SLV_OWNPCI | SST_SCANLINE_SLI_SLV));
         ISET(sstSlave->fbiInit1, IGET(sstSlave->fbiInit1) |
           (SST_VIDEO_RESET | SST_EN_SCANLINE_INTERLEAVE));
 …
             /* 16-bit Video Output */
             ISET(sstSlave->fbiInit1, (IGET(sstSlave->fbiInit1) &
                     ~(SST_VIDEO_VCLK_2X_OUTPUT_DEL | SST_VIDEO_VCLK_DEL)) |
+                    ~(SST_VIDEO_VCLK_2X_OUTPUT_DEL | SST_VIDEO_VCLK_DEL)) |
                 SST_EN_SCANLINE_INTERLEAVE |
                 /* SST_VIDEO_VID_CLK_SLAVE | */
 …
             ISET(sstSlave->fbiInit1, (IGET(sstSlave->fbiInit1) &
                     ~(SST_VIDEO_VCLK_2X_OUTPUT_DEL | SST_VIDEO_VCLK_DEL |
                       SST_VIDEO_VCLK_SEL | SST_VIDEO_VCLK_2X_INPUT_DEL)) |
+                      SST_VIDEO_VCLK_SEL | SST_VIDEO_VCLK_2X_INPUT_DEL)) |
                 SST_EN_SCANLINE_INTERLEAVE |
                 /* SST_VIDEO_VID_CLK_SLAVE | */
 …
         /* 16-bit Video Output */
         ISET(sstMaster->fbiInit1, (IGET(sstMaster->fbiInit1) &
                 ~(SST_VIDEO_VCLK_2X_OUTPUT_DEL | SST_VIDEO_VCLK_DEL)) |
+                ~(SST_VIDEO_VCLK_2X_OUTPUT_DEL | SST_VIDEO_VCLK_DEL)) |
             SST_EN_SCANLINE_INTERLEAVE |
             SST_VIDEO_VID_CLK_2X |
 …
         ISET(sstMaster->fbiInit1, (IGET(sstMaster->fbiInit1) &
                 ~(SST_VIDEO_VCLK_2X_OUTPUT_DEL | SST_VIDEO_VCLK_DEL |
                       SST_VIDEO_VCLK_SEL | SST_VIDEO_VCLK_2X_INPUT_DEL)) |
+                      SST_VIDEO_VCLK_SEL | SST_VIDEO_VCLK_2X_INPUT_DEL)) |
             SST_EN_SCANLINE_INTERLEAVE |
             SST_VIDEO_VID_CLK_2X |
 …
     PCICFG_RD(SST1_PCI_INIT_ENABLE, j);
     PCICFG_WR(SST1_PCI_INIT_ENABLE,
         (j & ~(SST_SCANLINE_SLV_OWNPCI | SST_SCANLINE_SLI_SLV)));
+        (j & ~(SST_SCANLINE_SLV_OWNPCI | SST_SCANLINE_SLI_SLV)));
     MasterPhysAddr = sst1CurrentBoard->physAddr;
     sst1InitReturnStatus(sstbase0); /* flush pci packer with reads */
 …
     PCICFG_RD(SST1_PCI_INIT_ENABLE, j);
     PCICFG_WR(SST1_PCI_INIT_ENABLE,
         ((j & ~(SST_SCANLINE_SLV_OWNPCI)) | SST_SCANLINE_SLI_SLV));
+        ((j & ~(SST_SCANLINE_SLV_OWNPCI)) | SST_SCANLINE_SLI_SLV));
     /* Map both boards to same Master physical address */
     PCICFG_WR(PCI_BASE_ADDRESS_0, MasterPhysAddr);
 …
             PCICFG_WR(SST1_PCI_INIT_ENABLE,
                 (j | SST_SCANLINE_SLV_OWNPCI | SST_SCANLINE_SLI_SLV |
                  SST_INITWR_EN | SST_PCI_FIFOWR_EN));
+                 SST_INITWR_EN | SST_PCI_FIFOWR_EN));
             PCICFG_RD(SST1_PCI_INIT_ENABLE, j); /* delay */
             ISET(sstSlave->fbiInit1, IGET(sstSlave->fbiInit1) &
 …
             PCICFG_RD(SST1_PCI_INIT_ENABLE, j);
             PCICFG_WR(SST1_PCI_INIT_ENABLE,
                 (j & ~(SST_SCANLINE_SLV_OWNPCI | SST_SCANLINE_SLI_SLV)));
+                (j & ~(SST_SCANLINE_SLV_OWNPCI | SST_SCANLINE_SLI_SLV)));
             PCICFG_RD(SST1_PCI_INIT_ENABLE, j); /* delay */
             sst1InitIdle((FxU32 *) sstSlave);

trunk/src/opengl/glide/sst1/init/initvg/sst1init.c

-              r2885
+              r6653
+/*
+/* $Id: sst1init.c,v 1.2 2001-09-05 14:31:06 bird Exp $ */
+/*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:35 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:06 $
 **
 */
 …
 ** NOTE: This code must compiled with optimizations DISABLED!!
 **
 ** The following environment variables can optionally be used to alter
+** The following environment variables can optionally be used to alter
 ** functionality (A value of X is a "don't care"):
 **
 …
                 &sst1InitDeviceNumber, j, 0);
 #else
             sst = pciMapCardMulti(vendorID, deviceID, sizeOfCard,
+            sst = pciMapCardMulti(vendorID, deviceID, sizeOfCard,
                 &sst1InitDeviceNumber, j, 0);
 #endif /* DIRECTX */
 …
     sst1InitReturnStatus(sstbase);
     sst1InitReturnStatus(sstbase);
     /* Adjust Fbi-to-Trex clock delay value */
     /* Adjust Trex-to-Fbi FIFO */
 …
             (tf2_clk_del<<SST_TEX_TF_CLK_DEL_ADJ_SHIFT);
+    }
     INIT_PRINTF(("sst1InitRegisters(): Storing TREX2INIT1=0x%x\n",
+    INIT_PRINTF(("sst1InitRegisters(): Storing TREX2INIT1=0x%x\n",
         sst1CurrentBoard->tmuInit1[2]));
 …
+    }
 #ifdef __DOS32__
     /*
+    /*
      * HACK alert. -MS
+     *
      * There's a pciClose(), but nobody calls it. This is needed by the
      * DOS DPMI services to close fxmemmap.vxd.
+     *
+     *
      * We need to move this to the "appropriate" place, wherever that may be.
      */
 …
             return(FXFALSE);
         sst1CurrentBoard->initGrxClkDone = 0;
         if((++n > 1) || !SliEnable)
             break;
 …
+}
 static FxU32
+static FxU32
   mtrr;
 …
 **
 */
 FX_EXPORT void FX_CSTYLE
+FX_EXPORT void FX_CSTYLE
 sst1InitCachingOn(void)
+{
   FxU32
+  FxU32
     physAddr;
   FxBool
 …
   else
     return;                   /* It's already there.  We're done. */
   if (res)
     pciSetMTRR(mtrr, physAddr, 0x1000000, PciMemTypeWriteCombining);

trunk/src/opengl/glide/sst1/init/initvg/util.c

-              r2885
+              r6653
+/* $Id: util.c,v 1.2 2001-09-05 14:31:06 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:35 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:06 $
 **
 ** Utility routines for SST-1 Initialization code
 …
     if(enable) {
         /* VGA controls monitor */
         ISET(sst->fbiInit0, (IGET(sst->fbiInit0) & ~SST_EN_VGA_PASSTHRU) |
+        ISET(sst->fbiInit0, (IGET(sst->fbiInit0) & ~SST_EN_VGA_PASSTHRU) |
             sst1CurrentBoard->vgaPassthruEnable);
         ISET(sst->fbiInit1, IGET(sst->fbiInit1) | SST_VIDEO_BLANK_EN);
     } else {
         /* SST-1 controls monitor */
         ISET(sst->fbiInit0, (IGET(sst->fbiInit0) & ~SST_EN_VGA_PASSTHRU) |
+        ISET(sst->fbiInit0, (IGET(sst->fbiInit0) & ~SST_EN_VGA_PASSTHRU) |
             sst1CurrentBoard->vgaPassthruDisable);
         ISET(sst->fbiInit1, IGET(sst->fbiInit1) & ~SST_VIDEO_BLANK_EN);

trunk/src/opengl/glide/sst1/init/initvg/video.c

-              r2885
+              r6653
+/* $Id: video.c,v 1.2 2001-09-05 14:31:07 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:35 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:07 $
 **
 ** Initialization code for initializing SST-1 video unit
 …
     /* Reset Video Refresh Unit */
     ISET(sst->fbiInit1, IGET(sst->fbiInit1) | SST_VIDEO_RESET);
     /* Enable video clock */
     if(SLI_DRIVEOK()) {
 …
     /* Setup SST memory mapper for desired resolution */
     if(sst1CurrentBoard->fbiMemSize == 4)
         sst1InitSetResolution(sstbase, sstVideoRez, 1);
+        sst1InitSetResolution(sstbase, sstVideoRez, 1);
     else
         sst1InitSetResolution(sstbase, sstVideoRez, 0);
+        sst1InitSetResolution(sstbase, sstVideoRez, 0);
     if((GETENV(("SST_TRIPLE_BUFFER"))) ||
 …
     if(sst1CurrentBoard->fbiMemSize == 1 && sstVideoRez->xDimension > 512)
         n = 0;
     if(n) {
         sst1CurrentBoard->fbiMemoryFifoEn = 1;
 …
     INIT_PRINTF(("sst1InitVideo(): Setting memory FIFO LWM to 0x%x (%d)\n",
                  sst1CurrentBoard->memFifoStatusLwm,
                  sst1CurrentBoard->memFifoStatusLwm));
+                 sst1CurrentBoard->memFifoStatusLwm));
     vInClkDel = 0;
 …
 **      Video Timing Structure
 */
 FX_EXPORT sst1VideoTimingStruct * FX_CSTYLE sst1InitFindVideoTimingStruct(GrScreenResolution_t screenResolution,
+FX_EXPORT sst1VideoTimingStruct * FX_CSTYLE sst1InitFindVideoTimingStruct(GrScreenResolution_t screenResolution,
                                                                           GrScreenRefresh_t screenRefresh)
+{
 …
 **
 */
 FX_EXPORT void FX_CSTYLE sst1InitSetResolution(FxU32 *sstbase,
+FX_EXPORT void FX_CSTYLE sst1InitSetResolution(FxU32 *sstbase,
     sst1VideoTimingStruct *sstVideoRez, FxU32 Banked)
+{
 …
 ** sst1InitSetTripleBuffering():
 **  Specify Video Triple Buffering
 **  NOTE: sst1InitSetTripleBuffering() must be called prior to calling
+**  NOTE: sst1InitSetTripleBuffering() must be called prior to calling
 **   sst1InitVideo() to properly setup Video Triple Buffering
 **

trunk/src/opengl/glide/sst1/init/vg96drvr.c

-              r2885
+              r6653
+/* $Id: vg96drvr.c,v 1.2 2001-09-05 14:31:00 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:27 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:00 $
 **
 */
 …
                         int                     *fbStride,
                         sst1VideoTimingStruct   *vidTimings) {
     return init96SetVideo( hWnd, sRes, vRefresh, cFormat, yOrigin,
+    return init96SetVideo( hWnd, sRes, vRefresh, cFormat, yOrigin,
                            nColBuffers, nAuxBuffers,
                            &context->info.regs,
 …
         init96Swap( code, &context->info.regs, context->writeMethod );
     return INIT_SWAP_FLIP;
+}
+}
 static FxU32 status( void ) {
   return *(context->info.regs.hwDep.VG96RegDesc.serialStatus);
+}
+}
 static FxBool busy(void) {
 …
   return rv;
+}
+}
 static void idle( void ) {
 …
     FxBool rv = FXFALSE;
     GDBG_INFO((80, "vg96drvr: control: code = %d\n", code));
     if (context)
+    if (context)
         rv = init96Control( code, &context->info.regs);
     return rv;
 …
     context->initGammaTable   = gammatable;
     context->findVidTimingStruct = findvidtiming;
+}
+}
 #else
 /* I've got to stub this one to get the Voodoo Graphics glide to link */
 …
     context->gammaRGB         = NULL;
     context->initGammaTable   = NULL;
     context->findVidTimingStruct = NULL;
+    context->findVidTimingStruct = NULL;
+}

trunk/src/opengl/glide/sst1/init/vgdrvr.c

-              r2885
+              r6653
+/* $Id: vgdrvr.c,v 1.2 2001-09-05 14:31:01 bird Exp $ */
 /*
 ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
 ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
 ** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
 ** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
 ** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
 ** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 ** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
 ** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
 **
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+**
 ** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
 ** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
 …
 ** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
 ** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
 ** THE UNITED STATES.
 **
+** THE UNITED STATES.
+**
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 **
 **
 ** $Revision: 1.1 $
 ** $Date: 2000-02-25 00:31:27 $
+** $Revision: 1.2 $
+** $Date: 2001-09-05 14:31:01 $
 **
 */
 …
     static int _w[] = {320,320,400,512,640,640,640,640,800,960,856,512};
     static int _h[] = {200,240,256,384,200,350,400,480,600,720,480,256};
     rv = sst1InitVideo( (FxU32*)context->info.hwDep.vgInfo.vgBaseAddr,
                         sRes,
                         vRefresh,
+                        vRefresh,
                         vidTimings );
 …
         rv = sst1InitVideo( (FxU32*)context->info.hwDep.vgInfo.slaveBaseAddr,
                             sRes,
                             vRefresh,
+                            vRefresh,
                             vidTimings );
         if ( !rv ) goto BAIL;
 …
     if ( info ) {
         rv = sst1InitGetDeviceInfo( (FxU32*)context->info.hwDep.vgInfo.vgBaseAddr,
+        rv = sst1InitGetDeviceInfo( (FxU32*)context->info.hwDep.vgInfo.vgBaseAddr,
                                     &sstInfo );
         info->hwDep.vgFIFOData.memFifoStatusLwm = sstInfo.memFifoStatusLwm;
 …
 static InitSwapType_t FX_CALL swapBuffers( FxU32 code ) {
     return INIT_SWAP_FLIP;
+}
+}
 static FxU32 FX_CALL status( void ) {
   return sst1InitReturnStatus((FxU32 *) context->info.hwDep.vgInfo.vgBaseAddr);
+}
+}
 static FxBool FX_CALL busy(void) {
   FxU32 stat = status();
   FxBool ret = (stat & SST_BUSY) ? FXTRUE : FXFALSE;
   return ret;
+}
+}
 static void FX_CALL idle( void ) {

Context Navigation

Legend:

trunk/src/opengl/glide/sst1/init/h3drvr.c

trunk/src/opengl/glide/sst1/init/init.c

trunk/src/opengl/glide/sst1/init/init96/dxdrvr.c

trunk/src/opengl/glide/sst1/init/init96/init96.c

trunk/src/opengl/glide/sst1/init/init96/initmcrx.c

trunk/src/opengl/glide/sst1/init/init96/lindrvr.c

trunk/src/opengl/glide/sst1/init/initvg/dac.c

trunk/src/opengl/glide/sst1/init/initvg/gamma.c

trunk/src/opengl/glide/sst1/init/initvg/gdebug.c

trunk/src/opengl/glide/sst1/init/initvg/info.c

trunk/src/opengl/glide/sst1/init/initvg/parse.c

trunk/src/opengl/glide/sst1/init/initvg/print.c

trunk/src/opengl/glide/sst1/init/initvg/sli.c

trunk/src/opengl/glide/sst1/init/initvg/sst1init.c

trunk/src/opengl/glide/sst1/init/initvg/util.c

trunk/src/opengl/glide/sst1/init/initvg/video.c

trunk/src/opengl/glide/sst1/init/vg96drvr.c

trunk/src/opengl/glide/sst1/init/vgdrvr.c

Download in other formats: