[packages/debrix.git] / debrix-modules.patch

diff -ur debrix/hw/xorg/common/Makefile.am debrix-new/hw/xorg/common/Makefile.am
--- debrix/hw/xorg/common/Makefile.am	2004-06-10 19:14:51.000000000 +0000
+++ debrix-new/hw/xorg/common/Makefile.am	2004-06-29 11:13:43.000000000 +0000
@@ -58,7 +58,7 @@
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../loader -I$(srcdir)/../ddc \
            -I$(srcdir)/../rac -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
            -I$(srcdir)/../i2c -I$(srcdir)/../parser -I$(srcdir)/../vgahw \
-           -I$(srcdir)/../scanpci -I$(top_srcdir)/Xi
+           -I$(srcdir)/../scanpci -I$(top_srcdir)/Xi -I$(srcdir)/..
 
 sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
                xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
diff -ur debrix/hw/xorg/common/xf86pciBus.c debrix-new/hw/xorg/common/xf86pciBus.c
--- debrix/hw/xorg/common/xf86pciBus.c	2004-06-10 19:40:04.000000000 +0000
+++ debrix-new/hw/xorg/common/xf86pciBus.c	2004-06-29 11:41:51.000000000 +0000
@@ -1709,25 +1709,12 @@
     /*
      * Initialise the pcidata entry points.
      */
-#ifdef XFree86LOADER
-    xf86SetupPciIds = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
-    xf86ClosePciIds = (ScanPciCloseProcPtr)LoaderSymbol("ScanPciClosePciIds");
-    xf86FindPciNamesByDevice =
-	(ScanPciFindByDeviceProcPtr)LoaderSymbol("ScanPciFindPciNamesByDevice");
-    xf86FindPciNamesBySubsys =
-	(ScanPciFindBySubsysProcPtr)LoaderSymbol("ScanPciFindPciNamesBySubsys");
-    xf86FindPciClassBySubsys =
-	(ScanPciFindClassBySubsysProcPtr)LoaderSymbol("ScanPciFindPciClassBySubsys");
-    xf86FindPciClassByDevice =
-	(ScanPciFindClassByDeviceProcPtr)LoaderSymbol("ScanPciFindPciClassByDevice");
-#else
     xf86SetupPciIds = ScanPciSetupPciIds;
     xf86ClosePciIds = ScanPciClosePciIds;
     xf86FindPciNamesByDevice = ScanPciFindPciNamesByDevice;
     xf86FindPciNamesBySubsys = ScanPciFindPciNamesBySubsys;
     xf86FindPciClassBySubsys = ScanPciFindPciClassBySubsys;
     xf86FindPciClassByDevice = ScanPciFindPciClassByDevice;
-#endif
 
     if (!xf86SetupPciIds())
 	FatalError("xf86SetupPciIds() failed\n");
diff -ur debrix/hw/xorg/ddc/Makefile.am debrix-new/hw/xorg/ddc/Makefile.am
--- debrix/hw/xorg/ddc/Makefile.am	2004-06-27 21:20:53.000000000 +0000
+++ debrix-new/hw/xorg/ddc/Makefile.am	2004-06-29 11:13:21.000000000 +0000
@@ -4,4 +4,4 @@
 libddc_a_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
                    interpret_vdif.c print_vdif.c ddcProperty.c
 
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
+INCLUDES = $(XORG_INCS) -I$(srcdir)/..
diff -ur debrix/hw/xorg/ddc/xf86DDC.h debrix-new/hw/xorg/ddc/xf86DDC.h
--- debrix/hw/xorg/ddc/xf86DDC.h	2004-06-10 19:40:12.000000000 +0000
+++ debrix-new/hw/xorg/ddc/xf86DDC.h	2004-06-29 11:13:21.000000000 +0000
@@ -18,7 +18,7 @@
 # define XF86_DDC_H
 
 #include "edid.h"
-#include "xf86i2c.h"
+#include "i2c/xf86i2c.h"
 #include "xf86str.h"
 
 /* speed up / slow down */
diff -ur debrix/hw/xorg/int10/Makefile.am debrix-new/hw/xorg/int10/Makefile.am
--- debrix/hw/xorg/int10/Makefile.am	2004-06-27 21:20:53.000000000 +0000
+++ debrix-new/hw/xorg/int10/Makefile.am	2004-06-29 11:41:12.000000000 +0000
@@ -3,7 +3,8 @@
 #ibxorgint10_a_SOURCES = stub.c
 
 libint10_a_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
-                     xf86int10.c generic.c xf86int10module.c
+                     xf86int10.c generic.c xf86int10module.c sys.c \
+                     xf86x86emu.c decode.c prim_ops.c ops.c ops2.c fpu.c
 
 # FIXME: i386/amd64-only (and Linux-only!!)
 AM_CFLAGS = -D_PC -D_VM86_LINUX
diff -ur debrix/hw/xorg/loader/Makefile.am debrix-new/hw/xorg/loader/Makefile.am
--- debrix/hw/xorg/loader/Makefile.am	2004-06-28 10:25:18.000000000 +0000
+++ debrix-new/hw/xorg/loader/Makefile.am	2004-06-29 11:13:45.000000000 +0000
@@ -1,8 +1,6 @@
 noinst_LIBRARIES = libloader.a
 AM_CFLAGS = $(XORG_CFLAGS) -DDLOPEN_SUPPORT -DHAS_SHM -DXFree86LOADER
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
-           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
-           -I$(srcdir)/../fbdevhw -I$(srcdir)/../xaa
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/..
 
 libloader_a_SOURCES = \
         dlloader.c \
diff -ur debrix/hw/xorg/loader/xf86sym.c debrix-new/hw/xorg/loader/xf86sym.c
--- debrix/hw/xorg/loader/xf86sym.c	2004-06-28 10:25:18.000000000 +0000
+++ debrix-new/hw/xorg/loader/xf86sym.c	2004-06-29 11:13:45.000000000 +0000
@@ -77,17 +77,22 @@
 #include "xf86xvmc.h"
 #include "xf86cmap.h"
 #include "xf86fbman.h"
-#include "fbdevhw.h"
+#include "fbdevhw/fbdevhw.h"
+#include "vgahw/vgaHW.h"
+#include "int10/xf86int10.h"
+#include "i2c/xf86i2c.h"
+#include "ddc/xf86DDC.h"
+#include "ramdac/xf86Cursor.h"
 #include "dgaproc.h"
 #include "dpmsproc.h"
 #include "vidmodeproc.h"
 #include "xf86miscproc.h"
 #include "loader.h"
-#include "xaarop.h"
+#include "xaa/xaarop.h"
 #define DONT_DEFINE_WRAPPERS
 #include "xf86_ansic.h"
 #include "xisb.h"
-#include "vbe.h"
+#include "vbe/vbe.h"
 #ifndef __OpenBSD__
 #include "xf86sbusBus.h"
 #endif
@@ -1158,6 +1163,27 @@
     /* fbdevhw.c */
     SYMVAR(fbdevHWValidMode)
 
+    /* vgaHW.c */
+    SYMVAR(vgaHWInit)
+
+    /* ini10 */ 
+    SYMVAR(xf86int10Addr)
+
+    /* xf86i2c.c */
+    SYMVAR(xf86CreateI2CBusRec)
+
+    /* vbe.c */
+    SYMVAR(VBEInit)
+
+    /* xf86DDC.c */
+    SYMVAR(xf86DoEDID_DDC2)
+
+    /* print_edid.c */
+    SYMVAR(xf86PrintEDID)
+
+    /* xf86Cursor.c */
+    SYMVAR(xf86InitCursor)
+
     /* xaa */
     SYMVAR(XAACopyROP)
 
diff -ur debrix/hw/xorg/vbe/Makefile.am debrix-new/hw/xorg/vbe/Makefile.am
--- debrix/hw/xorg/vbe/Makefile.am	2004-06-27 21:20:53.000000000 +0000
+++ debrix-new/hw/xorg/vbe/Makefile.am	2004-06-29 11:13:22.000000000 +0000
@@ -1,6 +1,5 @@
 noinst_LIBRARIES = libvbe.a
 libvbe_a_SOURCES = vbe.c vbeModes.c vbe_module.c
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-          -I$(srcdir)/../int10
+INCLUDES = $(XORG_INCS) -I$(srcdir)/..
 
 sdk_HEADERS = vbe.h vbeModes.h
diff -ur debrix/hw/xorg/vbe/vbe.h debrix-new/hw/xorg/vbe/vbe.h
--- debrix/hw/xorg/vbe/vbe.h	2004-06-10 19:41:27.000000000 +0000
+++ debrix-new/hw/xorg/vbe/vbe.h	2004-06-29 11:13:22.000000000 +0000
@@ -15,8 +15,8 @@
 #endif
 #ifndef _VBE_H
 #define _VBE_H
-#include "xf86int10.h"
-#include "xf86DDC.h"
+#include "int10/xf86int10.h"
+#include "ddc/xf86DDC.h"
 
 typedef enum {
     DDC_UNCHECKED,
diff -ur debrix/hw/xorg/vgahw/Makefile.am debrix-new/hw/xorg/vgahw/Makefile.am
--- debrix/hw/xorg/vgahw/Makefile.am	2004-06-27 21:20:54.000000000 +0000
+++ debrix-new/hw/xorg/vgahw/Makefile.am	2004-06-29 11:13:35.000000000 +0000
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = libvgahw.a
 libvgahw_a_SOURCES = vgaHW.c vgaHWmodule.c
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
+INCLUDES = $(XORG_INCS) -I$(srcdir)/..
 
 sdk_HEADERS = vgaHW.h
diff -ur debrix/hw/xorg/vgahw/vgaHW.h debrix-new/hw/xorg/vgahw/vgaHW.h
--- debrix/hw/xorg/vgahw/vgaHW.h	2004-06-10 19:41:30.000000000 +0000
+++ debrix-new/hw/xorg/vgahw/vgaHW.h	2004-06-29 11:13:35.000000000 +0000
@@ -26,7 +26,7 @@
 #include "xf86str.h"
 #include "xf86Pci.h"
 
-#include "xf86DDC.h"
+#include "ddc/xf86DDC.h"
 
 #include "globals.h"
 #define DPMS_SERVER
Commit	Line	Data
55bcf99d	1	diff -ur debrix/hw/xorg/common/Makefile.am debrix-new/hw/xorg/common/Makefile.am
	2	--- debrix/hw/xorg/common/Makefile.am 2004-06-10 19:14:51.000000000 +0000
	3	+++ debrix-new/hw/xorg/common/Makefile.am 2004-06-29 11:13:43.000000000 +0000
	4	@@ -58,7 +58,7 @@
	5	INCLUDES = $(XORG_INCS) -I$(srcdir)/../loader -I$(srcdir)/../ddc \
	6	-I$(srcdir)/../rac -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
	7	-I$(srcdir)/../i2c -I$(srcdir)/../parser -I$(srcdir)/../vgahw \
	8	- -I$(srcdir)/../scanpci -I$(top_srcdir)/Xi
	9	+ -I$(srcdir)/../scanpci -I$(top_srcdir)/Xi -I$(srcdir)/..
95c3dc12	10
55bcf99d	11	sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
	12	xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
	13	diff -ur debrix/hw/xorg/common/xf86pciBus.c debrix-new/hw/xorg/common/xf86pciBus.c
	14	--- debrix/hw/xorg/common/xf86pciBus.c 2004-06-10 19:40:04.000000000 +0000
	15	+++ debrix-new/hw/xorg/common/xf86pciBus.c 2004-06-29 11:41:51.000000000 +0000
95c3dc12	16	@@ -1709,25 +1709,12 @@
	17	/*
	18	* Initialise the pcidata entry points.
	19	*/
	20	-#ifdef XFree86LOADER
	21	- xf86SetupPciIds = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
	22	- xf86ClosePciIds = (ScanPciCloseProcPtr)LoaderSymbol("ScanPciClosePciIds");
	23	- xf86FindPciNamesByDevice =
	24	- (ScanPciFindByDeviceProcPtr)LoaderSymbol("ScanPciFindPciNamesByDevice");
	25	- xf86FindPciNamesBySubsys =
	26	- (ScanPciFindBySubsysProcPtr)LoaderSymbol("ScanPciFindPciNamesBySubsys");
	27	- xf86FindPciClassBySubsys =
	28	- (ScanPciFindClassBySubsysProcPtr)LoaderSymbol("ScanPciFindPciClassBySubsys");
	29	- xf86FindPciClassByDevice =
	30	- (ScanPciFindClassByDeviceProcPtr)LoaderSymbol("ScanPciFindPciClassByDevice");
	31	-#else
	32	xf86SetupPciIds = ScanPciSetupPciIds;
	33	xf86ClosePciIds = ScanPciClosePciIds;
	34	xf86FindPciNamesByDevice = ScanPciFindPciNamesByDevice;
	35	xf86FindPciNamesBySubsys = ScanPciFindPciNamesBySubsys;
	36	xf86FindPciClassBySubsys = ScanPciFindPciClassBySubsys;
	37	xf86FindPciClassByDevice = ScanPciFindPciClassByDevice;
	38	-#endif
	39
	40	if (!xf86SetupPciIds())
	41	FatalError("xf86SetupPciIds() failed\n");
55bcf99d	42	diff -ur debrix/hw/xorg/ddc/Makefile.am debrix-new/hw/xorg/ddc/Makefile.am
	43	--- debrix/hw/xorg/ddc/Makefile.am 2004-06-27 21:20:53.000000000 +0000
	44	+++ debrix-new/hw/xorg/ddc/Makefile.am 2004-06-29 11:13:21.000000000 +0000
	45	@@ -4,4 +4,4 @@
	46	libddc_a_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
	47	interpret_vdif.c print_vdif.c ddcProperty.c
	48
	49	-INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
	50	+INCLUDES = $(XORG_INCS) -I$(srcdir)/..
	51	diff -ur debrix/hw/xorg/ddc/xf86DDC.h debrix-new/hw/xorg/ddc/xf86DDC.h
	52	--- debrix/hw/xorg/ddc/xf86DDC.h 2004-06-10 19:40:12.000000000 +0000
	53	+++ debrix-new/hw/xorg/ddc/xf86DDC.h 2004-06-29 11:13:21.000000000 +0000
	54	@@ -18,7 +18,7 @@
	55	# define XF86_DDC_H
	56
	57	#include "edid.h"
	58	-#include "xf86i2c.h"
	59	+#include "i2c/xf86i2c.h"
	60	#include "xf86str.h"
	61
	62	/* speed up / slow down */
	63	diff -ur debrix/hw/xorg/int10/Makefile.am debrix-new/hw/xorg/int10/Makefile.am
	64	--- debrix/hw/xorg/int10/Makefile.am 2004-06-27 21:20:53.000000000 +0000
	65	+++ debrix-new/hw/xorg/int10/Makefile.am 2004-06-29 11:41:12.000000000 +0000
95c3dc12	66	@@ -3,7 +3,8 @@
	67	#ibxorgint10_a_SOURCES = stub.c
	68
	69	libint10_a_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
	70	- xf86int10.c generic.c xf86int10module.c
	71	+ xf86int10.c generic.c xf86int10module.c sys.c \
55bcf99d	72	+ xf86x86emu.c decode.c prim_ops.c ops.c ops2.c fpu.c
95c3dc12	73
	74	# FIXME: i386/amd64-only (and Linux-only!!)
	75	AM_CFLAGS = -D_PC -D_VM86_LINUX
55bcf99d	76	diff -ur debrix/hw/xorg/loader/Makefile.am debrix-new/hw/xorg/loader/Makefile.am
	77	--- debrix/hw/xorg/loader/Makefile.am 2004-06-28 10:25:18.000000000 +0000
	78	+++ debrix-new/hw/xorg/loader/Makefile.am 2004-06-29 11:13:45.000000000 +0000
	79	@@ -1,8 +1,6 @@
	80	noinst_LIBRARIES = libloader.a
	81	AM_CFLAGS = $(XORG_CFLAGS) -DDLOPEN_SUPPORT -DHAS_SHM -DXFree86LOADER
	82	-INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
	83	- -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
	84	- -I$(srcdir)/../fbdevhw -I$(srcdir)/../xaa
	85	+INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/..
	86
	87	libloader_a_SOURCES = \
	88	dlloader.c \
	89	diff -ur debrix/hw/xorg/loader/xf86sym.c debrix-new/hw/xorg/loader/xf86sym.c
	90	--- debrix/hw/xorg/loader/xf86sym.c 2004-06-28 10:25:18.000000000 +0000
	91	+++ debrix-new/hw/xorg/loader/xf86sym.c 2004-06-29 11:13:45.000000000 +0000
	92	@@ -77,17 +77,22 @@
	93	#include "xf86xvmc.h"
	94	#include "xf86cmap.h"
	95	#include "xf86fbman.h"
	96	-#include "fbdevhw.h"
	97	+#include "fbdevhw/fbdevhw.h"
	98	+#include "vgahw/vgaHW.h"
	99	+#include "int10/xf86int10.h"
	100	+#include "i2c/xf86i2c.h"
	101	+#include "ddc/xf86DDC.h"
	102	+#include "ramdac/xf86Cursor.h"
	103	#include "dgaproc.h"
	104	#include "dpmsproc.h"
	105	#include "vidmodeproc.h"
	106	#include "xf86miscproc.h"
	107	#include "loader.h"
	108	-#include "xaarop.h"
	109	+#include "xaa/xaarop.h"
	110	#define DONT_DEFINE_WRAPPERS
	111	#include "xf86_ansic.h"
	112	#include "xisb.h"
	113	-#include "vbe.h"
	114	+#include "vbe/vbe.h"
	115	#ifndef __OpenBSD__
	116	#include "xf86sbusBus.h"
	117	#endif
	118	@@ -1158,6 +1163,27 @@
	119	/* fbdevhw.c */
	120	SYMVAR(fbdevHWValidMode)
	121
	122	+ /* vgaHW.c */
	123	+ SYMVAR(vgaHWInit)
	124	+
	125	+ /* ini10 */
	126	+ SYMVAR(xf86int10Addr)
	127	+
	128	+ /* xf86i2c.c */
	129	+ SYMVAR(xf86CreateI2CBusRec)
	130	+
	131	+ /* vbe.c */
	132	+ SYMVAR(VBEInit)
	133	+
	134	+ /* xf86DDC.c */
	135	+ SYMVAR(xf86DoEDID_DDC2)
	136	+
	137	+ /* print_edid.c */
	138	+ SYMVAR(xf86PrintEDID)
	139	+
140	+ /* xf86Cursor.c */
141	+ SYMVAR(xf86InitCursor)
142	+
143	/* xaa */
144	SYMVAR(XAACopyROP)
145
146	diff -ur debrix/hw/xorg/vbe/Makefile.am debrix-new/hw/xorg/vbe/Makefile.am
147	--- debrix/hw/xorg/vbe/Makefile.am 2004-06-27 21:20:53.000000000 +0000
148	+++ debrix-new/hw/xorg/vbe/Makefile.am 2004-06-29 11:13:22.000000000 +0000
149	@@ -1,6 +1,5 @@
150	noinst_LIBRARIES = libvbe.a
151	libvbe_a_SOURCES = vbe.c vbeModes.c vbe_module.c
152	-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
153	- -I$(srcdir)/../int10
154	+INCLUDES = $(XORG_INCS) -I$(srcdir)/..
155
156	sdk_HEADERS = vbe.h vbeModes.h
157	diff -ur debrix/hw/xorg/vbe/vbe.h debrix-new/hw/xorg/vbe/vbe.h
158	--- debrix/hw/xorg/vbe/vbe.h 2004-06-10 19:41:27.000000000 +0000
159	+++ debrix-new/hw/xorg/vbe/vbe.h 2004-06-29 11:13:22.000000000 +0000
160	@@ -15,8 +15,8 @@
161	#endif
162	#ifndef _VBE_H
163	#define _VBE_H
164	-#include "xf86int10.h"
165	-#include "xf86DDC.h"
166	+#include "int10/xf86int10.h"
167	+#include "ddc/xf86DDC.h"
168
169	typedef enum {
170	DDC_UNCHECKED,
171	diff -ur debrix/hw/xorg/vgahw/Makefile.am debrix-new/hw/xorg/vgahw/Makefile.am
172	--- debrix/hw/xorg/vgahw/Makefile.am 2004-06-27 21:20:54.000000000 +0000
173	+++ debrix-new/hw/xorg/vgahw/Makefile.am 2004-06-29 11:13:35.000000000 +0000
174	@@ -1,5 +1,5 @@
175	noinst_LIBRARIES = libvgahw.a
176	libvgahw_a_SOURCES = vgaHW.c vgaHWmodule.c
177	-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
178	+INCLUDES = $(XORG_INCS) -I$(srcdir)/..
179
180	sdk_HEADERS = vgaHW.h
181	diff -ur debrix/hw/xorg/vgahw/vgaHW.h debrix-new/hw/xorg/vgahw/vgaHW.h
182	--- debrix/hw/xorg/vgahw/vgaHW.h 2004-06-10 19:41:30.000000000 +0000
183	+++ debrix-new/hw/xorg/vgahw/vgaHW.h 2004-06-29 11:13:35.000000000 +0000
184	@@ -26,7 +26,7 @@
185	#include "xf86str.h"
186	#include "xf86Pci.h"
187
188	-#include "xf86DDC.h"
189	+#include "ddc/xf86DDC.h"
190
191	#include "globals.h"
192	#define DPMS_SERVER