[packages/XFree86.git] / XFree86-sis-unresolved-symbols.patch

--- XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c.sis-unresolved-symbols	Mon Aug 26 08:02:32 2002
+++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c	Mon Aug 26 08:21:08 2002
@@ -296,6 +296,16 @@
     "VBEInit",
     "vbeDoEDID",
     "vbeFree",
+    "VBEGetVBEInfo",
+    "VBEFreeVBEInfo",
+    "VBESaveRestore",
+    "VBEGetVBEMode",
+    "VBESetVBEMode",
+    "VBESetGetLogicalScanlineLength",
+    "VBEGetModeInfo",
+    "VBEFreeModeInfo",
+    "VBESetDisplayStart",
+    "",
     NULL
 };
 
@@ -639,6 +649,7 @@
 
     if (flags & PROBE_DETECT) {
         if (xf86LoadSubModule(pScrn, "vbe")) {
+		xf86LoaderReqSymLists(vbeSymbols, NULL);
         	int index = xf86GetEntityInfo(pScrn->entityList[0])->index;
         	if ((pVbe = VBEInit(NULL,index))) {
             	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
@@ -1232,6 +1243,12 @@
     }
     
 #if 0
+/* Note: Dunno why this code is here, but I just noticed that the variable
+ * "ret" is not within scope of the above anonymous code block, and as such
+ * does not exist at this point in the code.  This code block should be moved
+ * into the anonymous block above to be within scope of ret, if it is ever
+ * removed from this #if 0 block.  Mike A. Harris <mharris@redhat.com>
+ */
     if (!ret && pSiS->ddc1Read)
         xf86SetDDCProperties(xf86PrintEDID(xf86DoEDID_DDC1(
              pScrn->scrnIndex,vgaHWddc1SetSpeed,pSiS->ddc1Read )));
Commit	Line	Data
fdd0813b	1	--- XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c.sis-unresolved-symbols Mon Aug 26 08:02:32 2002
	2	+++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c Mon Aug 26 08:21:08 2002
	3	@@ -296,6 +296,16 @@
	4	"VBEInit",
	5	"vbeDoEDID",
	6	"vbeFree",
	7	+ "VBEGetVBEInfo",
	8	+ "VBEFreeVBEInfo",
	9	+ "VBESaveRestore",
	10	+ "VBEGetVBEMode",
	11	+ "VBESetVBEMode",
	12	+ "VBESetGetLogicalScanlineLength",
	13	+ "VBEGetModeInfo",
	14	+ "VBEFreeModeInfo",
	15	+ "VBESetDisplayStart",
	16	+ "",
	17	NULL
	18	};
	19
	20	@@ -639,6 +649,7 @@
	21
	22	if (flags & PROBE_DETECT) {
	23	if (xf86LoadSubModule(pScrn, "vbe")) {
	24	+ xf86LoaderReqSymLists(vbeSymbols, NULL);
	25	int index = xf86GetEntityInfo(pScrn->entityList[0])->index;
	26	if ((pVbe = VBEInit(NULL,index))) {
	27	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
	28	@@ -1232,6 +1243,12 @@
	29	}
	30
	31	#if 0
	32	+/* Note: Dunno why this code is here, but I just noticed that the variable
	33	+ * "ret" is not within scope of the above anonymous code block, and as such
	34	+ * does not exist at this point in the code. This code block should be moved
	35	+ * into the anonymous block above to be within scope of ret, if it is ever
	36	+ * removed from this #if 0 block. Mike A. Harris <mharris@redhat.com>
	37	+ */
	38	if (!ret && pSiS->ddc1Read)
	39	xf86SetDDCProperties(xf86PrintEDID(xf86DoEDID_DDC1(
	40	pScrn->scrnIndex,vgaHWddc1SetSpeed,pSiS->ddc1Read )));