aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/ddc/edid.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-06 18:48:27 +0000
committermarha <marha@users.sourceforge.net>2009-09-06 18:48:27 +0000
commita915739887477b28d924ecc8417ee107d125bd6c (patch)
treec02f315476b61892d1fd89182e18943dce8d6277 /xorg-server/hw/xfree86/ddc/edid.h
parent6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff)
downloadvcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.gz
vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.bz2
vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.zip
Switched to xorg-server-1.6.99.900.tar.gz
Diffstat (limited to 'xorg-server/hw/xfree86/ddc/edid.h')
-rw-r--r--xorg-server/hw/xfree86/ddc/edid.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/ddc/edid.h b/xorg-server/hw/xfree86/ddc/edid.h
index 3ca402f57..3feb9796f 100644
--- a/xorg-server/hw/xfree86/ddc/edid.h
+++ b/xorg-server/hw/xfree86/ddc/edid.h
@@ -12,6 +12,12 @@
#ifndef _EDID_H_
#define _EDID_H_
+#include <X11/Xmd.h>
+
+#ifndef _X_EXPORT
+# include <X11/Xfuncproto.h>
+#endif
+
/* read complete EDID record */
#define EDID1_LEN 128
#define BITS_PER_BYTE 9
@@ -532,8 +538,15 @@ struct detailed_monitor_section {
};
/* flags */
-#define EDID_COMPLETE_RAWDATA 0x1
+#define MONITOR_EDID_COMPLETE_RAWDATA 0x01
+/* old, don't use */
+#define EDID_COMPLETE_RAWDATA 0x01
+#define MONITOR_DISPLAYID 0x02
+/*
+ * For DisplayID devices, only the scrnIndex, flags, and rawData fields
+ * are meaningful. For EDID, they all are.
+ */
typedef struct {
int scrnIndex;
struct vendor vendor;
@@ -547,6 +560,6 @@ typedef struct {
Uchar *rawData;
} xf86Monitor, *xf86MonPtr;
-extern xf86MonPtr ConfiguredMonitor;
+extern _X_EXPORT xf86MonPtr ConfiguredMonitor;
#endif /* _EDID_H_ */