summaryrefslogtreecommitdiff
path: root/src/apm_cursor.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:58 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:58 +0000
commitfee1f0faa587bfe8dc34970c66a3708ce189ba74 (patch)
tree47c01f0011bc1583926d8b294e68f3ffdd5356f5 /src/apm_cursor.c
parentdc8e1571ee80808baf376ac7f1f7d557309a487b (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/apm_cursor.c')
-rw-r--r--src/apm_cursor.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/apm_cursor.c b/src/apm_cursor.c
index 4bf0f98..6a23341 100644
--- a/src/apm_cursor.c
+++ b/src/apm_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.15 2003/10/30 18:37:20 tsi Exp $ */
#include "X.h"
@@ -84,17 +84,6 @@ int ApmHWCursorInit(ScreenPtr pScreen)
infoPtr->ShowCursor = ApmShowCursor;
infoPtr->UseHWCursor = ApmUseHWCursor;
- /*ErrorF("%s %s: %s: Using hardware cursor (XAA).\n",
- XCONFIG_PROBED, vga256InfoRec.name, vga256InfoRec.chipset);
-
- if(XAACursorInfoRec.Flags & USE_HARDWARE_CURSOR) {
- vgaHWCursor.Init = XAACursorInit;
- vgaHWCursor.Initialized = TRUE;
- vgaHWCursor.Restore = XAARestoreCursor;
- vgaHWCursor.Warp = XAAWarpCursor;
- vgaHWCursor.QueryBestSize = XAAQueryBestSize;
- }*/
-
/* Set up the convert table for the input cursor data */
for (i = 0; i < 256; i++)
ConvertTable[i] = ((~i) & 0xAA) | (i & (i >> 1) & 0x55);