Module Name: xsrc
Committed By: mrg
Date: Mon Nov 9 05:33:24 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h ffb_driver.c
Log Message:
merge xf86-video-sunffb 0.2.1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.2 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.3
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.2 Fri Jan 16 18:39:50 2009
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h Mon Nov 9 05:33:24 2009
@@ -39,11 +39,14 @@
#include "ffb_regs.h"
#include "xf86sbusBus.h"
#include "ffb_dac.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#ifndef DPMS_SERVER
#define DPMS_SERVER
#endif /* DPMS_SERVER */
#include <X11/extensions/dpms.h>
-
+#endif
/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
/* Note: do not mmap FFB_DFB8R_VOFF and following mappings using one mmap together
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.4 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.5
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.4 Tue Feb 3 18:30:21 2009
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c Mon Nov 9 05:33:24 2009
@@ -488,7 +488,7 @@
pFfb->has_double_buffer = 1;
} else {
unsigned char sbits;
- //xf86Msg(X_ERROR,"ffb?");
+
/* Read the board strapping bits twice, because sometimes
* the strapping pins can get misrouted to the bus interface
* on the first attempt. The second attempt will get the
@@ -652,6 +652,7 @@
if (! pFfb->strapping_bits)
return FALSE;
+
/* Probe for the type of FFB/AFB we have. */
FFBProbeBoardType(pFfb);
