234 +#endif /* __sparc__ */ |
234 +#endif /* __sparc__ */ |
235 |
235 |
236 #define AllocateWorkSpace(x,y) AllocateMemory(pDeviceData,y) |
236 #define AllocateWorkSpace(x,y) AllocateMemory(pDeviceData,y) |
237 #define FreeWorkSpace(x,y) ReleaseMemory(x,y) |
237 #define FreeWorkSpace(x,y) ReleaseMemory(x,y) |
238 diff --git a/src/Makefile.am b/src/Makefile.am |
238 diff --git a/src/Makefile.am b/src/Makefile.am |
239 index a146df3..7411677 100644 |
239 index 052bca6..2f147d0 100644 |
240 --- a/src/Makefile.am |
240 --- a/src/Makefile.am |
241 +++ b/src/Makefile.am |
241 +++ b/src/Makefile.am |
242 @@ -27,8 +27,6 @@ |
242 @@ -27,8 +27,6 @@ |
243 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. |
243 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. |
244 |
244 |
246 -ATIMISC_DRI_SRCS = atidri.c |
246 -ATIMISC_DRI_SRCS = atidri.c |
247 -R128_DRI_SRCS = r128_dri.c |
247 -R128_DRI_SRCS = r128_dri.c |
248 RADEON_DRI_SRCS = radeon_dri.c |
248 RADEON_DRI_SRCS = radeon_dri.c |
249 endif |
249 endif |
250 |
250 |
251 @@ -64,52 +62,17 @@ XMODE_SRCS=\ |
251 @@ -47,52 +45,17 @@ RADEON_ATOMBIOS_SOURCES = \ |
252 modes/xf86Rotate.c \ |
252 AtomBios/includes/ObjectID.h \ |
253 modes/xf86DiDGA.c |
253 AtomBios/includes/regsdef.h |
254 |
254 |
255 -if ATIMISC_CPIO |
255 -if ATIMISC_CPIO |
256 -ATIMISC_CPIO_SOURCES = ativga.c ativgaio.c atibank.c atiwonder.c atiwonderio.c |
256 -ATIMISC_CPIO_SOURCES = ativga.c ativgaio.c atibank.c atiwonder.c atiwonderio.c |
257 -endif |
257 -endif |
258 - |
258 - |
263 if USE_EXA |
263 if USE_EXA |
264 -ATIMISC_EXA_SOURCES = atimach64exa.c |
264 -ATIMISC_EXA_SOURCES = atimach64exa.c |
265 RADEON_EXA_SOURCES = radeon_exa.c |
265 RADEON_EXA_SOURCES = radeon_exa.c |
266 endif |
266 endif |
267 |
267 |
268 -AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER |
268 -AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER |
269 +AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER |
269 +AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER |
270 INCLUDES = -I$(srcdir)/AtomBios/includes |
270 INCLUDES = -I$(srcdir)/AtomBios/includes |
271 |
271 |
272 -ati_drv_la_LTLIBRARIES = ati_drv.la |
272 -ati_drv_la_LTLIBRARIES = ati_drv.la |
273 -ati_drv_la_LDFLAGS = -module -avoid-version |
273 -ati_drv_la_LDFLAGS = -module -avoid-version |
274 -ati_drv_ladir = @moduledir@/drivers |
274 -ati_drv_ladir = @moduledir@/drivers |
304 +efb_drv_ladir = @moduledir@/drivers |
304 +efb_drv_ladir = @moduledir@/drivers |
305 +efb_drv_la_SOURCES = efb_driver.c \ |
305 +efb_drv_la_SOURCES = efb_driver.c \ |
306 radeon_accel.c radeon_cursor.c radeon_dga.c \ |
306 radeon_accel.c radeon_cursor.c radeon_dga.c \ |
307 radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \ |
307 radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \ |
308 radeon_vip.c radeon_misc.c radeon_probe.c \ |
308 radeon_vip.c radeon_misc.c radeon_probe.c \ |
309 @@ -119,31 +82,10 @@ radeon_drv_la_SOURCES = \ |
309 @@ -101,27 +64,6 @@ radeon_drv_la_SOURCES = \ |
|
310 $(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \ |
310 $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c |
311 $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c |
311 |
|
312 if XMODES |
|
313 -radeon_drv_la_SOURCES += \ |
|
314 +efb_drv_la_SOURCES += \ |
|
315 $(XMODE_SRCS) |
|
316 endif |
|
317 |
312 |
318 -theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la |
313 -theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la |
319 -theatre_detect_drv_la_LDFLAGS = -module -avoid-version |
314 -theatre_detect_drv_la_LDFLAGS = -module -avoid-version |
320 -theatre_detect_drv_ladir = @moduledir@/multimedia |
315 -theatre_detect_drv_ladir = @moduledir@/multimedia |
321 -theatre_detect_drv_la_SOURCES = \ |
316 -theatre_detect_drv_la_SOURCES = \ |
335 - $(AM_CFLAGS) -DMICROC_DIR=\"$(theatre200_drv_ladir)\" |
330 - $(AM_CFLAGS) -DMICROC_DIR=\"$(theatre200_drv_ladir)\" |
336 -theatre200_drv_la_SOURCES = \ |
331 -theatre200_drv_la_SOURCES = \ |
337 - theatre200.c theatre200_module.c |
332 - theatre200.c theatre200_module.c |
338 - |
333 - |
339 EXTRA_DIST = \ |
334 EXTRA_DIST = \ |
340 $(XMODE_SRCS) \ |
|
341 atimach64render.c \ |
335 atimach64render.c \ |
|
336 radeon_render.c \ |
342 diff --git a/src/ati.c b/src/ati.c |
337 diff --git a/src/ati.c b/src/ati.c |
343 index b3f07ca..084b27f 100644 |
338 index b3f07ca..084b27f 100644 |
344 --- a/src/ati.c |
339 --- a/src/ati.c |
345 +++ b/src/ati.c |
340 +++ b/src/ati.c |
346 @@ -68,7 +68,12 @@ |
341 @@ -68,7 +68,12 @@ |