Glide_VG-C_brainos.patch

   1 --- Glide_VG-2.46/swlibs/fxpci/pcilib/fxpci.c.orig      2005-04-18 22:45:59.647024112 +0000
   2 +++ Glide_VG-2.46/swlibs/fxpci/pcilib/fxpci.c   2005-04-18 22:49:41.756258376 +0000
   3 @@ -1541,10 +1541,10 @@
   4
   5
   6  #ifdef __linux__
   7 +static FxBool pciOpen2();
   8
   9  FX_EXPORT FxBool FX_CSTYLE
  10  pciOpen( void ) {
  11 -  static FxBool pciOpen2();
  12    int deviceNumber;
  13
  14    if ( libraryInitialized ) return FXTRUE;
  15 --- Glide_VG-2.46/sst1/init/init96/init96.c~    1999-11-29 19:48:02.000000000 +0000
  16 +++ Glide_VG-2.46/sst1/init/init96/init96.c     2005-04-18 23:09:42.158769456 +0000
  17 @@ -660,6 +660,9 @@
  18    return(FXTRUE);
  19  }
  20
  21 +static void init96SetupRendering(InitRegisterDesc *regDesc,
  22 +                                                                GrScreenResolution_t sRes);
  23 +
  24  /*-------------------------------------------------------------------
  25    Function: init96MapBoard
  26    Date: 10/17
  27 @@ -759,8 +762,6 @@
  28    {
  29      FxBool rv=FXTRUE;
  30      GrScreenResolution_t    res = GR_RESOLUTION_640x480;
  31 -    static void init96SetupRendering(InitRegisterDesc *regDesc,
  32 -                                    GrScreenResolution_t sRes);
  33
  34      if (curHALData->initAperture)
  35        (*curHALData->initAperture)(regDesc);
  36 --- Glide_VG-2.46/sst1/glide/tests/display.c~   1999-11-29 19:48:23.000000000 +0000
  37 +++ Glide_VG-2.46/sst1/glide/tests/display.c    2005-04-18 23:11:49.442419400 +0000
  38 @@ -67,6 +67,11 @@
  39      "GR_LFB_SRC_FMT_ZA16      "
  40  };
  41
  42 +static void imageConvert( void *dst,
  43 +                                                 void *src,
  44 +                                                 GrLfbSrcFmt_t format,
  45 +                                                 FxU32 *bpp );
  46 +
  47
  48  void main( int argc, char **argv) {
  49      char match;
  50 @@ -92,11 +97,6 @@
  51      static FxU32 imageWidth;
  52      static FxU32 imageHeight;
  53
  54 -    static void imageConvert( void *dst,
  55 -                              void *src,
  56 -                              GrLfbSrcFmt_t format,
  57 -                              FxU32 *bpp );
  58 -
  59      srcfname[0] = 0;
  60      dstfname[0] = 0;
  61
  62 --- Glide_VG-2.46/sst1/init/init.c.orig 2005-04-18 23:25:31.088510208 +0000
  63 +++ Glide_VG-2.46/sst1/init/init.c      2005-04-18 23:30:01.885342832 +0000
  64 @@ -23,6 +23,7 @@
  65  **
  66  */
  67
  68 +#define ziew
  69
  70  #include "init.h"
  71  #include "fxinit.h"
  72 --- Glide_VG-2.46/swlibs/fxpci/pcilib/fxpci.h~  2005-04-18 23:22:15.372263600 +0000
  73 +++ Glide_VG-2.46/swlibs/fxpci/pcilib/fxpci.h   2005-04-18 23:30:11.195927408 +0000
  74 @@ -59,8 +59,10 @@
  75  } PciRegister;
  76
  77  #ifndef KERNEL
  78 +#ifndef ziew
  79  extern const PciRegister PCI_VENDOR_ID;
  80  extern const PciRegister PCI_DEVICE_ID;
  81 +#endif
  82  extern const PciRegister PCI_COMMAND;
  83  extern const PciRegister PCI_STATUS;
  84  extern const PciRegister PCI_REVISION_ID;
  85 --- Glide_VG-2.46/sst1/glide/tests/test26.c~    1999-11-29 19:48:23.000000000 +0000
  86 +++ Glide_VG-2.46/sst1/glide/tests/test26.c     2005-04-18 23:35:02.478645704 +0000
  87 @@ -59,6 +59,11 @@
  88    "GR_LFB_SRC_FMT_ZA16      "
  89  };
  90
  91 +static void imageConvert( void *dst,
  92 +                                                       void *src,
  93 +                            GrLfbSrcFmt_t format,
  94 +                            FxU32 *bpp );
  95 +
  96
  97  void main( int argc, char **argv) {
  98    char match;
  99 @@ -82,11 +87,6 @@
 100    static FxU32 imageWidth;
 101    static FxU32 imageHeight;
 102
 103 -  static void imageConvert( void *dst,
 104 -                            void *src,
 105 -                            GrLfbSrcFmt_t format,
 106 -                            FxU32 *bpp );
 107 -
 108    /* Process Command Line Arguments */
 109    while( rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs ) ) {
 110      if ( rv == -1 ) {