|
Added
Link Here
|
| 1 |
--- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c.orig Fri Mar 31 00:22:07 2006 |
| 2 |
+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c Fri Mar 31 00:35:35 2006 |
| 3 |
@@ -43,8 +43,6 @@ |
| 4 |
#include "ffb_rcache.h" |
| 5 |
#include "ffb_loops.h" |
| 6 |
#include "ffb_regs.h" |
| 7 |
-#include "ffb_stip.h" |
| 8 |
-#include "ffb_gc.h" |
| 9 |
|
| 10 |
int CreatorScreenPrivateIndex; |
| 11 |
int CreatorGCPrivateIndex; |
| 12 |
--- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c.orig Fri Mar 31 00:22:07 2006 |
| 13 |
+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c Fri Mar 31 00:36:08 2006 |
| 14 |
@@ -36,7 +36,6 @@ |
| 15 |
#include "ffb_regs.h" |
| 16 |
#include "ffb_rcache.h" |
| 17 |
#include "ffb_fifo.h" |
| 18 |
-#include "ffb_stip.h" |
| 19 |
#include "ffb_loops.h" |
| 20 |
|
| 21 |
static Bool FFB_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, |
| 22 |
--- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c.orig Fri Mar 31 00:22:07 2006 |
| 23 |
+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c Fri Mar 31 00:37:04 2006 |
| 24 |
@@ -33,11 +33,6 @@ |
| 25 |
|
| 26 |
#include "xf86PciInfo.h" |
| 27 |
#include "xf86Pci.h" |
| 28 |
-#define PSZ 8 |
| 29 |
-#include "cfb.h" |
| 30 |
-#undef PSZ |
| 31 |
-#include "cfb16.h" |
| 32 |
-#include "cfb32.h" |
| 33 |
|
| 34 |
#include "miline.h" |
| 35 |
|
| 36 |
--- programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile.orig Fri Mar 31 00:22:07 2006 |
| 37 |
+++ programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile Fri Mar 31 00:34:27 2006 |
| 38 |
@@ -60,16 +60,10 @@ |
| 39 |
#define FFBsObjectRule(name) |
| 40 |
#endif |
| 41 |
|
| 42 |
-SRCS = ffb_driver.c ffb_accel.c ffb_attr.c ffb_stip.c ffb_bcopy.c \ |
| 43 |
- ffb_cplane.c ffb_fspans.c ffb_point.c ffb_seg.c ffb_plygon.c \ |
| 44 |
- ffb_line.c ffb_glyph.c ffb_frect.c ffb_circle.c ffb_checks.c \ |
| 45 |
- ffb_stubs.c ffb_gc.c ffb_gspans.c ffb_sspans.c ffb_zeroarc.c \ |
| 46 |
- ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c ffb_dbe.c $(DRISRCS) |
| 47 |
-OBJS = ffb_driver.o ffb_accel.o ffb_attr.o ffb_stip.o ffb_bcopy.o \ |
| 48 |
- ffb_cplane.o ffb_fspans.o ffb_point.o ffb_seg.o ffb_plygon.o \ |
| 49 |
- ffb_line.o ffb_glyph.o ffb_frect.o ffb_circle.o ffb_checks.o \ |
| 50 |
- ffb_stubs.o ffb_gc.o ffb_gspans.o ffb_sspans.o ffb_zeroarc.o \ |
| 51 |
- ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o ffb_dbe.o $(VISOBJS) \ |
| 52 |
+SRCS = ffb_driver.c ffb_accel.c ffb_attr.c \ |
| 53 |
+ ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c $(DRISRCS) |
| 54 |
+OBJS = ffb_driver.o ffb_accel.o ffb_attr.o \ |
| 55 |
+ ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o $(VISOBJS) \ |
| 56 |
$(DRIOBJS) |
| 57 |
|
| 58 |
#if defined(XF86DriverSDK) |
| 59 |
@@ -107,28 +101,10 @@ |
| 60 |
FFBCObjectRule(ffb_accel) |
| 61 |
FFBCObjectRule(ffb_driver) |
| 62 |
FFBCObjectRule(ffb_attr) |
| 63 |
-FFBCObjectRule(ffb_stip) |
| 64 |
-FFBCObjectRule(ffb_bcopy) |
| 65 |
-FFBCObjectRule(ffb_cplane) |
| 66 |
-FFBCObjectRule(ffb_fspans) |
| 67 |
-FFBCObjectRule(ffb_point) |
| 68 |
-FFBCObjectRule(ffb_seg) |
| 69 |
-FFBCObjectRule(ffb_plygon) |
| 70 |
-FFBCObjectRule(ffb_line) |
| 71 |
-FFBCObjectRule(ffb_glyph) |
| 72 |
-FFBCObjectRule(ffb_frect) |
| 73 |
-FFBCObjectRule(ffb_circle) |
| 74 |
-FFBCObjectRule(ffb_checks) |
| 75 |
-FFBCObjectRule(ffb_stubs) |
| 76 |
-FFBCObjectRule(ffb_gc) |
| 77 |
-FFBCObjectRule(ffb_gspans) |
| 78 |
-FFBCObjectRule(ffb_sspans) |
| 79 |
-FFBCObjectRule(ffb_zeroarc) |
| 80 |
FFBCObjectRule(ffb_cursor) |
| 81 |
FFBCObjectRule(ffb_dga) |
| 82 |
FFBCObjectRule(ffb_dac) |
| 83 |
FFBCObjectRule(ffb_wid) |
| 84 |
-FFBCObjectRule(ffb_dbe) |
| 85 |
FFBsObjectRule(VISmoveImage) |
| 86 |
FFBsObjectRule(ffb_asm) |
| 87 |
#if BuildXF86DRI |