debrix-modules.patch

   1 Index: hw/xorg/loader/Makefile.am
   2 ===================================================================
   3 RCS file: /cvs/xserver/debrix/hw/xorg/loader/Makefile.am,v
   4 retrieving revision 1.3
   5 diff -u -r1.3 Makefile.am
   6 --- hw/xorg/loader/Makefile.am  28 Jun 2004 05:02:25 -0000      1.3
   7 +++ hw/xorg/loader/Makefile.am  29 Jun 2004 01:18:59 -0000
   8 @@ -1,8 +1,9 @@
   9  noinst_LIBRARIES = libloader.a
  10  AM_CFLAGS = $(XORG_CFLAGS) -DDLOPEN_SUPPORT -DHAS_SHM -DXFree86LOADER
  11  INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
  12 -           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
  13 -           -I$(srcdir)/../fbdevhw -I$(srcdir)/../xaa
  14 +          -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
  15 +          -I$(srcdir)/../fbdevhw -I$(srcdir)/../vgahw \
  16 +          -I$(srcdir)/../xaa -I$(srcdir)/../int10
  17
  18  libloader_a_SOURCES = \
  19          dlloader.c \
  20 Index: hw/xorg/loader/xf86sym.c
  21 ===================================================================
  22 RCS file: /cvs/xserver/debrix/hw/xorg/loader/xf86sym.c,v
  23 retrieving revision 1.3
  24 diff -u -r1.3 xf86sym.c
  25 --- hw/xorg/loader/xf86sym.c    28 Jun 2004 00:46:33 -0000      1.3
  26 +++ hw/xorg/loader/xf86sym.c    29 Jun 2004 01:18:59 -0000
  27 @@ -78,6 +78,9 @@
  28  #include "xf86cmap.h"
  29  #include "xf86fbman.h"
  30  #include "fbdevhw.h"
  31 +#include "vgaHW.h"
  32 +#include "xf86int10.h"
  33 +#include "xf86i2c.h"
  34  #include "dgaproc.h"
  35  #include "dpmsproc.h"
  36  #include "vidmodeproc.h"
  37 @@ -1158,6 +1161,15 @@
  38      /* fbdevhw.c */
  39      SYMVAR(fbdevHWValidMode)
  40
  41 +    /* vgaHW.c */
  42 +    SYMVAR(vgaHWInit)
  43 +
  44 +    /* int10 */
  45 +    SYMVAR(xf86InitInt10)
  46 +
  47 +    /* xf86i2c.c */
  48 +    SYMVAR(xf86CreateI2CBusRec)
  49 +
  50      /* xaa */
  51      SYMVAR(XAACopyROP)
  52
  53 Index: hw/xorg/common/xf86Init.c
  54 ===================================================================
  55 RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Init.c,v
  56 retrieving revision 1.3
  57 diff -u -r1.3 xf86Init.c
  58 --- hw/xorg/common/xf86Init.c   10 Jun 2004 19:40:04 -0000      1.3
  59 +++ hw/xorg/common/xf86Init.c   29 Jun 2004 01:19:00 -0000
  60 @@ -117,8 +117,8 @@
  61  static char *baseModules[] = {
  62  #if 0 /* XXX DS */
  63         "bitmap",
  64 -#endif
  65         "pcidata",
  66 +#endif
  67         NULL
  68  };
  69  #endif
  70 Index: hw/xorg/common/xf86pciBus.c
  71 ===================================================================
  72 RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86pciBus.c,v
  73 retrieving revision 1.3
  74 diff -u -r1.3 xf86pciBus.c
  75 --- hw/xorg/common/xf86pciBus.c 10 Jun 2004 19:40:04 -0000      1.3
  76 +++ hw/xorg/common/xf86pciBus.c 29 Jun 2004 01:19:02 -0000
  77 @@ -1709,25 +1709,12 @@
  78      /*
  79       * Initialise the pcidata entry points.
  80       */
  81 -#ifdef XFree86LOADER
  82 -    xf86SetupPciIds = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
  83 -    xf86ClosePciIds = (ScanPciCloseProcPtr)LoaderSymbol("ScanPciClosePciIds");
  84 -    xf86FindPciNamesByDevice =
  85 -       (ScanPciFindByDeviceProcPtr)LoaderSymbol("ScanPciFindPciNamesByDevice");
  86 -    xf86FindPciNamesBySubsys =
  87 -       (ScanPciFindBySubsysProcPtr)LoaderSymbol("ScanPciFindPciNamesBySubsys");
  88 -    xf86FindPciClassBySubsys =
  89 -       (ScanPciFindClassBySubsysProcPtr)LoaderSymbol("ScanPciFindPciClassBySubsys");
  90 -    xf86FindPciClassByDevice =
  91 -       (ScanPciFindClassByDeviceProcPtr)LoaderSymbol("ScanPciFindPciClassByDevice");
  92 -#else
  93      xf86SetupPciIds = ScanPciSetupPciIds;
  94      xf86ClosePciIds = ScanPciClosePciIds;
  95      xf86FindPciNamesByDevice = ScanPciFindPciNamesByDevice;
  96      xf86FindPciNamesBySubsys = ScanPciFindPciNamesBySubsys;
  97      xf86FindPciClassBySubsys = ScanPciFindPciClassBySubsys;
  98      xf86FindPciClassByDevice = ScanPciFindPciClassByDevice;
  99 -#endif
 100
 101      if (!xf86SetupPciIds())
 102         FatalError("xf86SetupPciIds() failed\n");
 103 Index: hw/xorg/int10/Makefile.am
 104 ===================================================================
 105 RCS file: /cvs/xserver/debrix/hw/xorg/int10/Makefile.am,v
 106 retrieving revision 1.3
 107 diff -u -r1.3 Makefile.am
 108 --- hw/xorg/int10/Makefile.am   27 Jun 2004 20:58:25 -0000      1.3
 109 +++ hw/xorg/int10/Makefile.am   29 Jun 2004 01:19:02 -0000
 110 @@ -3,7 +3,8 @@
 111  #ibxorgint10_a_SOURCES = stub.c
 112
 113  libint10_a_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
 114 -                     xf86int10.c generic.c xf86int10module.c
 115 +                     xf86int10.c generic.c xf86int10module.c sys.c \
 116 +                    xf86x86emu.c decode.c prim_ops.c ops.c ops2.c fpu.c
 117
 118  # FIXME: i386/amd64-only (and Linux-only!!)
 119  AM_CFLAGS = -D_PC -D_VM86_LINUX