Attachment #88027 for bug #110506

Lines 62-67 Link Here

(-)src/atiprobe.c.orig (+11 lines)
62	* largely ignored.	62	* largely ignored.
63	*/	63	*/
64		64
		65	#ifdef XFree86LOADER
		66	typedef void (*ATIFillInScreenInfoFn)(ScrnInfoPtr);
		67	ATIFillInScreenInfoFn ATIFillInScreenInfoPtr = NULL;
		68	#endif
		69
65	/* Used as a temporary buffer */	70	/* Used as a temporary buffer */
66	#define Identifier ((char *)(pATI->MMIOCache))	71	#define Identifier ((char *)(pATI->MMIOCache))
67		72
Lines 2279-2284 Link Here
2279		2284
2280	xf86LoaderReqSymLists(ATISymbols, NULL);	2285	xf86LoaderReqSymLists(ATISymbols, NULL);
2281		2286
		2287	ATIFillInScreenInfoPtr = (ATIFillInScreenInfoFn)LoaderSymbol("ATIFilInScreenInfo");
		2288
2282	#endif	2289	#endif
2283		2290
2284	/* Attach device to screen */	2291	/* Attach device to screen */
Lines 2287-2293 Link Here
2287	ATIPtrs[j - 1] = NULL;	2294	ATIPtrs[j - 1] = NULL;
2288		2295
2289	/* Fill in probe data */	2296	/* Fill in probe data */
		2297	#ifdef XFree86LOADER
		2298	(*ATIFillInScreenInfoPtr)(pScreenInfo);
		2299	#else
2290	ATIFillInScreenInfo(pScreenInfo);	2300	ATIFillInScreenInfo(pScreenInfo);
		2301	#endif
2291		2302
2292	pScreenInfo->driverPrivate = pATI;	2303	pScreenInfo->driverPrivate = pATI;
2293		2304

Lines 53-58 Link Here

(-)src/r128_probe.c.orig (+17 lines)
53		53
54	#include "r128_chipset.h"	54	#include "r128_chipset.h"
55		55
		56	#ifdef XFree86LOADER
		57	typedef void (*R128FillInScreenInfoFn)(ScrnInfoPtr);
		58	typedef const OptionInfoRec (R128OptionsWeakFn)(void);
		59	static R128FillInScreenInfoFn R128FillInScreenInfoPtr = NULL;
		60	static R128OptionsWeakFn R128OptionsWeakPtr = NULL;
		61	#endif
		62
56	PciChipsets R128PciChipsets[] = {	63	PciChipsets R128PciChipsets[] = {
57	{ PCI_CHIP_RAGE128LE, PCI_CHIP_RAGE128LE, RES_SHARED_VGA },	64	{ PCI_CHIP_RAGE128LE, PCI_CHIP_RAGE128LE, RES_SHARED_VGA },
58	{ PCI_CHIP_RAGE128LF, PCI_CHIP_RAGE128LF, RES_SHARED_VGA },	65	{ PCI_CHIP_RAGE128LF, PCI_CHIP_RAGE128LF, RES_SHARED_VGA },
Lines 120-126 Link Here
120	chipid -= PCI_VENDOR_ATI << 16;	127	chipid -= PCI_VENDOR_ATI << 16;
121	for (i = 0; R128PciChipsets[i].PCIid > 0; i++) {	128	for (i = 0; R128PciChipsets[i].PCIid > 0; i++) {
122	if (chipid == R128PciChipsets[i].PCIid)	129	if (chipid == R128PciChipsets[i].PCIid)
		130	#ifdef XFree86LOADER
		131	return (*R128OptionsWeakPtr)();
		132	#else
123	return R128OptionsWeak();	133	return R128OptionsWeak();
		134	#endif
124	}	135	}
125	return NULL;	136	return NULL;
126	}	137	}
Lines 206-215 Link Here
206		217
207	xf86LoaderReqSymLists(R128Symbols, NULL);	218	xf86LoaderReqSymLists(R128Symbols, NULL);
208		219
		220	R128FillInScreenInfoPtr = (R128FillInScreenInfoFn)LoaderSymbol("R128FillInScreenInfo");
		221	R128OptionsWeakPtr = (R128OptionsWeakFn)LoaderSymbol("R128OptionsWeak");
209	#endif	222	#endif
210		223
211	pScrn->Probe = R128Probe;	224	pScrn->Probe = R128Probe;
		225	#ifdef XFree86LOADER
		226	(*R128FillInScreenInfoPtr)(pScrn);
		227	#else
212	R128FillInScreenInfo(pScrn);	228	R128FillInScreenInfo(pScrn);
		229	#endif
213		230
214	foundScreen = TRUE;	231	foundScreen = TRUE;
215		232

Lines 54-59 Link Here

(-)src/radeon_probe.c.orig (+18 lines)
54		54
55	#include "radeon_chipset.h"	55	#include "radeon_chipset.h"
56		56
		57	#ifdef XFree86LOADER
		58	typedef void (*RADEONFillInScreenInfoFn)(ScrnInfoPtr);
		59	typedef const OptionInfoRec (RADEONOptionsWeakFn)(void);
		60	static RADEONFillInScreenInfoFn RADEONFillInScreenInfoPtr = NULL;
		61	static RADEONOptionsWeakFn RADEONOptionsWeakPtr = NULL;
		62	#endif
		63
57	PciChipsets RADEONPciChipsets[] = {	64	PciChipsets RADEONPciChipsets[] = {
58	{ PCI_CHIP_RADEON_QD, PCI_CHIP_RADEON_QD, RES_SHARED_VGA },	65	{ PCI_CHIP_RADEON_QD, PCI_CHIP_RADEON_QD, RES_SHARED_VGA },
59	{ PCI_CHIP_RADEON_QE, PCI_CHIP_RADEON_QE, RES_SHARED_VGA },	66	{ PCI_CHIP_RADEON_QE, PCI_CHIP_RADEON_QE, RES_SHARED_VGA },
Lines 213-219 Link Here
213	chipid -= PCI_VENDOR_ATI << 16;	220	chipid -= PCI_VENDOR_ATI << 16;
214	for (i = 0; RADEONPciChipsets[i].PCIid > 0; i++) {	221	for (i = 0; RADEONPciChipsets[i].PCIid > 0; i++) {
215	if (chipid == RADEONPciChipsets[i].PCIid)	222	if (chipid == RADEONPciChipsets[i].PCIid)
		223	#ifdef XFree86LOADER
		224	return (*RADEONOptionsWeakPtr)();
		225	#else
216	return RADEONOptionsWeak();	226	return RADEONOptionsWeak();
		227	#endif
217	}	228	}
218	return NULL;	229	return NULL;
219	}	230	}
Lines 294-303 Link Here
294	}	305	}
295		306
296	xf86LoaderReqSymLists(RADEONSymbols, NULL);	307	xf86LoaderReqSymLists(RADEONSymbols, NULL);
		308
		309	RADEONFillInScreenInfoPtr = (RADEONFillInScreenInfoFn)LoaderSymbol("RADEONFillInScreenInfo");
		310	RADEONOptionsWeakPtr = (RADEONOptionsWeakFn)LoaderSymbol("RADEONOptionsWeak");
297	#endif	311	#endif
298		312
299	pScrn->Probe = RADEONProbe;	313	pScrn->Probe = RADEONProbe;
		314	#ifdef XFree86LOADER
		315	(*RADEONFillInScreenInfoPtr)(pScrn);
		316	#else
300	RADEONFillInScreenInfo(pScrn);	317	RADEONFillInScreenInfo(pScrn);
		318	#endif
301	foundScreen = TRUE;	319	foundScreen = TRUE;
302	}	320	}
303		321

Return to bug 110506