ddccontrol-cvs — CVS commits

[ddccontrol-cvs] ddccontrol/doc supportedmonitors.xml,1.13,1.14

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12880/doc

Modified Files:
	supportedmonitors.xml 
Log Message:
Fix bug reported by Hubai Tamas (delays not respected by ddccontrol).

Index: supportedmonitors.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/doc/supportedmonitors.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- supportedmonitors.xml	21 Feb 2006 11:49:29 -0000	1.13
+++ supportedmonitors.xml	24 Feb 2006 21:49:22 -0000	1.14
@@ -7,6 +7,9 @@
 <listitem>
 Dell 1704FPT (DVI input)
 </listitem>
+<listitem>
+Dell 2005FPW
+</listitem>
 </itemizedlist>
 </sect3>
 <sect3>
@@ -114,6 +117,14 @@
 </listitem>
 </itemizedlist>
 </sect3>
+<sect3>
+<title>SUN</title>
+<itemizedlist mark='bullet'>
+<listitem>
+GDM-5410 (Sony OEM)
+</listitem>
+</itemizedlist>
+</sect3>
 <sect2>
 <title>Your monitor is not on this list?</title>
 <para>If your monitor is not on this list, and so doesn't work with DDCcontrol,

[ddccontrol-cvs] ddccontrol-db ChangeLog,1.68,1.69

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12539

Modified Files:
	ChangeLog 
Log Message:
Update ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ChangeLog	23 Feb 2006 21:45:21 -0000	1.68
+++ ChangeLog	24 Feb 2006 21:48:34 -0000	1.69
@@ -1,3 +1,8 @@
+2006-02-24 21:48  nboichat
+
+	* db/monitor/: SAMlcd.xml, VESA.xml: Add delay to some "complex"
+	  controls.
+
 2006-02-23 21:44  nboichat
 
 	* db/monitor/VESA.xml, po/fr.po: Update French translation.

[ddccontrol-cvs] ddccontrol-db/db/monitor SAMlcd.xml,1.2,1.3 VESA.xml,1.2,1.3

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12475/db/monitor

Modified Files:
	SAMlcd.xml VESA.xml 
Log Message:
Add delay to some "complex" controls.

Index: SAMlcd.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAMlcd.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAMlcd.xml	23 Feb 2006 13:01:13 -0000	1.2
+++ SAMlcd.xml	24 Feb 2006 21:48:19 -0000	1.3
@@ -3,7 +3,7 @@
 <monitor name="Samsung standard LCD">
 	<caps add="(vcp(E1))"/>
 	<controls>
-		<control id="auto" address="0x1e">
+		<control id="auto" address="0x1e" delay="1000">
 			<value id="pos" value="1"/>
 			<value id="posfast" value="2"/>
 		</control>
@@ -61,6 +61,17 @@
 			<value id="enable" value="0"/>
 			<value id="disable" value="1"/>
 		</control>
+		
+		<!--- MagicZone:
+			0xfa Hue[0..100]
+			0xfb Saturation[0..100]
+			0xf9 Brightness[0...100]
+			0xfc Sharpness[0.100]M / [0..20]P
+			???? H-Pos +/-
+			???? V-Pos +/-
+			???? H-size +/-
+			???? V-size +/-
+		  -->
 	</controls>
 	<include file="VESA"/>
 </monitor>

Index: VESA.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/VESA.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VESA.xml	23 Feb 2006 21:44:56 -0000	1.2
+++ VESA.xml	24 Feb 2006 21:48:20 -0000	1.3
@@ -16,7 +16,7 @@
 		<control id="green" address="0x18"/>
 		<control id="blue" address="0x1A"/>
 		<control id="focus" address="0x1C"/>
-		<control id="auto" address="0x1e">
+		<control id="auto" address="0x1e" delay="1000">
 			<value id="pos" value="1"/>
 		</control>
 		
@@ -61,7 +61,7 @@
 			<value id="portrait" value="2"/>
 		</control>
 		
-		<control id="settings" address="0xb0"/>
+		<control id="settings" address="0xb0" delay="1000"/>
 		
 		<control id="dpms" address="0xd6">
 			<value id="on" value="1"/>

[ddccontrol-cvs] ddccontrol ChangeLog,1.102,1.103

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18785

Modified Files:
	ChangeLog 
Log Message:
Update ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- ChangeLog	23 Feb 2006 21:49:25 -0000	1.102
+++ ChangeLog	23 Feb 2006 22:21:35 -0000	1.103
@@ -1,3 +1,8 @@
+2006-02-23 22:21  nboichat
+
+	* po/ddccontrol.pot, po/de.po, po/fr.po, po/pl.po, po/ru.po,
+	  po/zh_CN.po, src/ddccontrol/main.c: Update translation.
+
 2006-02-23 21:48  nboichat
 
 	* src/: ddccontrol/main.c, gddccontrol/main.c,

[ddccontrol-cvs] ddccontrol/po ddccontrol.pot,1.19,1.20 de.po,1.7,1.8 fr.po,1.21,1.22 pl.po,1.2,1.3 ru.po,1.16,1.17 zh_CN.po,1.4,1.5

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18467/po

Modified Files:
	ddccontrol.pot de.po fr.po pl.po ru.po zh_CN.po 
Log Message:
Update translation.

Index: fr.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/po/fr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- fr.po	22 Feb 2006 13:27:07 -0000	1.21
+++ fr.po	23 Feb 2006 22:21:16 -0000	1.22
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: DDC/CI control tool 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-21 12:49+0100\n"
-"PO-Revision-Date: 2006-02-21 12:52+0100\n"
+"POT-Creation-Date: 2006-02-23 23:15+0100\n"
+"PO-Revision-Date: 2006-02-23 23:19+0100\n"
 "Last-Translator: Nicolas Boichat <ni...@bo...>\n"
 "Language-Team: French <tr...@tr...>\n"
 "MIME-Version: 1.0\n"
@@ -53,108 +53,110 @@
[...1039 lines suppressed...]
 
-#: ../src/lib/monitor_db.c:771
+#: ../src/lib/monitor_db.c:764
 #, c-format
 msgid "options.xml dbversion (%d) is less than the supported version (%d).\n"
 msgstr "La version de options.xml (%d) est plus petite que la version supportée (%d).\n"
 
-#: ../src/lib/monitor_db.c:772
+#: ../src/lib/monitor_db.c:765
 #, c-format
 msgid "Please update ddccontrol database.\n"
 msgstr "Veuillez mettre à jour la base de données ddccontrol.\n"
 
+#~ msgid "Buffer too small to contain caps.\n"
+#~ msgstr "Tampon trop petit pour contenir la chaîne de capacité.\n"
+#~ msgid "Can't find init property."
+#~ msgstr "Ne peut trouver la propriété init."
 #~ msgid "i740"
 #~ msgstr "i740"
 #~ msgid "intel740_open"

Index: ru.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/po/ru.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ru.po	22 Feb 2006 13:27:07 -0000	1.16
+++ ru.po	23 Feb 2006 22:21:16 -0000	1.17
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: DDC/CI control tool 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-21 12:49+0100\n"
+"POT-Creation-Date: 2006-02-23 23:15+0100\n"
 "PO-Revision-Date: 2006-02-21 12:53+0100\n"
 "Last-Translator: Nicolas Boichat <ni...@bo...>\n"
 "Language-Team: Russian <LL...@li...>\n"
@@ -15,8 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
[...1222 lines suppressed...]
@@ -1245,14 +1387,18 @@
 #, fuzzy
 #~ msgid "options"
 #~ msgstr "пустой options.xml\n"
+
 #~ msgid "Error: %s @%s:%d (%s:%ld)\n"
 #~ msgstr "Ошибка: %s @%s:%d (%s:%ld)\n"
+
 #~ msgid "Error: %s @%s:%d\n"
 #~ msgstr "Ошибка: %s @%s:%d\n"
+
 #~ msgid "nvidia_open: Malloc error.\n"
 #~ msgstr "nvidia_open: ошибка malloc.\n"
+
 #~ msgid "Please click on a parameter on the left to change it."
 #~ msgstr "Пожалуйста, щёлкните на параметре слева для его изменения."
+
 #~ msgid "restore_callback should not be called for command controls."
 #~ msgstr "Нежелательно вызывать restore_callback для командных регистров"
-

Index: de.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/po/de.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- de.po	22 Feb 2006 13:27:07 -0000	1.7
+++ de.po	23 Feb 2006 22:21:16 -0000	1.8
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: DDC/CI control tool 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-21 12:49+0100\n"
+"POT-Creation-Date: 2006-02-23 23:15+0100\n"
 "PO-Revision-Date: 2005-09-21 12:47+0200\n"
 "Last-Translator: Christian Schilling <csc...@gm...>\n"
 "Language-Team: German\n"
@@ -39,100 +39,100 @@
 "\t-b : ddccontrol-db directory (if other than %s)\n"
 msgstr ""
[...968 lines suppressed...]
 "options.xml dbversion (%d) is greater than the supported version (%d).\n"
 msgstr ""
 
-#: ../src/lib/monitor_db.c:764
+#: ../src/lib/monitor_db.c:757
 #, c-format
 msgid "Please update ddccontrol program.\n"
 msgstr ""
 
-#: ../src/lib/monitor_db.c:771
+#: ../src/lib/monitor_db.c:764
 #, c-format
 msgid "options.xml dbversion (%d) is less than the supported version (%d).\n"
 msgstr ""
 
-#: ../src/lib/monitor_db.c:772
+#: ../src/lib/monitor_db.c:765
 #, c-format
 msgid "Please update ddccontrol database.\n"
 msgstr ""

Index: pl.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/po/pl.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pl.po	22 Feb 2006 13:27:07 -0000	1.2
+++ pl.po	23 Feb 2006 22:21:16 -0000	1.3
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: DDC/CI control tool 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-21 12:49+0100\n"
+"POT-Creation-Date: 2006-02-23 23:15+0100\n"
 "PO-Revision-Date: 2005-11-18 21:28+0100\n"
 "Last-Translator: Radek Marcinkowski <ra...@cb...>\n"
 "Language-Team: Polish\n"
@@ -52,27 +52,27 @@
 "\t-v : gadatliwy (wiêcj -v, bardziej gadatliwy)\n"
 "\t-b : katalog basy monitorów ddccontrol-db (je¿eli inny ni¿ %s)\n"
[...979 lines suppressed...]
 "options.xml dbversion (%d) is greater than the supported version (%d).\n"
 msgstr "options.xml dbversion (%d) jest wy¿sze ni¿ suportowana wersja (%d).\n"
 
-#: ../src/lib/monitor_db.c:764
+#: ../src/lib/monitor_db.c:757
 #, c-format
 msgid "Please update ddccontrol program.\n"
 msgstr ""
 
-#: ../src/lib/monitor_db.c:771
+#: ../src/lib/monitor_db.c:764
 #, c-format
 msgid "options.xml dbversion (%d) is less than the supported version (%d).\n"
 msgstr ""
 
-#: ../src/lib/monitor_db.c:772
+#: ../src/lib/monitor_db.c:765
 #, c-format
 msgid "Please update ddccontrol database.\n"
 msgstr ""

Index: ddccontrol.pot
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/po/ddccontrol.pot,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ddccontrol.pot	22 Feb 2006 13:27:07 -0000	1.19
+++ ddccontrol.pot	23 Feb 2006 22:21:16 -0000	1.20
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-21 12:49+0100\n"
+"POT-Creation-Date: 2006-02-23 23:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -38,100 +38,100 @@
 "\t-b : ddccontrol-db directory (if other than %s)\n"
 msgstr ""
[...968 lines suppressed...]
 "options.xml dbversion (%d) is greater than the supported version (%d).\n"
 msgstr ""
 
-#: ../src/lib/monitor_db.c:764
+#: ../src/lib/monitor_db.c:757
 #, c-format
 msgid "Please update ddccontrol program.\n"
 msgstr ""
 
-#: ../src/lib/monitor_db.c:771
+#: ../src/lib/monitor_db.c:764
 #, c-format
 msgid "options.xml dbversion (%d) is less than the supported version (%d).\n"
 msgstr ""
 
-#: ../src/lib/monitor_db.c:772
+#: ../src/lib/monitor_db.c:765
 #, c-format
 msgid "Please update ddccontrol database.\n"
 msgstr ""

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/po/zh_CN.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- zh_CN.po	22 Feb 2006 13:27:07 -0000	1.4
+++ zh_CN.po	23 Feb 2006 22:21:16 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: DDC/CI control tool cvs version 2005-11-12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-21 12:49+0100\n"
+"POT-Creation-Date: 2006-02-23 23:15+0100\n"
 "PO-Revision-Date: 2005-11-12 15:50+0800\n"
 "Last-Translator: Wu Songhai wa...@21...\n"
 "Language-Team: Simple Chinese <LL...@li...>\n"
@@ -49,27 +49,27 @@
 "\t-v : 冗长模式 (增加更多详细的说明)\n"
 "\t-b : ddccontrol-db 目录 (如果不是 %s 的话)\n"
[...994 lines suppressed...]
+#: ../src/lib/monitor_db.c:764
 #, c-format
 msgid "options.xml dbversion (%d) is less than the supported version (%d).\n"
 msgstr "options.xml 的数据库版本 (%d) 小于支持的版本 (%d).\n"
 
-#: ../src/lib/monitor_db.c:772
+#: ../src/lib/monitor_db.c:765
 #, c-format
 msgid "Please update ddccontrol database.\n"
 msgstr "请更新ddccontrol数据库.\n"
 
+#~ msgid "Buffer too small to contain caps.\n"
+#~ msgstr "缓冲区太小不能容纳功能数据.\n"
+
+#~ msgid "Can't find init property."
+#~ msgstr "找不到初始化属性."
+
 #~ msgid "Xinerama supported and active\n"
 #~ msgstr "Xinerama 已支持且是激活的\n"
 

[ddccontrol-cvs] ddccontrol/src/ddccontrol main.c,1.31,1.32

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol/src/ddccontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18467/src/ddccontrol

Modified Files:
	main.c 
Log Message:
Update translation.

Index: main.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddccontrol/main.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- main.c	23 Feb 2006 21:48:56 -0000	1.31
+++ main.c	23 Feb 2006 22:21:16 -0000	1.32
@@ -349,7 +349,8 @@
 				if (ddcci_caps(&mon) >= 0) {
 					fprintf(stdout, _("Raw output: %s\n"), mon.caps.raw_caps);
 					
-					fprintf(stdout, _("Parsed output: \n\tVCP: "));
+					fprintf(stdout, _("Parsed output: \n"));
+					fprintf(stdout, "\tVCP: ");
 					int i;
 					for (i = 0; i < 256; i++) {
 						if (mon.caps.vcp[i]) {

[ddccontrol-cvs] ddccontrol ChangeLog,1.101,1.102

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32353

Modified Files:
	ChangeLog 
Log Message:
Update ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- ChangeLog	23 Feb 2006 12:51:37 -0000	1.101
+++ ChangeLog	23 Feb 2006 21:49:25 -0000	1.102
@@ -1,3 +1,12 @@
+2006-02-23 21:48  nboichat
+
+	* src/: ddccontrol/main.c, gddccontrol/main.c,
+	  gddccontrol/notebook.c, gddccontrol/notebook.h, lib/conf.c,
+	  lib/ddcci.c, lib/ddcci.h, lib/monitor_db.c, lib/monitor_db.h:
+	  Fallback to generic profiles when a monitor is not supported in
+	  the database (displaying a big warning inviting the users to send
+	  their dumps to ddccontrol-users).
+
 2006-02-23 12:51  nboichat
 
 	* src/: ddccontrol/main.c, lib/monitor_db.c, lib/monitor_db.h:

[ddccontrol-cvs] ddccontrol/src/lib conf.c,1.5,1.6 ddcci.c,1.30,1.31 ddcci.h,1.20,1.21 monitor_db.c,1.29,1.30 monitor_db.h,1.11,1.12

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol/src/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31930/src/lib

Modified Files:
	conf.c ddcci.c ddcci.h monitor_db.c monitor_db.h 
Log Message:
Fallback to generic profiles when a monitor is not supported in the database (displaying a big warning inviting the users to send their dumps to ddccontrol-users).

Index: ddcci.h
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/ddcci.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ddcci.h	21 Sep 2005 20:45:37 -0000	1.20
+++ ddcci.h	23 Feb 2006 21:48:56 -0000	1.21
@@ -32,10 +32,29 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include "monitor_db.h"
-
 struct profile;
 
+enum monitor_type {
+unk = 0,
+lcd = 1,
+crt = 2
+};
+
+/* Structure to store CAPS vcp entry (control and related values) */
+struct vcp_entry {
+	int values_len; /* -1 if values are not specified */
+	unsigned short* values;
+};
+
+/* Structure to store CAPS */
+struct caps {
+	struct vcp_entry* vcp[256]; /* vcp entries */
+	enum monitor_type type;
+	char* raw_caps; /* raw text caps */
+};
+
+#include "monitor_db.h"
+
 struct monitor {
 	int fd;
 	unsigned int addr;
@@ -43,6 +62,7 @@
 	unsigned char digital; /* 0 - digital, 1 - analog */
 	struct timeval last;
 	struct monitor_db* db;
+	struct caps caps;
 	
 	struct profile* profiles; /* profiles available for this monitor. Filled by get_all_profiles. */
 	
@@ -53,6 +73,11 @@
 #endif
 	} type;
 	int probing; /* are we probing? */
+	
+	int fallback;
+	/* 0 - the db is designed for this monitor
+	   1 - we are using a manufacturer standard profile (warn the user)
+	   2 - we are using the VESA generic profile (warn the user) */
 };
 
 /* Struct used to return monitor data probed by ddcci_probe */
@@ -79,7 +104,9 @@
 int ddcci_readctrl(struct monitor* mon, unsigned char ctrl, 
 	unsigned short *value, unsigned short *maximum);
 
-int ddcci_caps(struct monitor* mon, unsigned char *buffer, unsigned int buflen);
+int ddcci_parse_caps(const char* caps_str, struct caps* caps, int add);
+
+int ddcci_caps(struct monitor* mon);
 
 /* verbosity level (0 - normal, 1 - encoded data, 2 - ddc/ci frames) */
 void ddcci_verbosity(int verbosity);

Index: conf.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/conf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- conf.c	14 Feb 2006 21:59:05 -0000	1.5
+++ conf.c	23 Feb 2006 21:48:56 -0000	1.6
@@ -179,8 +179,6 @@
 	if (!filename)
 		return 0;
 	
-	free(filename);
-	
 	writer = xmlNewTextWriterFilename(filename, 0);
 	DDCCI_RETURN_IF_RUN(writer == NULL, 0, _("Cannot create the xml writer\n"), {xmlFreeTextWriter(writer);})
 

Index: monitor_db.h
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/monitor_db.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- monitor_db.h	23 Feb 2006 12:51:08 -0000	1.11
+++ monitor_db.h	23 Feb 2006 21:48:56 -0000	1.12
@@ -21,17 +21,13 @@
 #ifndef MONITOR_DB_H
 #define MONITOR_DB_H
 
+#include "ddcci.h"
+
 #include <libxml/xmlstring.h>
 
 /* Current database version */
 #define DBVERSION 3
 
-/* Structure to store CAPS entry (control and related values) */
-struct caps_entry {
-	int values_len; /* -1 if values are not specified */
-	unsigned short* values;
-};
-
 enum control_type {
 value = 0,
 command = 1,
@@ -88,12 +84,10 @@
 	xmlChar* name;
 	enum init_type init;
 	
-	struct caps_entry* caps[256]; /* CAPS */
-	
 	struct group_db* group_list;
 };
 
-struct monitor_db* ddcci_create_db(const char* pnpname, const char* default_caps, int faulttolerance);
+struct monitor_db* ddcci_create_db(const char* pnpname, struct caps* caps, int faulttolerance);
 void ddcci_free_db(struct monitor_db* mon_db);
 
 int ddcci_init_db(char* usedatadir);

Index: monitor_db.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/monitor_db.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- monitor_db.c	23 Feb 2006 12:51:08 -0000	1.29
+++ monitor_db.c	23 Feb 2006 21:48:56 -0000	1.30
@@ -47,121 +47,6 @@
 
 int get_verbosity(); /* Defined in ddcci.c */
 
-/* See documentation Appendix D.
- * Returns :
- * -1 if an error occured 
- *  number of controls added
- *
- * add: if true: add caps_str to caps, otherwise remove caps_str from the caps.
- */
-int ddcci_parse_caps(const char* caps_str, struct caps_entry** caps, int add)
-{
-//	printf("Parsing CAPS (%s).\n", caps_str);
-	int pos = 0; /* position in caps_str */
-	
-	int level = 0; /* CAPS parenthesis level */
-	int vcp = 0; /* Current CAPS section is vcp */
-	
-	char buf[8];
-	char* endptr;
-	int ind = -1;
-	long val = -1;
-	int i;
-	int removeprevious = 0;
-	
-	int num = 0;
-	
-	for (pos = 0; caps_str[pos] != 0; pos++)
-	{
-		if (caps_str[pos] == '(') {
-			level++;
-		}
-		else if (caps_str[pos] == ')')
-		{
-			level--;
-			if (level == 1) {
-				vcp = 0;
-			}
-		}
-		else if (caps_str[pos] != ' ')
-		{
-			if ((level == 1) && (strncmp(caps_str+pos, "vcp", 3) == 0)) {
-				vcp = 1;
-				pos += 2;
-			}
-			else if ((vcp == 1) && (level == 2)) {
-				if (!add && ((removeprevious == 1) || (caps[ind] && caps[ind]->values_len == 0))) {
-					if(caps[ind]) {
-						if (caps[ind]->values) {
-							free(caps[ind]->values);
-						}
-						free(caps[ind]);
-						caps[ind] = NULL;
-					}
-				}
-				buf[0] = caps_str[pos];
-				buf[1] = caps_str[++pos];
-				buf[2] = 0;
-				ind = strtol(buf, &endptr, 16);
-				DDCCI_RETURN_IF(*endptr != 0, -1, _("Can't convert value to int, invalid CAPS."));
-				if (add) {
-					caps[ind] = malloc(sizeof(struct caps_entry));
-					caps[ind]->values_len = -1;
-					caps[ind]->values = NULL;
-				}
-				else {
-					removeprevious = 1;
-				}
-				num++;
-			}
-			else if ((vcp == 1) && (level == 3)) {
-				i = 0;
-				while ((caps_str[pos+i] != ' ') && (caps_str[pos+i] != ')')) {
-					buf[i] = caps_str[pos+i];
-					i++;
-				}
-				buf[i] = 0;
-				val = strtol(buf, &endptr, 16);
-				DDCCI_RETURN_IF(*endptr != 0, -1, _("Can't convert value to int, invalid CAPS."));
-				if (add) {
-					if (caps[ind]->values_len == -1) {
-						caps[ind]->values_len = 1;
-					}
-					else {
-						caps[ind]->values_len++;
-					}
-					caps[ind]->values = realloc(caps[ind]->values, caps[ind]->values_len*sizeof(unsigned short));
-					caps[ind]->values[caps[ind]->values_len-1] = val;
-				}
-				else {
-					if (caps[ind]->values_len > 0) {
-						removeprevious = 0;
-						int j = 0;
-						for (i = 0; i < caps[ind]->values_len; i++) {
-							if (caps[ind]->values[i] != val) {
-								caps[ind]->values[j++] = caps[ind]->values[i];
-							}
-						}
-						caps[ind]->values_len--;
-					}
-				}
-			}
-		}
-	}
-	
-	if (!add && ((removeprevious == 1) || (caps[ind] && caps[ind]->values_len == 0))) {
-		if(caps[ind]) {
-			if (caps[ind]->values) {
-				free(caps[ind]->values);
-			}
-			free(caps[ind]);
-			caps[ind] = NULL;
-		}
-	}
-	
-	return num;
-}
-
 /* End of CAPS structs/functions */
 
 int ddcci_get_value_list(xmlNodePtr options_control, xmlNodePtr mon_control, struct control_db *current_control, int command, int faulttolerance)
@@ -281,7 +166,7 @@
 }
 
 int ddcci_add_controls_to_subgroup(xmlNodePtr control, xmlNodePtr mon_control, 
-		struct subgroup_db *current_group, struct caps_entry** caps, char* defined, char *matchedcontrols, int faulttolerance) {
+		struct subgroup_db *current_group, struct vcp_entry** vcp, char* defined, char *matchedcontrols, int faulttolerance) {
 	xmlNodePtr cur;
 	xmlChar *mon_ctrlid;
 	xmlChar *options_ctrlid, *options_ctrlname;
@@ -349,7 +234,7 @@
 						
 						matchedcontrols[i] = 1;
 						
-						if (caps[current_control->address] == NULL) {
+						if (vcp[current_control->address] == NULL) {
 							if (get_verbosity()) {
 								printf(_("Control %s has been discarded by the caps string.\n"), options_ctrlid);
 							}
@@ -447,7 +332,7 @@
  * prof_caps: CAPS read from one of the profile (NULL if none has been read yet)
  */
 int ddcci_create_db_protected(
-	struct monitor_db* mon_db, const char* pnpname, int recursionlevel,
+	struct monitor_db* mon_db, const char* pnpname, struct caps* caps, int recursionlevel,
 	char* defined, int faulttolerance)
 {
 	xmlDocPtr mon_doc;
@@ -579,9 +464,9 @@
 			xmlChar* add = xmlGetProp(mon_child, BAD_CAST "add");
 			DDCCI_DB_RETURN_IF(!remove && !add, 0,  _("Can't find add or remove property in caps."), mon_child);
 			if (remove)
-				DDCCI_DB_RETURN_IF(ddcci_parse_caps(remove, mon_db->caps, 0) <= 0, 0,  _("Invalid remove caps."), mon_child);
+				DDCCI_DB_RETURN_IF(ddcci_parse_caps(remove, caps, 0) <= 0, 0,  _("Invalid remove caps."), mon_child);
 			if (add)
-				DDCCI_DB_RETURN_IF(ddcci_parse_caps(add, mon_db->caps, 1) <= 0, 0,  _("Invalid add caps."), mon_child);
+				DDCCI_DB_RETURN_IF(ddcci_parse_caps(add, caps, 1) <= 0, 0,  _("Invalid add caps."), mon_child);
 		}
 		else if (!xmlStrcmp(mon_child->name, (const xmlChar *) "include")) {
 			controls_or_include = 1;
@@ -593,7 +478,7 @@
 			
 			xmlChar* file = xmlGetProp(mon_child, BAD_CAST "file");
 			DDCCI_DB_RETURN_IF(file == NULL, 0,  _("Can't find file property."), mon_child);
-			if (!ddcci_create_db_protected(mon_db, file, recursionlevel+1, defined, faulttolerance)) {
+			if (!ddcci_create_db_protected(mon_db, file, caps, recursionlevel+1, defined, faulttolerance)) {
 				xmlFree(file);
 				return 0;
 			}
@@ -646,7 +531,7 @@
 					control = subgroup->xmlChildrenNode;
 					
 					DDCCI_DB_RETURN_IF(
-						!ddcci_add_controls_to_subgroup(control, mon_control, current_subgroup, mon_db->caps,
+						!ddcci_add_controls_to_subgroup(control, mon_control, current_subgroup, caps->vcp,
 							defined, matchedcontrols, faulttolerance), 0,  _("Error enumerating controls in subgroup."), control);
 					current_subgroup = current_subgroup->next;
 				}
@@ -718,18 +603,16 @@
  *  - 0 : fail on every database error
  "  - 1 : do not fail on minor errors
  */
-struct monitor_db* ddcci_create_db(const char* pnpname, const char* default_caps, int faulttolerance)
+struct monitor_db* ddcci_create_db(const char* pnpname, struct caps* caps, int faulttolerance)
 {
 	struct monitor_db* mon_db = malloc(sizeof(struct monitor_db));
 	memset(mon_db, 0, sizeof(struct monitor_db));
 	
-	ddcci_parse_caps(default_caps, mon_db->caps, 1);
-	
 	/* defined controls, when including another file, we don't define the same control 2 times.  */
 	char defined[256];
 	memset(defined, 0, 256*sizeof(char));
 	
-	if (!ddcci_create_db_protected(mon_db, pnpname, 0, defined, faulttolerance)) {
+	if (!ddcci_create_db_protected(mon_db, pnpname, caps, 0, defined, faulttolerance)) {
 		free(mon_db);
 		mon_db = NULL;
 	}
@@ -805,16 +688,6 @@
 		free(ogroup);
 	}
 	
-	int i;
-	for (i = 0; i < 256; i++) {
-		if(monitor->caps[i]) {
-			if (monitor->caps[i]->values) {
-				free(monitor->caps[i]->values);
-			}
-			free(monitor->caps[i]);
-		}
-	}
-	
 	free(monitor);
 }
 

Index: ddcci.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/ddcci.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ddcci.c	22 Feb 2006 13:27:07 -0000	1.30
+++ ddcci.c	23 Feb 2006 21:48:56 -0000	1.31
@@ -559,6 +559,139 @@
 	return -1;
 }
 
+/* See documentation Appendix D.
+ * Returns :
+ * -1 if an error occured 
+ *  number of controls added
+ *
+ * add: if true: add caps_str to caps, otherwise remove caps_str from the caps.
+ */
+int ddcci_parse_caps(const char* caps_str, struct caps* caps, int add)
+{
+//	printf("Parsing CAPS (%s).\n", caps_str);
+	int pos = 0; /* position in caps_str */
+	
+	int level = 0; /* CAPS parenthesis level */
+	int svcp = 0; /* Current CAPS section is vcp */
+	int stype = 0; /* Current CAPS section is type */
+	
+	char buf[8];
+	char* endptr;
+	int ind = -1;
+	long val = -1;
+	int i;
+	int removeprevious = 0;
+	
+	int num = 0;
+	
+	for (pos = 0; caps_str[pos] != 0; pos++)
+	{
+		if (caps_str[pos] == '(') {
+			level++;
+		}
+		else if (caps_str[pos] == ')')
+		{
+			level--;
+			if (level == 1) {
+				svcp = 0;
+				stype = 0;
+			}
+		}
+		else if (caps_str[pos] != ' ')
+		{
+			if (level == 1) {
+				if (strncmp(caps_str+pos, "vcp", 3) == 0) {
+					svcp = 1;
+					pos += 2;
+				}
+				else if (strncmp(caps_str+pos, "type", 4) == 0) {
+					stype = 1;
+					pos += 3;
+				}
+			}
+			else if ((stype == 1) && (level == 2)) {
+				if (strncmp(caps_str+pos, "lcd", 3) == 0) {
+					caps->type = lcd;
+					pos += 2;
+				}
+				else if (strncmp(caps_str+pos, "crt", 3) == 0) {
+					caps->type = crt;
+					pos += 2;
+				}
+			}
+			else if ((svcp == 1) && (level == 2)) {
+				if (!add && ((removeprevious == 1) || (caps->vcp[ind] && caps->vcp[ind]->values_len == 0))) {
+					if(caps->vcp[ind]) {
+						if (caps->vcp[ind]->values) {
+							free(caps->vcp[ind]->values);
+						}
+						free(caps->vcp[ind]);
+						caps->vcp[ind] = NULL;
+					}
+				}
+				buf[0] = caps_str[pos];
+				buf[1] = caps_str[++pos];
+				buf[2] = 0;
+				ind = strtol(buf, &endptr, 16);
+				DDCCI_RETURN_IF(*endptr != 0, -1, _("Can't convert value to int, invalid CAPS."));
+				if (add) {
+					caps->vcp[ind] = malloc(sizeof(struct vcp_entry));
+					caps->vcp[ind]->values_len = -1;
+					caps->vcp[ind]->values = NULL;
+				}
+				else {
+					removeprevious = 1;
+				}
+				num++;
+			}
+			else if ((svcp == 1) && (level == 3)) {
+				i = 0;
+				while ((caps_str[pos+i] != ' ') && (caps_str[pos+i] != ')')) {
+					buf[i] = caps_str[pos+i];
+					i++;
+				}
+				buf[i] = 0;
+				val = strtol(buf, &endptr, 16);
+				DDCCI_RETURN_IF(*endptr != 0, -1, _("Can't convert value to int, invalid CAPS."));
+				if (add) {
+					if (caps->vcp[ind]->values_len == -1) {
+						caps->vcp[ind]->values_len = 1;
+					}
+					else {
+						caps->vcp[ind]->values_len++;
+					}
+					caps->vcp[ind]->values = realloc(caps->vcp[ind]->values, caps->vcp[ind]->values_len*sizeof(unsigned short));
+					caps->vcp[ind]->values[caps->vcp[ind]->values_len-1] = val;
+				}
+				else {
+					if (caps->vcp[ind]->values_len > 0) {
+						removeprevious = 0;
+						int j = 0;
+						for (i = 0; i < caps->vcp[ind]->values_len; i++) {
+							if (caps->vcp[ind]->values[i] != val) {
+								caps->vcp[ind]->values[j++] = caps->vcp[ind]->values[i];
+							}
+						}
+						caps->vcp[ind]->values_len--;
+					}
+				}
+			}
+		}
+	}
+	
+	if (!add && ((removeprevious == 1) || (caps->vcp[ind] && caps->vcp[ind]->values_len == 0))) {
+		if(caps->vcp[ind]) {
+			if (caps->vcp[ind]->values) {
+				free(caps->vcp[ind]->values);
+			}
+			free(caps->vcp[ind]);
+			caps->vcp[ind] = NULL;
+		}
+	}
+	
+	return num;
+}
+
 /* read capabilities raw data of ddc/ci at address addr starting at offset to buf */
 static int ddcci_raw_caps(struct monitor* mon, unsigned int offset, unsigned char *buf, unsigned char len)
 {
@@ -576,8 +709,9 @@
 	return ddcci_read(mon, buf, len);
 }
 
-int ddcci_caps(struct monitor* mon, unsigned char *buffer, unsigned int buflen)
+int ddcci_caps(struct monitor* mon)
 {
+	mon->caps.raw_caps = (char*)malloc(16);
 	int bufferpos = 0;
 	unsigned char buf[64];	/* 64 bytes chunk (was 35, but 173P+ send 43 bytes chunks) */
 	int offset = 0;
@@ -585,7 +719,7 @@
 	int retries = 3;
 	
 	do {
-		buffer[bufferpos] = 0;
+		mon->caps.raw_caps[bufferpos] = 0;
 		if (retries == 0) {
 			return -1;
 		}
@@ -605,14 +739,9 @@
 			continue;
 		}
 
+		mon->caps.raw_caps = (char*)realloc(mon->caps.raw_caps, bufferpos + len - 2);
 		for (i = 3; i < len; i++) {
-			buffer[bufferpos++] = buf[i];
-			if (bufferpos >= buflen) {
-				if (!mon->probing || verbosity) {
-					fprintf(stderr, _("Buffer too small to contain caps.\n"));
-				}
-				return -1;
-			}
+			mon->caps.raw_caps[bufferpos++] = buf[i];
 		}
 		
 		offset += len - 3;
@@ -620,7 +749,9 @@
 		retries = 3;
 	} while (len != 3);
 
-	buffer[bufferpos] = 0;
+	mon->caps.raw_caps[bufferpos] = 0;
+	
+	ddcci_parse_caps(mon->caps.raw_caps, &mon->caps, 1);
 	
 	return bufferpos;
 }
@@ -749,37 +880,45 @@
 		return -2;
 	}
 	
-	unsigned char buf[1024];
-	
-	if (ddcci_caps(mon, buf, 1024) > -1) {
-		mon->db = ddcci_create_db(mon->pnpid, buf, 1);
-	}
-	else {
-		mon->db = ddcci_create_db(mon->pnpid, "", 1);
-	}
+	ddcci_caps(mon);
+	mon->db = ddcci_create_db(mon->pnpid, &mon->caps, 1);
+	mon->fallback = 0; /* No fallback */
 	
-	if (mon->db) {
-		if (mon->db->init == samsung) {
-			if (ddcci_writectrl(mon, DDCCI_CTRL, DDCCI_CTRL_ENABLE, 0) < 0) {
-				return -1;
-			}
+	if (!mon->db) {
+		/* Fallback on manufacturer generic profile */
+		char buffer[7];
+		buffer[0] = 0;
+		strncat(buffer, mon->pnpid, 3); /* copy manufacturer id */
+		switch(mon->caps.type) {
+		case lcd:
+			strcat(buffer, "lcd");
+			mon->db = ddcci_create_db(buffer, &mon->caps, 1);
+			mon->fallback = 1;
+			break;
+		case crt:
+			strcat(buffer, "crt");
+			mon->db = ddcci_create_db(buffer, &mon->caps, 1);
+			mon->fallback = 1;
+			break;
+		case unk:
+			break;
 		}
-		else {
-			if (ddcci_command(mon, DDCCI_COMMAND_PRESENCE) < 0) {
-				return -1;
-			}
+		
+		if (!mon->db) {
+			/* Fallback on VESA generic profile */
+			mon->db = ddcci_create_db("VESA", &mon->caps, 1);
+			mon->fallback = 2;
 		}
 	}
-	else { /* Alternate way of init mode detecting for unsupported monitors */
-		if (strncmp(mon->pnpid, "SAM", 3) == 0) {
-			if (ddcci_writectrl(mon, DDCCI_CTRL, DDCCI_CTRL_ENABLE, 0) < 0) {
-				return -1;
-			}
+	
+	if ((mon->db) && (mon->db->init == samsung)) {
+		if (ddcci_writectrl(mon, DDCCI_CTRL, DDCCI_CTRL_ENABLE, 0) < 0) {
+			return -1;
 		}
-		else {
-			if (ddcci_command(mon, DDCCI_COMMAND_PRESENCE) < 0) {
-				return -1;
-			}
+	}
+	else {
+		if (ddcci_command(mon, DDCCI_COMMAND_PRESENCE) < 0) {
+			return -1;
 		}
 	}
 	
@@ -821,6 +960,16 @@
 		}
 	}
 	
+	int i;
+	for (i = 0; i < 256; i++) {
+		if(mon->caps.vcp[i]) {
+			if (mon->caps.vcp[i]->values) {
+				free(mon->caps.vcp[i]->values);
+			}
+			free(mon->caps.vcp[i]);
+		}
+	}
+	
 	if (mon->profiles) {
 		ddcci_free_profile(mon->profiles);
 	}

[ddccontrol-cvs] ddccontrol/src/gddccontrol main.c,1.29,1.30 notebook.c,1.28,1.29 notebook.h,1.12,1.13

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol/src/gddccontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31930/src/gddccontrol

Modified Files:
	main.c notebook.c notebook.h 
Log Message:
Fallback to generic profiles when a monitor is not supported in the database (displaying a big warning inviting the users to send their dumps to ddccontrol-users).

Index: main.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/gddccontrol/main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- main.c	4 Nov 2005 11:05:37 -0000	1.29
+++ main.c	23 Feb 2006 21:48:56 -0000	1.30
@@ -33,7 +33,9 @@
 GtkWidget *combo_box;
 GtkWidget* refresh_monitors_button;
 
+GtkWidget *messagebox = NULL;
 GtkWidget *messagelabel = NULL;
+GtkWidget *messagebutton = NULL;
 GtkWidget *statuslabel = NULL;
 
 GtkWidget* close_button = NULL;
@@ -115,7 +117,6 @@
 				snprintf(buffer, 256, "%s: %s", current->filename, current->name);
 				create_monitor_manager(current);
 				if (monitor_manager) {
-					gtk_widget_show(monitor_manager);
 					gtk_widget_set_sensitive(refresh_controls_button, TRUE);
 				}
 				else {
@@ -223,11 +224,22 @@
 	gtk_label_set_text(GTK_LABEL(statuslabel), message);
 }
 
-/* Show a message on top of every other controls. */
-void set_message(char* message)
+static void messagebutton_callback(GtkWidget *widget, gpointer data)
+{
+	set_message("");
+}
+
+void set_message(char* message) {
+	set_message_ok(message, 0);
+}
+
+/* Show a message on top of every other controls, with a ok button
+ * if the user can hide it himself. */
+void set_message_ok(char* message, int with_ok)
 {
+	gtk_widget_show(messagebutton);
 	if (!message[0]) {
-		gtk_widget_hide(messagelabel);
+		gtk_widget_hide(messagebox);
 		if (monitor_manager) {
 			set_current_main_component(current_main_component);
 		}
@@ -237,9 +249,18 @@
 		return;
 	}
 	
+	gtk_label_set_markup(GTK_LABEL(messagelabel), message);
+	
 	widgets_set_sensitive(FALSE);
-	gtk_label_set_text(GTK_LABEL(messagelabel), message);
-	gtk_widget_show(messagelabel);
+	
+	gtk_widget_show(messagebox);
+	if (with_ok) {
+		gtk_widget_show(messagebutton);
+	}
+	else {
+		gtk_widget_hide(messagebutton);
+	}
+	
 	if (monitor_manager) {
 		gtk_widget_hide(monitor_manager);
 		gtk_widget_hide(profile_manager);
@@ -483,10 +504,24 @@
 	gtk_table_attach(GTK_TABLE(table), hsep, 0, 1, crow, crow+1, GTK_FILL_EXPAND, GTK_SHRINK, 0, 0);
 	crow++;
 	
-	/* Status message label (used when loading or refreshing) */
+	/* Status message label (used when loading or refreshing, or when displaying some kind of warnings) */
+	messagebox = gtk_vbox_new(FALSE, 10);
+	
 	messagelabel = gtk_label_new ("");
 	gtk_label_set_line_wrap(GTK_LABEL(messagelabel), TRUE);
-	gtk_table_attach(GTK_TABLE(table), messagelabel, 0, 1, crow, crow+1, GTK_FILL_EXPAND, GTK_FILL_EXPAND, 5, 5);
+	gtk_box_pack_start(GTK_BOX(messagebox), messagelabel, 1, 1, 0);
+	gtk_widget_show(messagelabel);
+	
+	GtkWidget* messagealign = gtk_alignment_new(0.5, 0.5, 0, 0);
+	messagebutton = stock_label_button(GTK_STOCK_OK, _("OK"), NULL);
+	g_signal_connect(G_OBJECT(messagebutton), "clicked", G_CALLBACK(messagebutton_callback), NULL);
+	gtk_container_add(GTK_CONTAINER(messagealign), messagebutton);
+	gtk_widget_show(messagebutton);
+	
+	gtk_box_pack_start(GTK_BOX(messagebox), messagealign, 0, 0, 10);
+	gtk_widget_show(messagealign);
+	
+	gtk_table_attach(GTK_TABLE(table), messagebox, 0, 1, crow, crow+1, GTK_FILL_EXPAND, GTK_FILL_EXPAND, 5, 5);
 	mainrow = crow;
 	crow++;
 	

Index: notebook.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/gddccontrol/notebook.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- notebook.c	14 Feb 2006 21:59:05 -0000	1.28
+++ notebook.c	23 Feb 2006 21:48:56 -0000	1.29
@@ -113,7 +113,9 @@
 	unsigned short currentValue = 1;
 	unsigned short currentMaximum = 1;
 	
-	set_message(g_strdup_printf(_("Refreshing controls values (%d%%)..."), (current*100)/count));
+	gchar* tmp = g_strdup_printf(_("Refreshing controls values (%d%%)..."), (current*100)/count);
+	set_message(tmp);
+	g_free(tmp);
 	
 	refreshing = 1; /* Tell callbacks not to write values back to the monitor. */
 	while (list) {
@@ -123,7 +125,9 @@
 				get_value_and_max(control, &currentValue, &currentMaximum);
 				change_control_value(list->data, (gpointer)(long)currentValue);
 			}
-			set_message(g_strdup_printf(_("Refreshing controls values (%d%%)..."), (current*100)/count));
+			gchar* tmp = g_strdup_printf(_("Refreshing controls values (%d%%)..."), (current*100)/count);
+			set_message(tmp);
+			g_free(tmp);
 		}
 		else {
 			g_warning(_("Could not get the control_db struct related to a control."));
@@ -591,6 +595,18 @@
 		return;
 	}
 	
+	if (!mon->db) {
+		tmp = g_strdup_printf(_(
+			"The current monitor is not supported, please run\n"
+			"%s\n"
+			"and send the output to ddc...@li....\n"
+			"Thanks."), "<tt>LANG= LC_ALL= ddccontrol -p -c -d</tt>");
+		set_message(tmp);
+		g_free(tmp);
+		monitor_manager = NULL;
+		return;
+	}
+	
 	GtkWidget *notebook = gtk_notebook_new();
 	
 	struct group_db* group;
@@ -651,9 +667,41 @@
 	
 	create_profile_manager();
 	
-	set_message("");
-	
 	monitor_manager = table;
+	
+	if (mon->fallback) {
+		/* Put a big warning. */
+		gchar* message;
+		if (mon->fallback == 1) {
+			message = g_strdup(_(
+				"There is no support for your monitor in the database, but ddccontrol is "
+				"using a generic profile for your monitor's manufacturer. Some controls "
+				"may not be supported, or may not work as expected.\n"));
+		}
+		else if (mon->fallback == 2) {
+			message = g_strdup(_(
+				"There is no support for your monitor in the database, but ddccontrol is "
+				"using a basic generic profile. Many controls will not be supported, and "
+				"some controls may not work as expected.\n"));
+		}
+		
+		gchar* tmp = g_strconcat("<span size='large' weight='ultrabold'>", _("Warning!"), "</span>\n\n", 
+				message, _(
+				"Please update ddccontrol-db, or, if you are already using the latest "
+				"version, please send the output of the following command to "
+				"ddc...@li...:\n"
+				),
+				"\n<tt>LANG= LC_ALL= ddccontrol -p -c -d</tt>\n\n",
+				_("Thank you.\n"), NULL);
+		gtk_widget_show(monitor_manager);
+		set_message_ok(tmp, 1);
+		g_free(message);
+		g_free(tmp);
+	}
+	else {
+		set_message("");
+		gtk_widget_show(monitor_manager);
+	}
 }
 
 // Cleanup

Index: notebook.h
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/gddccontrol/notebook.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- notebook.h	4 Nov 2005 11:05:37 -0000	1.12
+++ notebook.h	23 Feb 2006 21:48:56 -0000	1.13
@@ -87,6 +87,7 @@
 
 /* Show a message on top of every other controls. */
 void set_message(char* message);
+void set_message_ok(char* message, int with_ok);
 
 GtkWidget *stock_label_button(const gchar * stockid, const gchar *label_text, const gchar *tool_tip);
 

[ddccontrol-cvs] ddccontrol/src/ddccontrol main.c,1.30,1.31

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol/src/ddccontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31930/src/ddccontrol

Modified Files:
	main.c 
Log Message:
Fallback to generic profiles when a monitor is not supported in the database (displaying a big warning inviting the users to send their dumps to ddccontrol-users).

Index: main.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddccontrol/main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- main.c	23 Feb 2006 12:51:08 -0000	1.30
+++ main.c	23 Feb 2006 21:48:56 -0000	1.31
@@ -81,15 +81,15 @@
 				}
 				if (controlname == NULL) {
 					fprintf(stdout, "%s 0x%02x: %c/%d/%d %c [???]\n", _("Control"),
-						ctrl, (result > 0) ? '+' : '-', value, maximum, (monitor->caps[ctrl]) ? 'C' : ' ');
+						ctrl, (result > 0) ? '+' : '-', value, maximum, (mon->caps.vcp[ctrl]) ? 'C' : ' ');
 				}
 				else if (valuename == NULL) {
 					fprintf(stdout, "%s 0x%02x: %c/%d/%d %c [%s]\n", _("Control"),
-						ctrl, (result > 0) ? '+' : '-',  value, maximum, (monitor->caps[ctrl]) ? 'C' : ' ', controlname);
+						ctrl, (result > 0) ? '+' : '-',  value, maximum, (mon->caps.vcp[ctrl]) ? 'C' : ' ', controlname);
 				}
 				else {
 					fprintf(stdout, "%s 0x%02x: %c/%d/%d %c [%s - %s]\n", _("Control"),
-						ctrl, (result > 0) ? '+' : '-',  value, maximum, (monitor->caps[ctrl]) ? 'C' : ' ', controlname, valuename);
+						ctrl, (result > 0) ? '+' : '-',  value, maximum, (mon->caps.vcp[ctrl]) ? 'C' : ' ', controlname, valuename);
 				}
 			}
 			break;
@@ -137,8 +137,11 @@
 	}
 	strcat(buffer, "))");
 	
+	struct caps caps;
+	ddcci_parse_caps(buffer, &caps, 1);
+	
 	printf(_("Checking %s integrity...\n"), pnpname);
-	if (!(mon_db = ddcci_create_db(pnpname, buffer, 0))) {
+	if (!(mon_db = ddcci_create_db(pnpname, &caps, 0))) {
 		printf(_("[ FAILED ]\n"));
 		ddcci_release_db();
 		exit(1);
@@ -314,15 +317,59 @@
 		fprintf(stdout, _("\tPlug and Play ID: %s [%s]\n"), 
 			mon.pnpid, mon.db ? mon.db->name : NULL);
 		fprintf(stdout, _("\tInput type: %s\n"), mon.digital ? _("Digital") : _("Analog"));
-
+		
+		if (mon.fallback) {
+			/* Put a big warning (in red if we are writing to a terminal). */
+			printf("%s%s\n", isatty(1) ? "\x1B[5;31m" : "", _("=============================== WARNING ==============================="));
+			if (mon.fallback == 1) {
+				printf(_(
+					"There is no support for your monitor in the database, but ddccontrol is\n"
+					"using a generic profile for your monitor's manufacturer. Some controls\n"
+					"may not be supported, or may not work as expected.\n"));
+			}
+			else if (mon.fallback == 2) {
+				printf(_(
+					"There is no support for your monitor in the database, but ddccontrol is\n"
+					"using a basic generic profile. Many controls will not be supported, and\n"
+					"some controls may not work as expected.\n"));
+			}
+			printf(_(
+					"Please update ddccontrol-db, or, if you are already using the latest\n"
+					"version, please send the output of the following command to\n"
+					"ddc...@li...:\n"));
+			printf("\nLANG= LC_ALL= ddccontrol -p -c -d\n\n");
+			printf(_("Thank you.\n"));
+			printf("%s%s\n", _("=============================== WARNING ==============================="), isatty(1) ? "\x1B[0m" : "");
+		}
+		
 		if (caps) {
-			unsigned char buf[1024];
-			
 			fprintf(stdout, _("\nCapabilities:\n"));
 			
 			for (retry = RETRYS; retry; retry--) {
-				if (ddcci_caps(&mon, buf, 1024) >= 0) {
-					fprintf(stdout, "%s\n", buf);
+				if (ddcci_caps(&mon) >= 0) {
+					fprintf(stdout, _("Raw output: %s\n"), mon.caps.raw_caps);
+					
+					fprintf(stdout, _("Parsed output: \n\tVCP: "));
+					int i;
+					for (i = 0; i < 256; i++) {
+						if (mon.caps.vcp[i]) {
+							printf("%02x ", i);
+						}
+					}
+					printf("\n");
+					printf(_("\tType: "));
+					switch(mon.caps.type) {
+					case lcd:
+						printf(_("LCD"));
+						break;
+					case crt:
+						printf(_("CRT"));
+						break;
+					case unk:
+						printf(_("Unknown"));
+						break;
+					}
+					printf("\n");
 					break;
 				}
 			}

[ddccontrol-cvs] ddccontrol-db ChangeLog,1.67,1.68

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30074

Modified Files:
	ChangeLog 
Log Message:
Update ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- ChangeLog	23 Feb 2006 00:54:45 -0000	1.67
+++ ChangeLog	23 Feb 2006 21:45:21 -0000	1.68
@@ -1,3 +1,16 @@
+2006-02-23 21:44  nboichat
+
+	* db/monitor/VESA.xml, po/fr.po: Update French translation.
+
+2006-02-23 13:01  nboichat
+
+	* db/: options.xml, options.xml.h, options.xml.in,
+	  monitor/FUS0550.xml, monitor/FUS0552.xml, monitor/FUS0554.xml,
+	  monitor/FUS0555.xml, monitor/FUSlcd.xml, monitor/MEL44B0.xml,
+	  monitor/MEL4513.xml, monitor/MEL4632.xml, monitor/MELcrt.xml,
+	  monitor/SAMlcd.xml: Create Mitsubishi and Fujitsu generic
+	  profiles.
+
 2006-02-23 00:54  nboichat
 
 	* configure.ac, db/Makefile.am, db/Makefile.in, db/options.xml,

[ddccontrol-cvs] ddccontrol-db/po fr.po,1.10,1.11

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29689/po

Modified Files:
	fr.po 
Log Message:
Update French translation.

Index: fr.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/po/fr.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fr.po	23 Feb 2006 00:54:31 -0000	1.10
+++ fr.po	23 Feb 2006 21:44:56 -0000	1.11
@@ -9,7 +9,7 @@
 "Project-Id-Version: DDC/CI control tool database\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-02-23 01:52+0100\n"
-"PO-Revision-Date: 2005-11-14 18:30+0100\n"
+"PO-Revision-Date: 2006-02-23 22:43+0100\n"
 "Last-Translator: Nicolas Boichat <ni...@bo...>\n"
 "Language-Team: French <tr...@tr...>\n"
 "MIME-Version: 1.0\n"
@@ -55,19 +55,20 @@
 #: ../db/options.xml.h:10
 #, c-format
 msgid "Game"
-msgstr ""
+msgstr "Jeu"
 
 #: ../db/options.xml.h:11
 #, c-format
 msgid "Sport"
-msgstr ""
+msgstr "Sport"
 
 #: ../db/options.xml.h:12
 #, c-format
 msgid "Entertain"
 msgstr "Divertissement"
 
-#: ../db/options.xml.h:13 ../db/options.xml.h:46
+#: ../db/options.xml.h:13
+#: ../db/options.xml.h:46
 #, c-format
 msgid "Custom"
 msgstr "Personnalisé"
@@ -92,70 +93,71 @@
 msgid "Three"
 msgstr "Trois"
 
-#: ../db/options.xml.h:18 ../db/options.xml.h:19
+#: ../db/options.xml.h:18
+#: ../db/options.xml.h:19
 #, c-format
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: ../db/options.xml.h:20
 #, c-format
 msgid "-0.5"
-msgstr ""
+msgstr "-0.5"
 
 #: ../db/options.xml.h:21
 #, c-format
 msgid "-0.3"
-msgstr ""
+msgstr "-0.3"
 
 #: ../db/options.xml.h:22
 #, c-format
 msgid "-0.1"
-msgstr ""
+msgstr "-0.1"
 
 #: ../db/options.xml.h:23
 #, c-format
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../db/options.xml.h:24
 #, c-format
 msgid "+0.1"
-msgstr ""
+msgstr "+0.1"
 
 #: ../db/options.xml.h:25
 #, c-format
 msgid "+0.3"
-msgstr ""
+msgstr "+0.3"
 
 #: ../db/options.xml.h:26
 #, c-format
 msgid "+0.5"
-msgstr ""
+msgstr "+0.5"
 
 #: ../db/options.xml.h:27
 #, c-format
 msgid "+0.7"
-msgstr ""
+msgstr "+0.7"
 
 #: ../db/options.xml.h:28
 #, c-format
 msgid "+0.9"
-msgstr ""
+msgstr "+0.9"
 
 #: ../db/options.xml.h:29
 #, c-format
 msgid "Mode 1"
-msgstr ""
+msgstr "Mode 1"
 
 #: ../db/options.xml.h:30
 #, c-format
 msgid "Mode 2"
-msgstr ""
+msgstr "Mode 2"
 
 #: ../db/options.xml.h:31
 #, c-format
 msgid "Mode 3"
-msgstr ""
+msgstr "Mode 3"
 
 #: ../db/options.xml.h:32
 #, c-format
@@ -222,7 +224,8 @@
 msgid "Color Preset"
 msgstr "Paramètres de couleur prédéfinis"
 
-#: ../db/options.xml.h:45 ../db/options.xml.h:151
+#: ../db/options.xml.h:45
+#: ../db/options.xml.h:151
 #, c-format
 msgid "Normal"
 msgstr "Normal"
@@ -238,49 +241,49 @@
 msgstr "Froid"
 
 #: ../db/options.xml.h:49
-#, fuzzy, c-format
+#, c-format
 msgid "Warm1"
-msgstr "Chaud"
+msgstr "Chaud1"
 
 #: ../db/options.xml.h:50
-#, fuzzy, c-format
+#, c-format
 msgid "Warm2"
-msgstr "Chaud"
+msgstr "Chaud2"
 
 #: ../db/options.xml.h:51
-#, fuzzy, c-format
+#, c-format
 msgid "Cool1"
-msgstr "Froid"
+msgstr "Froid1"
 
 #: ../db/options.xml.h:52
-#, fuzzy, c-format
+#, c-format
 msgid "Cool2"
-msgstr "Froid"
+msgstr "Froid2"
 
 #: ../db/options.xml.h:53
-#, fuzzy, c-format
+#, c-format
 msgid "Cool3"
-msgstr "Froid"
+msgstr "Froid3"
 
 #: ../db/options.xml.h:54
-#, fuzzy, c-format
+#, c-format
 msgid "Cool4"
-msgstr "Froid"
+msgstr "Froid4"
 
 #: ../db/options.xml.h:55
-#, fuzzy, c-format
+#, c-format
 msgid "Cool5"
-msgstr "Froid"
+msgstr "Froid5"
 
 #: ../db/options.xml.h:56
-#, fuzzy, c-format
+#, c-format
 msgid "Cool6"
-msgstr "Froid"
+msgstr "Froid6"
 
 #: ../db/options.xml.h:57
-#, fuzzy, c-format
+#, c-format
 msgid "Cool7"
-msgstr "Froid"
+msgstr "Froid7"
 
 #: ../db/options.xml.h:58
 #, c-format
@@ -355,9 +358,11 @@
 #: ../db/options.xml.h:72
 #, c-format
 msgid "MagicColor"
-msgstr ""
+msgstr "MagicColor"
 
-#: ../db/options.xml.h:73 ../db/options.xml.h:181 ../db/options.xml.h:190
+#: ../db/options.xml.h:73
+#: ../db/options.xml.h:181
+#: ../db/options.xml.h:190
 #, c-format
 msgid "Off"
 msgstr "Éteint"
@@ -365,17 +370,17 @@
 #: ../db/options.xml.h:74
 #, c-format
 msgid "Demo"
-msgstr ""
+msgstr "Demo"
 
 #: ../db/options.xml.h:75
 #, c-format
 msgid "Full"
-msgstr ""
+msgstr "Complet"
 
 #: ../db/options.xml.h:76
-#, fuzzy, c-format
+#, c-format
 msgid "Intelligent"
-msgstr "Internet"
+msgstr "Intelligent"
 
 #: ../db/options.xml.h:77
 #, c-format
@@ -427,12 +432,16 @@
 msgid "Auto Size Center"
 msgstr "Centrage et redimensionnement automatique"
 
-#: ../db/options.xml.h:87 ../db/options.xml.h:158 ../db/options.xml.h:162
+#: ../db/options.xml.h:87
+#: ../db/options.xml.h:158
+#: ../db/options.xml.h:162
 #, c-format
 msgid "Enable"
 msgstr "Activer"
 
-#: ../db/options.xml.h:88 ../db/options.xml.h:157 ../db/options.xml.h:161
+#: ../db/options.xml.h:88
+#: ../db/options.xml.h:157
+#: ../db/options.xml.h:161
 #, c-format
 msgid "Disable"
 msgstr "Désactiver"
@@ -454,9 +463,9 @@
 msgstr "Boucle d'image (horloge et phase d'horloge)"
 
 #: ../db/options.xml.h:92
-#, fuzzy, c-format
+#, c-format
 msgid "H/V Position (fast mode)"
-msgstr "Position H/V"
+msgstr "Position H/V (rapide)"
 
 #: ../db/options.xml.h:93
 #, c-format
@@ -743,12 +752,14 @@
 msgid "Audio Microphone Volume Adjust"
 msgstr "Volume du microphone"
 
-#: ../db/options.xml.h:149 ../db/options.xml.h:150
+#: ../db/options.xml.h:149
+#: ../db/options.xml.h:150
 #, c-format
 msgid "Mute"
 msgstr "Muet"
 
-#: ../db/options.xml.h:152 ../db/options.xml.h:153
+#: ../db/options.xml.h:152
+#: ../db/options.xml.h:153
 #, c-format
 msgid "Degauss"
 msgstr "Démagnétiser"
@@ -774,9 +785,9 @@
 msgstr "Activer seulement le contrôle de la luminosité et du contraste"
 
 #: ../db/options.xml.h:160
-#, fuzzy, c-format
+#, c-format
 msgid "On Screen Display (Samsung)"
-msgstr "Affichage à l'écran (OSD)"
+msgstr "Affichage à l'écran (OSD) (Samsung)"
 
 #: ../db/options.xml.h:163
 #, c-format
@@ -846,7 +857,7 @@
 #: ../db/options.xml.h:176
 #, c-format
 msgid "Japanese"
-msgstr ""
+msgstr "Japonais"
 
 #: ../db/options.xml.h:177
 #, c-format
@@ -863,7 +874,9 @@
 msgid "Display Resolution Notifier"
 msgstr "Affichage de la résolution"
 
-#: ../db/options.xml.h:180 ../db/options.xml.h:187 ../db/options.xml.h:191
+#: ../db/options.xml.h:180
+#: ../db/options.xml.h:187
+#: ../db/options.xml.h:191
 #, c-format
 msgid "On"
 msgstr "Allumé"
@@ -883,7 +896,8 @@
 msgid "Digital"
 msgstr "Digital"
 
-#: ../db/options.xml.h:185 ../db/options.xml.h:189
+#: ../db/options.xml.h:185
+#: ../db/options.xml.h:189
 #, c-format
 msgid "Power control"
 msgstr "Allumer/éteindre"
@@ -897,3 +911,4 @@
 #, c-format
 msgid "Standby"
 msgstr "En veille"
+

[ddccontrol-cvs] ddccontrol-db/db/monitor VESA.xml,1.1,1.2

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29689/db/monitor

Modified Files:
	VESA.xml 
Log Message:
Update French translation.

Index: VESA.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/VESA.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- VESA.xml	23 Feb 2006 00:54:31 -0000	1.1
+++ VESA.xml	23 Feb 2006 21:44:56 -0000	1.2
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--- "Standard" controls -->
-<monitor name="VESA standard controls" init="standard">
+<monitor name="VESA standard monitor" init="standard">
 	<controls>
 		<control id="degauss" address="0x00"/>
 		

[ddccontrol-cvs] ddccontrol-db/db/monitor FUSlcd.xml,NONE,1.1 MELcrt.xml,NONE,1.1 FUS0550.xml,1.2,1.3 FUS0552.xml,1.5,1.6 FUS0554.xml,1.2,1.3 FUS0555.xml,1.2,1.3 MEL44B0.xml,1.3,1.4 MEL4513.xml,1.11,1.12 MEL4632.xml,1.4,1.5 SAMlcd.xml,1.1,1.2

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24684/db/monitor

Modified Files:
	FUS0550.xml FUS0552.xml FUS0554.xml FUS0555.xml MEL44B0.xml 
	MEL4513.xml MEL4632.xml SAMlcd.xml 
Added Files:
	FUSlcd.xml MELcrt.xml 
Log Message:
Create Mitsubishi and Fujitsu generic profiles.

--- NEW FILE: MELcrt.xml ---
<?xml version="1.0"?>
<monitor name="Mitsubishi standard CRT">
	<controls>
		<control id="defaultsizepos" address="0x06" delay="1000"/>
		<control id="defaultluma" address="0x08" delay="1000"/>
		
		<control id="colorpreset" address="0x14">
			<value id="9300k"  value="1"/>
			<value id="6500k" value="2"/>
			<value id="5000k" value="3"/>
			<value id="srgb" value="4"/>
		</control>
		
		<control id="language" type="list" address="0x68">
			<value id="english" value="0"/>
			<value id="german"  value="1"/>
			<value id="french"  value="2"/>
			<value id="spanish" value="3"/>
			<value id="italian" value="4"/>
			<value id="chinese" value="5"/>
		</control>
		
		<!--- Control 0xe2: +/0/1 [Clamp Pulse Position] -->
		<control id="osd" type="list" address="0xE3"> <!--- Control lock = OSD lock ? -->
			<value id="enable"  value="0"/>
			<value id="disable" value="1"/>
		</control>
		
		<control id="cpincushion" address="0xE6"/>
		<control id="tlpurity" address="0xE8"/>
		<control id="trpurity" address="0xE9"/>
		<control id="blpurity" address="0xEA"/>
		<control id="brpurity" address="0xEB"/>
		
		<control id="superbright" address="0xF9"/> <!--- Needs to be tested -->
	</controls>
	<include file="VESA"/>
</monitor>
Index: MEL44B0.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/MEL44B0.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MEL44B0.xml	22 Feb 2006 22:16:40 -0000	1.3
+++ MEL44B0.xml	23 Feb 2006 13:01:13 -0000	1.4
@@ -8,34 +8,6 @@
 		44 46 4A 54 56 68 E1 E2 E3 E8 E9 EA EB EF)) 
 	-->
 	<caps add="(vcp (00))"/>
-	<controls>
-		<control id="colorpreset" address="0x14">
-			<!--- Maybe we could try to find the meaning of these values -->
-			<value id="user1" value="0"/>
-			<value id="user2" value="1"/>
-			<value id="user3" value="2"/>
-			<value id="user4" value="3"/>
-		</control>
-		
-		<control id="language" type="list" address="0x68">
-			<value id="english" value="0"/>
-			<value id="german"  value="1"/>
-			<value id="french"  value="2"/>
-			<value id="spanish" value="3"/>
-			<value id="italian" value="4"/>
-			<value id="chinese" value="5"/>
-		</control>
-
-		<!--- Control 0xe2: +/1/1 [Clamp Pulse Position] -->
-		<control id="osd" type="list" address="0xE3"> <!--- Control lock = OSD lock ? -->
-			<value id="enable"  value="0"/>
-			<value id="disable" value="1"/>
-		</control>
-		<control id="tlpurity" address="0xE8"/>
-		<control id="trpurity" address="0xE9"/>
-		<control id="blpurity" address="0xEA"/>
-		<control id="brpurity" address="0xEB"/>
-		<!--- Control 0xef: +/0/4 [OSD Position] -->
-	</controls>
-	<include file="VESA"/>
+	<!--- Control 0xef: +/0/4 [OSD Position] -->
+	<include file="MELcrt"/>
 </monitor>

Index: FUS0554.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0554.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FUS0554.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ FUS0554.xml	23 Feb 2006 13:01:13 -0000	1.3
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!---The P20-2 is identical to P19-2 -->
 <monitor name="Fujitsu Siemens P20-2 (VGA)">
-	<include file="FUS0552"/>
+	<include file="FUSlcd"/>
 </monitor>
\ No newline at end of file

Index: FUS0555.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0555.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FUS0555.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ FUS0555.xml	23 Feb 2006 13:01:13 -0000	1.3
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!---The P20-2 is identical to P19-2 -->
 <monitor name="Fujitsu Siemens P20-2 (DVI)">
-	<include file="FUS0552"/>
+	<include file="FUSlcd"/>
 </monitor>
\ No newline at end of file

Index: SAMlcd.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAMlcd.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAMlcd.xml	23 Feb 2006 00:54:31 -0000	1.1
+++ SAMlcd.xml	23 Feb 2006 13:01:13 -0000	1.2
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--- "Standard" Samsung controls, 87, CA, CC, F5 are useful but usually not in caps -->
-<monitor name="Samsung LCD standard controls">
+<monitor name="Samsung standard LCD">
 	<caps add="(vcp(E1))"/>
 	<controls>
 		<control id="auto" address="0x1e">

Index: FUS0552.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0552.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FUS0552.xml	23 Feb 2006 00:54:31 -0000	1.5
+++ FUS0552.xml	23 Feb 2006 13:01:13 -0000	1.6
@@ -1,74 +1,4 @@
 <?xml version="1.0"?>
-<monitor name="Fujitsu Siemens P19-2" init="standard">
-	<controls>
-		<!-- 0x02: +/1/2 New control value -->
-
-		<control id="colorpreset" address="0x14">
-			<value id="srgb"   value="0x1"/>
-			<value id="native" value="0x2"/>
-			<value id="4000k"  value="0x3"/>
-			<value id="5000k"  value="0x4"/>
-			<value id="6500k"  value="0x5"/>
-			<value id="7500k"  value="0x6"/>
-			<value id="8200k"  value="0x7"/>
-			<value id="9300k"  value="0x8"/>
-			<value id="10000k" value="0x9"/>
-			<value id="11500k" value="0xA"/>
-			<value id="user1"  value="0xB"/>
-			<value id="user2"  value="0xC"/>
-			<value id="user3"  value="0xD"/>
-		</control>
-
-		<control id="auto" address="0x1e">
-			<value id="coarsefine" value="1"/>
-			<value id="pos" value="2"/>
-		</control>
-		
-		<control id="mute" type="list" address="0x94">
-			<value id="mute" value="0"/>
-			<value id="normal" value="2"/>
-		</control>
-
-		<!-- 0xac: +/6390/0 Horizontal freq.  [kHz] -->
-		<!-- 0xae: +/5990/0 Vertical freq. [Hz] -->
-		<!-- 0xb2: +/1/0 Flat panel sub pixel layout
-			[1: RGB vertical stripe
-			 2: RGB horizontal stripe
-			 3: BGR vertical stripe
-			 4: BGR horizontal stripe] -->
-		<!-- 0xb6: +/3/0 Monitor Type
-			[1: CRT (shadow mask)
-			 2: CRT (aperture grill)
-			 3: TFT
-			 4: Projector 
-			 5: Plasma -->
-		<!-- 0xc0: +/61/0 Display usage time [h] -->
-		<!-- 0xc6: +/69/0 unknown -->
-		<!-- 0xc8: +/5/0 Display controller type -->
-		<!-- 0xc9: +/19714/0 Display firmware level -->
-		<control id="osd" type="list" address="0xca">
-			<value id="disable" value="1"/>
-			<value id="enable" value="2"/>
-		</control>
-
-		<control id="language" type="list" address="0xcc">
-			<value id="english" value="2"/>
-			<value id="french"  value="3"/>
-			<value id="german"  value="4"/>
-			<value id="italian" value="5"/>
-			<value id="russian" value="9"/>
-			<value id="spanish" value="10"/>
-			<value id="dutch"   value="11"/>
-			<value id="swedish" value="12"/>
-		</control>
-
-		<!-- 0xdf: +/512/0 VCP version (02 00) -->
-		<!-- 0xfe: Auto level : For the auto level function a suitable test
-picture is required which has at least 1 full white (0xFFFFFF) line. -->
-		<control id="resolutionnotifier" type="list" address="0xf6">
-			<value id="on" value="1"/>
-			<value id="off" value="0"/>
-		</control>
-	</controls>
-	<include file="VESA"/>
+<monitor name="Fujitsu Siemens P19-2">
+	<include file="FUSlcd"/>
 </monitor>

Index: FUS0550.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0550.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FUS0550.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ FUS0550.xml	23 Feb 2006 13:01:13 -0000	1.3
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!---The P17-2 is identical to P19-2 -->
 <monitor name="Fujitsu Siemens P17-2">
-	<include file="FUS0552"/>
+	<include file="FUSlcd"/>
 </monitor>

Index: MEL4632.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/MEL4632.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MEL4632.xml	23 Feb 2006 00:54:31 -0000	1.4
+++ MEL4632.xml	23 Feb 2006 13:01:13 -0000	1.5
@@ -2,9 +2,6 @@
 <monitor name="Mitsubishi Diamond Pro 2070sb">
 	<!---  mccs_ver(1.1) type(CRT_AG) vcp(00 01 04 06 08 10 12 14(01 04 06 07 08) 16 18 1A 1E 20 22 24 26 28 30 32 38 3A 3C 40 42 44 46 47 48 4A 4C 54 56 68 6C 6E 70 D6 E1 E2 E3 E6 E8 E9 EA EB EF F6 F9 FA FC FF) vcp_p02(3B 3C 42 43 44 46 49 4A 4B 4C 4E 4F 54 56) asset_eep(40) mpu_ver(2.1.0) -->
 	<controls>
-		<control id="defaultsizepos" address="0x06" delay="1000"/>
-		<control id="defaultluma" address="0x08" delay="1000"/>
-		
 		<control id="colorpreset" address="0x14">
 			<!--- Copied from NEC 2080UX+, needs to be checked -->
 			<value id="5000k"  value="4"/>
@@ -16,35 +13,12 @@
 		</control>
 	
 		<!--- Control 0x1e: +/0/1 [???] -->
-	
-		<control id="language" type="list" address="0x68">
-			<value id="english" value="0"/>
-			<value id="german"  value="1"/>
-			<value id="french"  value="2"/>
-			<value id="spanish" value="3"/>
-			<value id="italian" value="4"/>
-			<value id="chinese" value="5"/>
-		</control>
-
 		<!---Control 0xa8: +/1/3 [Sync Type]-->
-
-		<!--- Control 0xe2: +/0/1 [Clamp Pulse Position] -->
-		<control id="osd" type="list" address="0xE3"> <!--- Control lock = OSD lock ? -->
-			<value id="enable"  value="0"/>
-			<value id="disable" value="1"/>
-		</control>
-		<control id="cpincushion" address="0xE6"/>
-		<control id="tlpurity" address="0xE8"/>
-		<control id="trpurity" address="0xE9"/>
-		<control id="blpurity" address="0xEA"/>
-		<control id="brpurity" address="0xEB"/>
 		<!--- Control 0xef: +/0/4 [OSD Position] -->
-
 		<!--- Control 0xf6: +/0/1 [REFRESH NOTIFIER] -->
-		<control id="superbright" address="0xF9"/> <!--- Needs to be tested -->
 		<!--- Control 0xfa: +/6885/65535 [Total Power Time in 30 min, RO] -->
 		<!--- Control 0xfc: +/9/24 [OSD Turn Off Delay] -->
 		<!--- Control 0xff: +/6060/65535 [Power On Time in 30 min, RO] -->
 	</controls>
-	<include file="VESA"/>
+	<include file="MELcrt"/>
 </monitor>

Index: MEL4513.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/MEL4513.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- MEL4513.xml	22 Feb 2006 22:16:40 -0000	1.11
+++ MEL4513.xml	23 Feb 2006 13:01:13 -0000	1.12
@@ -6,23 +6,6 @@
 		  46 48 4A 4C 54 56 6C 6E 70 C9   E1 E2 E3 E8 E9 EA EB F7 FB FC ) )
 	-->
 	<caps add="(vcp ( 68 (00 01 02 03 04 05) ))"/>
-	<controls>
-		<control id="defaultsizepos" address="0x06" delay="1000"/>
-		<control id="defaultluma" address="0x08" delay="1000"/>
-		
-		<control id="tlpurity" address="0xE8"/>
-		<control id="trpurity" address="0xE9"/>
-		<control id="blpurity" address="0xEA"/>
-		<control id="brpurity" address="0xEB"/>
-		
-		<control id="language" type="list" address="0x68">
-			<value id="english" value="0"/>
-			<value id="german"  value="1"/>
-			<value id="french"  value="2"/>
-			<value id="spanish" value="3"/>
-			<value id="italian" value="4"/>
-			<value id="chinese" value="5"/>
-		</control>
-	</controls>
-	<include file="VESA"/>
+	<!--- 0xf7 Image mode: 0 - Graphic, 1 - Text, 2 - Normal -->
+	<include file="MELcrt"/>
 </monitor>

--- NEW FILE: FUSlcd.xml ---
<?xml version="1.0"?>
<!--- "Standard" Fujitsu controls, seems to be very standard-compliant (no missing control in CAPS, etc...). -->
<monitor name="Fujitsu Siemens Standard LCD" init="standard">
	<controls>
		<!-- 0x02: +/1/2 New control value -->
		
		<control id="colorpreset" address="0x14">
			<value id="srgb"   value="0x1"/>
			<value id="native" value="0x2"/>
			<value id="4000k"  value="0x3"/>
			<value id="5000k"  value="0x4"/>
			<value id="6500k"  value="0x5"/>
			<value id="7500k"  value="0x6"/>
			<value id="8200k"  value="0x7"/>
			<value id="9300k"  value="0x8"/>
			<value id="10000k" value="0x9"/>
			<value id="11500k" value="0xA"/>
			<value id="user1"  value="0xB"/>
			<value id="user2"  value="0xC"/>
			<value id="user3"  value="0xD"/>
		</control>
		
		<control id="auto" address="0x1e">
			<value id="coarsefine" value="1"/>
			<value id="pos" value="2"/>
		</control>
		
		<control id="mute" type="list" address="0x94">
			<value id="mute" value="0"/>
			<value id="normal" value="2"/>
		</control>
		
		<!-- 0xac: +/6390/0 Horizontal freq.  [kHz] -->
		<!-- 0xae: +/5990/0 Vertical freq. [Hz] -->
		<!-- 0xb2: +/1/0 Flat panel sub pixel layout
			 [1: RGB vertical stripe
			 2: RGB horizontal stripe
			 3: BGR vertical stripe
			 4: BGR horizontal stripe] -->
		<!-- 0xb6: +/3/0 Monitor Type
			 [1: CRT (shadow mask)
			 2: CRT (aperture grill)
			 3: TFT
			 4: Projector 
			 5: Plasma -->
		<!-- 0xc0: +/61/0 Display usage time [h] -->
		<!-- 0xc6: +/69/0 unknown -->
		<!-- 0xc8: +/5/0 Display controller type -->
		<!-- 0xc9: +/19714/0 Display firmware level -->
		<control id="osd" type="list" address="0xca">
			<value id="disable" value="1"/>
			<value id="enable" value="2"/>
		</control>
		
		<control id="language" type="list" address="0xcc">
			<value id="english" value="2"/>
			<value id="french"  value="3"/>
			<value id="german"  value="4"/>
			<value id="italian" value="5"/>
			<value id="russian" value="9"/>
			<value id="spanish" value="10"/>
			<value id="dutch"   value="11"/>
			<value id="swedish" value="12"/>
		</control>
		
		<!-- 0xdf: +/512/0 VCP version (02 00) -->
		<!-- 0xfe: Auto level : For the auto level function a suitable test
			 picture is required which has at least 1 full white (0xFFFFFF) line. -->
		<control id="autolevel" type="command" address="0xfe"/>
		<control id="resolutionnotifier" type="list" address="0xf6">
			<value id="on" value="1"/>
			<value id="off" value="0"/>
		</control>
	</controls>
	<include file="VESA"/>
</monitor>

[ddccontrol-cvs] ddccontrol-db/db options.xml,1.28,1.29 options.xml.h,1.10,1.11 options.xml.in,1.13,1.14

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24684/db

Modified Files:
	options.xml options.xml.h options.xml.in 
Log Message:
Create Mitsubishi and Fujitsu generic profiles.

Index: options.xml.h
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- options.xml.h	23 Feb 2006 00:54:31 -0000	1.10
+++ options.xml.h	23 Feb 2006 13:01:12 -0000	1.11
@@ -15,6 +15,7 @@
 printf(_("One"));
 printf(_("Two"));
 printf(_("Three"));
+printf(_("Auto Level (Needs a blank line to work)"));
 printf(_("Gamma"));
 printf(_("Gamma"));
 printf(_("-0.5"));

Index: options.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- options.xml	23 Feb 2006 00:54:31 -0000	1.28
+++ options.xml	23 Feb 2006 13:01:12 -0000	1.29
@@ -19,6 +19,7 @@
 				<value id="two" name="Two" value="1"/>
 				<value id="three" name="Three" value="2"/>
 			</control>
+			<control id="autolevel" type="command" name="Auto Level (Needs a blank line to work)"/>
 		</subgroup>
 		<subgroup name="Gamma" > 
 			<control id="gamma" type="list" name="Gamma" address="0xF2" >

Index: options.xml.in
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- options.xml.in	23 Feb 2006 00:54:31 -0000	1.13
+++ options.xml.in	23 Feb 2006 13:01:12 -0000	1.14
@@ -18,6 +18,7 @@
 				<value id="two" name="Two" value="1"/>
 				<value id="three" name="Three" value="2"/>
 			</control>
+			<control id="autolevel" type="command" name="Auto Level (Needs a blank line to work)"/>
 		</subgroup>
 		<subgroup name="Gamma" > 
 			<control id="gamma" type="list" name="Gamma" address="0xF2" >

[ddccontrol-cvs] ddccontrol ChangeLog,1.100,1.101

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18347

Modified Files:
	ChangeLog 
Log Message:
Update ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ChangeLog	22 Feb 2006 21:25:49 -0000	1.100
+++ ChangeLog	23 Feb 2006 12:51:37 -0000	1.101
@@ -1,3 +1,8 @@
+2006-02-23 12:51  nboichat
+
+	* src/: ddccontrol/main.c, lib/monitor_db.c, lib/monitor_db.h:
+	  Various bugfixes in DB version 3 handling.
+
 2006-02-22 21:25  nboichat
 
 	* configure.ac, doc/techdocs.xml, src/ddccontrol/main.c,

[ddccontrol-cvs] ddccontrol/src/lib monitor_db.c,1.28,1.29 monitor_db.h,1.10,1.11

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol/src/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17931/src/lib

Modified Files:
	monitor_db.c monitor_db.h 
Log Message:
Various bugfixes in DB version 3 handling.

Index: monitor_db.h
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/monitor_db.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- monitor_db.h	22 Feb 2006 21:25:07 -0000	1.10
+++ monitor_db.h	23 Feb 2006 12:51:08 -0000	1.11
@@ -24,7 +24,13 @@
 #include <libxml/xmlstring.h>
 
 /* Current database version */
-#define DBVERSION 2
+#define DBVERSION 3
+
+/* Structure to store CAPS entry (control and related values) */
+struct caps_entry {
+	int values_len; /* -1 if values are not specified */
+	unsigned short* values;
+};
 
 enum control_type {
 value = 0,
@@ -82,6 +88,8 @@
 	xmlChar* name;
 	enum init_type init;
 	
+	struct caps_entry* caps[256]; /* CAPS */
+	
 	struct group_db* group_list;
 };
 

Index: monitor_db.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/lib/monitor_db.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- monitor_db.c	22 Feb 2006 21:25:06 -0000	1.28
+++ monitor_db.c	23 Feb 2006 12:51:08 -0000	1.29
@@ -45,12 +45,6 @@
 
 xmlDocPtr options_doc = NULL;
 
-/* Structure to store CAPS entry (control and related values) */
-struct caps_entry {
-	int values_len; /* -1 if values were not specified */
-	unsigned short* values;
-};
-
 int get_verbosity(); /* Defined in ddcci.c */
 
 /* See documentation Appendix D.
@@ -286,7 +280,8 @@
 	return 0;
 }
 
-int ddcci_add_controls_to_subgroup(xmlNodePtr control, xmlNodePtr mon_control, struct subgroup_db *current_group, struct caps_entry** caps, char* defined, char *matchedcontrols, int faulttolerance) {
+int ddcci_add_controls_to_subgroup(xmlNodePtr control, xmlNodePtr mon_control, 
+		struct subgroup_db *current_group, struct caps_entry** caps, char* defined, char *matchedcontrols, int faulttolerance) {
 	xmlNodePtr cur;
 	xmlChar *mon_ctrlid;
 	xmlChar *options_ctrlid, *options_ctrlname;
@@ -296,9 +291,15 @@
 	int i;
 	
 	struct control_db *current_control = malloc(sizeof(struct control_db));
-	struct control_db **last_control_ref = &current_group->control_list;
+	struct control_db **last_control_ref = &current_group->control_list;	
 	memset(current_control, 0, sizeof(struct control_db));
 	
+	/* TODO: fix it, don't break order. */
+	/* This might break control order, but it is no big deal... */
+	while (*last_control_ref) {
+		last_control_ref = &(*last_control_ref)->next;
+	}
+	
 	/* List controls in group (options.xml) */
 	while (control != NULL)
 	{
@@ -447,7 +448,7 @@
  */
 int ddcci_create_db_protected(
 	struct monitor_db* mon_db, const char* pnpname, int recursionlevel,
-	struct caps_entry** caps, char* defined, int faulttolerance)
+	char* defined, int faulttolerance)
 {
 	xmlDocPtr mon_doc;
 	xmlNodePtr root, mon_child, mon_control;
@@ -507,6 +508,15 @@
 		}
 	}
 	
+	if ((tmp = xmlGetProp(root, BAD_CAST "include"))) {
+		if (faulttolerance)
+			fprintf(stderr, "Warning: include property is deprecated.\n");
+		else {
+			fprintf(stderr, "Error: include property is deprecated.\n");
+			return 0;
+		}
+	}
+	
 	/* Create group-subgroup structure (we'll clean it up later) */
 	if (!recursionlevel) {
 		/*printf("Creating struct...\n");*/
@@ -569,9 +579,9 @@
 			xmlChar* add = xmlGetProp(mon_child, BAD_CAST "add");
 			DDCCI_DB_RETURN_IF(!remove && !add, 0,  _("Can't find add or remove property in caps."), mon_child);
 			if (remove)
-				DDCCI_DB_RETURN_IF(ddcci_parse_caps(remove, caps, 0) <= 0, 0,  _("Invalid remove caps."), mon_child);
+				DDCCI_DB_RETURN_IF(ddcci_parse_caps(remove, mon_db->caps, 0) <= 0, 0,  _("Invalid remove caps."), mon_child);
 			if (add)
-				DDCCI_DB_RETURN_IF(ddcci_parse_caps(add, caps, 1) <= 0, 0,  _("Invalid add caps."), mon_child);
+				DDCCI_DB_RETURN_IF(ddcci_parse_caps(add, mon_db->caps, 1) <= 0, 0,  _("Invalid add caps."), mon_child);
 		}
 		else if (!xmlStrcmp(mon_child->name, (const xmlChar *) "include")) {
 			controls_or_include = 1;
@@ -583,7 +593,7 @@
 			
 			xmlChar* file = xmlGetProp(mon_child, BAD_CAST "file");
 			DDCCI_DB_RETURN_IF(file == NULL, 0,  _("Can't find file property."), mon_child);
-			if (!ddcci_create_db_protected(mon_db, file, recursionlevel+1, caps, defined, faulttolerance)) {
+			if (!ddcci_create_db_protected(mon_db, file, recursionlevel+1, defined, faulttolerance)) {
 				xmlFree(file);
 				return 0;
 			}
@@ -636,8 +646,8 @@
 					control = subgroup->xmlChildrenNode;
 					
 					DDCCI_DB_RETURN_IF(
-						!ddcci_add_controls_to_subgroup(control, mon_control, current_subgroup, caps, defined, matchedcontrols, faulttolerance),
-						0,  _("Error enumerating controls in subgroup."), control);
+						!ddcci_add_controls_to_subgroup(control, mon_control, current_subgroup, mon_db->caps,
+							defined, matchedcontrols, faulttolerance), 0,  _("Error enumerating controls in subgroup."), control);
 					current_subgroup = current_subgroup->next;
 				}
 				current_group = current_group->next;
@@ -713,18 +723,13 @@
 	struct monitor_db* mon_db = malloc(sizeof(struct monitor_db));
 	memset(mon_db, 0, sizeof(struct monitor_db));
 	
-	/* Parse caps, and fill structure array. */
-	struct caps_entry* caps[256];
-	
-	memset(caps, 0, 256*sizeof(struct caps_entry*));
+	ddcci_parse_caps(default_caps, mon_db->caps, 1);
 	
 	/* defined controls, when including another file, we don't define the same control 2 times.  */
 	char defined[256];
 	memset(defined, 0, 256*sizeof(char));
 	
-	ddcci_parse_caps(default_caps, caps, 1);
-	
-	if (!ddcci_create_db_protected(mon_db, pnpname, 0, caps, defined, faulttolerance)) {
+	if (!ddcci_create_db_protected(mon_db, pnpname, 0, defined, faulttolerance)) {
 		free(mon_db);
 		mon_db = NULL;
 	}
@@ -740,45 +745,7 @@
 			mon_db = NULL;
 		}
 	}
-	
-	int i;
-	for (i = 0; i < 256; i++) {
-		if(caps[i]) {
-			if (caps[i]->values) {
-				free(caps[i]->values);
-			}
-			free(caps[i]);
-		}
-	}
-	
-#ifdef DEBUG_DB_CREATION
-	struct monitor_db* monitor = mon_db;
-	struct group_db* group;
-	struct subgroup_db* subgroup;
-	struct control_db* control;
-	struct value_db* valued;
-	
-	/* loop through groups */
-	for (group = monitor->group_list; (group != NULL); group = group->next) 
-	{
-		printf("Group %p: %s\n", group, group->name);
-		/* loop through subgroups inside group */
-		for (subgroup = group->subgroup_list; (subgroup != NULL); subgroup = subgroup->next) 
-		{
-			printf("\tSubgroup %p: %s\n", subgroup, subgroup->name);
-			/* loop through controls inside subgroup */
-			for (control = subgroup->control_list; (control != NULL); control = control->next) 
-			{
-				printf("\t\tControl: %s 0x%02x\n", control->name, control->address);
-				/* look for the value */
-				for (valued = control->value_list; (valued != NULL); valued = valued->next) {
-					printf("\t\t\tValue: %s 0x%02x\n", valued->name, valued->value);
-				}
-			}
-		}
-	}
-#endif
-	
+		
 	return mon_db;
 }
 
@@ -837,7 +804,17 @@
 		group = ogroup->next;
 		free(ogroup);
 	}
-
+	
+	int i;
+	for (i = 0; i < 256; i++) {
+		if(monitor->caps[i]) {
+			if (monitor->caps[i]->values) {
+				free(monitor->caps[i]->values);
+			}
+			free(monitor->caps[i]);
+		}
+	}
+	
 	free(monitor);
 }
 

[ddccontrol-cvs] ddccontrol/src/ddccontrol main.c,1.29,1.30

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol/src/ddccontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17931/src/ddccontrol

Modified Files:
	main.c 
Log Message:
Various bugfixes in DB version 3 handling.

Index: main.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddccontrol/main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- main.c	22 Feb 2006 21:25:06 -0000	1.29
+++ main.c	23 Feb 2006 12:51:08 -0000	1.30
@@ -80,16 +80,16 @@
 					}
 				}
 				if (controlname == NULL) {
-					fprintf(stdout, "%s 0x%02x: %c/%d/%d [???]\n", _("Control"),
-						ctrl, (result > 0) ? '+' : '-',  value, maximum);
+					fprintf(stdout, "%s 0x%02x: %c/%d/%d %c [???]\n", _("Control"),
+						ctrl, (result > 0) ? '+' : '-', value, maximum, (monitor->caps[ctrl]) ? 'C' : ' ');
 				}
 				else if (valuename == NULL) {
-					fprintf(stdout, "%s 0x%02x: %c/%d/%d [%s]\n", _("Control"),
-						ctrl, (result > 0) ? '+' : '-',  value, maximum, controlname);
+					fprintf(stdout, "%s 0x%02x: %c/%d/%d %c [%s]\n", _("Control"),
+						ctrl, (result > 0) ? '+' : '-',  value, maximum, (monitor->caps[ctrl]) ? 'C' : ' ', controlname);
 				}
 				else {
-					fprintf(stdout, "%s 0x%02x: %c/%d/%d [%s - %s]\n", _("Control"),
-						ctrl, (result > 0) ? '+' : '-',  value, maximum, controlname, valuename);
+					fprintf(stdout, "%s 0x%02x: %c/%d/%d %c [%s - %s]\n", _("Control"),
+						ctrl, (result > 0) ? '+' : '-',  value, maximum, (monitor->caps[ctrl]) ? 'C' : ' ', controlname, valuename);
 				}
 			}
 			break;

[ddccontrol-cvs] ddccontrol-db ChangeLog,1.66,1.67

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1201

Modified Files:
	ChangeLog 
Log Message:
Update ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- ChangeLog	22 Feb 2006 22:17:07 -0000	1.66
+++ ChangeLog	23 Feb 2006 00:54:45 -0000	1.67
@@ -1,3 +1,23 @@
+2006-02-23 00:54  nboichat
+
+	* configure.ac, db/Makefile.am, db/Makefile.in, db/options.xml,
+	  db/options.xml.h, db/options.xml.in, db/monitor/DEL4005.xml,
+	  db/monitor/DELE009.xml, db/monitor/FUS0552.xml,
+	  db/monitor/MEL4632.xml, db/monitor/NEC662B.xml,
+	  db/monitor/SAM00BA.xml, db/monitor/SAM00D3.xml,
+	  db/monitor/SAM010C.xml, db/monitor/SAM010D.xml,
+	  db/monitor/SAM010F.xml, db/monitor/SAM0115.xml,
+	  db/monitor/SAM011F.xml, db/monitor/SAM0124.xml,
+	  db/monitor/SAM0168.xml, db/monitor/SAM017C.xml,
+	  db/monitor/SAM0191.xml, db/monitor/SAM0196.xml,
+	  db/monitor/SAM0198.xml, db/monitor/SAM01B4.xml,
+	  db/monitor/SAM01E3.xml, db/monitor/SAM01E4.xml,
+	  db/monitor/SAM01E5.xml, db/monitor/SAMcp10.xml,
+	  db/monitor/SAMg9.xml, db/monitor/SAMlcd.xml,
+	  db/monitor/SAMmb6.xml, db/monitor/VESA.xml, po/ddccontrol-db.pot,
+	  po/fr.po, po/pl.po, po/ru.po, po/zh_CN.po: Update Samsung
+	  monitors to use generic profiles.
+
 2006-02-22 22:16  nboichat
 
 	* configure.ac, db/Makefile.in, db/options.xml, db/options.xml.in,

[ddccontrol-cvs] ddccontrol-db/db/monitor SAMcp10.xml,NONE,1.1 SAMg9.xml,NONE,1.1 SAMlcd.xml,NONE,1.1 SAMmb6.xml,NONE,1.1 VESA.xml,NONE,1.1 DEL4005.xml,1.2,1.3 DELE009.xml,1.3,1.4 FUS0552.xml,1.4,1.5 MEL4632.xml,1.3,1.4 NEC662B.xml,1.5,1.6 SAM00BA.xml,1.7,1.8 SAM00D3.xml,1.6,1.7 SAM010C.xml,1.2,1.3 SAM010D.xml,1.2,1.3 SAM010F.xml,1.2,1.3 SAM0115.xml,1.4,1.5 SAM011F.xml,1.2,1.3 SAM0124.xml,1.2,1.3 SAM0168.xml,1.2,1.3 SAM017C.xml,1.2,1.3 SAM0191.xml,1.2,1.3 SAM0196.xml,1.3,1.4 SAM0198.xml,1.2,1.3 SAM01B4.xml,1.3,1.4 SAM01E3.xml,1.2,1.3 SAM01E4.xml,1.2,1.3 SAM01E5.xml,1.2,1.3

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1092/db/monitor

Modified Files:
	DEL4005.xml DELE009.xml FUS0552.xml MEL4632.xml NEC662B.xml 
	SAM00BA.xml SAM00D3.xml SAM010C.xml SAM010D.xml SAM010F.xml 
	SAM0115.xml SAM011F.xml SAM0124.xml SAM0168.xml SAM017C.xml 
	SAM0191.xml SAM0196.xml SAM0198.xml SAM01B4.xml SAM01E3.xml 
	SAM01E4.xml SAM01E5.xml 
Added Files:
	SAMcp10.xml SAMg9.xml SAMlcd.xml SAMmb6.xml VESA.xml 
Log Message:
Update Samsung monitors to use generic profiles.

Index: NEC662B.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/NEC662B.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NEC662B.xml	22 Feb 2006 22:16:40 -0000	1.5
+++ NEC662B.xml	23 Feb 2006 00:54:31 -0000	1.6
@@ -9,9 +9,6 @@
 			<value id="9300k"  value="8"/>
 			<value id="native" value="2"/>
 		</control>
-		<control id="auto" address="0x1e">
-			<value id="pos" value="1"/>
-		</control>
 		
 		<!-- Control 0x54: +/43/46 [Color Temperature], not working -->
 		

Index: SAM017C.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM017C.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM017C.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM017C.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!---The Samsung 174T is identical to 173T -->
+<!--- (type(LCD)vcp(04 05 08 10 12 16 18 1A 60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4) DF E0(0 1 2 3))) -->
 <monitor name="Samsung SyncMaster 174T">
-	<include file="SAM00BA"/>
+	<caps add="(vcp(1E CA CC F5))"/>
+	<include file="SAMlcd"/>
 </monitor>
\ No newline at end of file

Index: FUS0552.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0552.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FUS0552.xml	22 Feb 2006 22:16:40 -0000	1.4
+++ FUS0552.xml	23 Feb 2006 00:54:31 -0000	1.5
@@ -23,11 +23,6 @@
 			<value id="coarsefine" value="1"/>
 			<value id="pos" value="2"/>
 		</control>
-
-		<control id="inputsource" type="list" address="0x60">
-			<value id="analog" value="1"/>
-			<value id="digital" value="3"/>
-		</control>
 		
 		<control id="mute" type="list" address="0x94">
 			<value id="mute" value="0"/>

Index: SAM01E4.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01E4.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM01E4.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM01E4.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <monitor name="Samsung SyncMaster 960BF (VGA)">
-	<include file="SAM01B4"/>
+	<include file="SAM01E3"/>
 </monitor>
\ No newline at end of file

Index: DEL4005.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/DEL4005.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEL4005.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ DEL4005.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,20 +1,13 @@
 <?xml version="1.0"?>
+<!--- vcp(04 08 10 12 14(05 08 0B) 16 18 1A B6) type(LCD)
+	  mccs_ver(1.1) asset_eep(32) mpu(1.02) -->
 <monitor name="Dell 1704FPT (Digital)" init="standard">
+	<caps add="(vcp(68))"/>
 	<controls>
 		<control id="colorpreset" address="0x14">
-			<!--- Copied from Fujitsu, needs to be checked -->
-			<value id="srgb"   value="0x1"/>
-			<value id="native" value="0x2"/>
-			<value id="4000k"  value="0x3"/>
-			<value id="5000k"  value="0x4"/>
-			<value id="6500k"  value="0x5"/>
-			<value id="7500k"  value="0x6"/>
-			<value id="8200k"  value="0x7"/>
-			<value id="9300k"  value="0x8"/>
-			<value id="10000k" value="0x9"/>
-			<value id="11500k" value="0xA"/>
-			<value id="user1"  value="0xB"/>
-			<value id="user2"  value="0xC"/>
+			<value id="srgb"  value="0x05"/>
+			<value id="cool"  value="0x08"/>
+			<value id="user1" value="0x0b"/>
 		</control>
 		
 		<control id="language" type="list" address="0x68">

Index: SAM01B4.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01B4.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SAM01B4.xml	22 Feb 2006 22:16:40 -0000	1.3
+++ SAM01B4.xml	23 Feb 2006 00:54:31 -0000	1.4
@@ -1,72 +1,30 @@
 <?xml version="1.0"?>
-<!--- CA and E1 are supported but not reported by CAPS (OSD and power, so they're not very useful) -->
+<!--- CA, 87 and E1 are supported but not reported by CAPS (OSD and power) -->
+<!--- (type(LCD)vcp(04 05 10 12 16 18 1A 60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) 
+	  DC(1 2 3 4 5 6) F8 F0(0 1 2 3 4) F2 F3 87 F9 FA FB FC FD FE E0 )) -->
 <monitor name="Samsung SyncMaster 770P (DVI)" init="standard">
-	<controls>
-		<control id="auto" address="0x1e">
-			<value id="pos" value="1"/>
-			<value id="posfast" value="2"/>
-		</control>
-		<!-- 0x62: +/25/50 [???] -->
-		<!-- 0x6c Service: Red Video Black Level -->
-		<!-- 0x6e Service: Green Video Black Level -->
-		<!-- 0x70 Service: Blue Video Black Level -->
-		<control id="sharpness" address="0x87"/>
-		<!-- 0xb6: +/3/8	[???] -->
-		<!-- 0xc6: +/1/1	[???] -->
-		<!-- 0xc8: +/5/16	[???] -->
-		<!-- 0xc9: +/1/0	[???] -->
-		<control id="osd" type="list" address="0xca">
-			<value id="disable" value="1"/>
-			<value id="enable" value="2"/>
-		</control>
-		<!--- 0xcc: language, always 2, english -->
-		<control id="magicbright" type="list" address="0xdc">
-			<value id="text" value="1"/>
-			<value id="internet" value="2"/>
-			<value id="game" value="3"/>
-			<value id="sport" value="4"/>
-            <value id="entertain" value="5"/> 
-			<value id="custom" value="6"/>
-		</control>
-		<!-- 0xdf: +/512/0	[VCP Version] -->
-		<control id="colorpreset" type="list" address="0xe0">
-			<value id="normal" value="0"/>
-			<value id="warm1" value="1"/>
-			<value id="warm2" value="2"/>
-			<value id="cool1" value="3"/>
-			<value id="cool2" value="4"/>
-			<value id="cool3" value="5"/>
-			<value id="cool4" value="6"/>
-			<value id="cool5" value="7"/>
-			<value id="cool6" value="8"/>
-			<value id="cool7" value="9"/>
-		</control>
-		<!-- 0xe2: +/0/1	[???] -->
-		<!-- 0xed: +/100/100	[SAM: Red Video Black Level] -->
-		<!-- 0xee: +/100/100	[SAM: Green Video Black Level] -->
-		<!-- 0xef: +/100/100    [SAM: Blue Video Black Level] -->
-		<control id="magiccolor" type="list" address="0xf0">
-			<value id="off" value="0"/>
-			<value id="demo" value="1"/>
-			<value id="full" value="2"/>
-			<value id="intelligent" value="3"/>
-		</control>
-		<control id="gamma" type ="list" address="0xf2" >
-			<value id="-0.5" value="0"/>
-			<value id="-0.3" value="1"/>
-			<value id="-0.1" value="2"/>
-			<value id="0" value="3"/>
-			<value id="+0.1" value="4"/>
-			<value id="+0.3" value="5"/>
-			<value id="+0.5" value="6"/>
-			<value id="+0.7" value="7"/>
-			<value id="+0.9" value="8"/>
-		</control>
-		<!-- 0xf8: +/0/3 [???] -->
-		<!-- 0xf9: +/50/100 [???] -->
-		<!-- 0xfa: +/50/100 [???] -->
-		<!-- 0xfb: +/128/255 [???] -->
-		<!-- 0xfc: +/8/30 [???] -->
-	</controls>
-	<include file="VESA"/>
+	<caps add="(vcp(87 CA))"/>
+	<!-- 0x62: +/25/50 [???] -->
+	<!-- 0x6c Service: Red Video Black Level -->
+	<!-- 0x6e Service: Green Video Black Level -->
+	<!-- 0x70 Service: Blue Video Black Level -->
+	<!-- 0xb6: +/3/8	[???] -->
+	<!-- 0xc6: +/1/1	[???] -->
+	<!-- 0xc8: +/5/16	[???] -->
+	<!-- 0xc9: +/1/0	[???] -->
+	<!--- 0xcc: language, always 2, english -->
+	<!-- 0xdf: +/512/0	[VCP Version] -->
+	<!-- 0xe2: +/0/1	[???] -->
+	<!-- 0xed: +/100/100	[SAM: Red Video Black Level] -->
+	<!-- 0xee: +/100/100	[SAM: Green Video Black Level] -->
+	<!-- 0xef: +/100/100    [SAM: Blue Video Black Level] -->
+	<!-- 0xf8: +/0/3 [???] -->
+	<!-- 0xf9: +/50/100 [???] -->
+	<!-- 0xfa: +/50/100 [???] -->
+	<!-- 0xfb: +/128/255 [???] -->
+	<!-- 0xfc: +/8/30 [???] -->
+	<include file="SAMmb6"/>
+	<include file="SAMcp10"/>
+	<include file="SAMg9"/>
+	<include file="SAMlcd"/>
 </monitor>

Index: SAM011F.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM011F.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM011F.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM011F.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!---The Samsung 912N is identical to 173P -->
+<!--- (type(LCD)vcp(04 05 06 08 0E 10 12 16 18 1A 1E 20 30 3E B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4) DF E0(0 1 2 3))) -->
 <monitor name="Samsung SyncMaster 912N">
-	<include file="SAM00D3"/>
+	<caps add="(vcp(CA CC F5))"/>
+	<include file="SAMlcd"/>
 </monitor>
\ No newline at end of file

Index: SAM01E3.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01E3.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM01E3.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM01E3.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
-<!---The Samsung 760BF seems to work with the settings of the 173P -->
+<!--- (type(LCD)vcp(04 05 10 12 16 18 1A 60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4 5 6)
+	  F8 F0(0 1 2 3 4) F2 F3 87 F9 FA FB FC FD FE E0(0 1 2 3))) -->
 <monitor name="Samsung SyncMaster 760BF">
-	<include file="SAM00D3"/>
+	<caps add="(vcp(CA CC))"/>
+	<include file="SAMmb6"/>
+	<include file="SAMg9"/>
+	<include file="SAMlcd"/>
 </monitor>
\ No newline at end of file

Index: MEL4632.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/MEL4632.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MEL4632.xml	22 Feb 2006 22:16:40 -0000	1.3
+++ MEL4632.xml	23 Feb 2006 00:54:31 -0000	1.4
@@ -28,7 +28,6 @@
 
 		<!---Control 0xa8: +/1/3 [Sync Type]-->
 
-		<control id="power" address="0xE1"/>
 		<!--- Control 0xe2: +/0/1 [Clamp Pulse Position] -->
 		<control id="osd" type="list" address="0xE3"> <!--- Control lock = OSD lock ? -->
 			<value id="enable"  value="0"/>

--- NEW FILE: VESA.xml ---
<?xml version="1.0"?>
<!--- "Standard" controls -->
<monitor name="VESA standard controls" init="standard">
	<controls>
		<control id="degauss" address="0x00"/>
		
		<control id="defaults" address="0x04" delay="1000"/>
		<control id="defaultluma" address="0x05" delay="1000"/>
		<control id="defaultgeom" address="0x06" delay="1000"/>
		<control id="defaultcolor" address="0x08" delay="1000"/>
		<control id="coarse" address="0x0E"/>
		
		<control id="brightness" address="0x10"/>
		<control id="contrast" address="0x12"/>
		<control id="red" address="0x16"/>
		<control id="green" address="0x18"/>
		<control id="blue" address="0x1A"/>
		<control id="focus" address="0x1C"/>
		<control id="auto" address="0x1e">
			<value id="pos" value="1"/>
		</control>
		
		<control id="hpos" address="0x20"/>
		<control id="hsize" address="0x22"/>
		<control id="hpincushion" address="0x24"/>
		<control id="hpincushionbalance" address="0x26"/>
		<control id="hmisconvergence" address="0x28"/>
		
		<control id="vpos" address="0x30"/>
		<control id="vsize" address="0x32"/>
		<control id="vmisconvergence" address="0x38"/>
		<control id="vlinearity"  address="0x3A"/>
		<control id="vlinearitybalance" address="0x3C"/>
		
		<control id="fine" address="0x3e"/>
		
		<control id="keybalance" address="0x40"/>
		<control id="key" address="0x42"/>
		<control id="tilt" address="0x44"/>
		<control id="tdistortionctrl" address="0x46"/>
		<control id="tdistortionbalance" address="0x48"/>
		<control id="bdistortionctrl" address="0x4A"/>
		<control id="bdistortionbalance" address="0x4C"/>
		
		<control id="colortemp" address="0x54"/>
		<control id="hmoire" address="0x56"/>
		<control id="vmoire" address="0x58"/>
		
		<control id="inputsource" type="list" address="0x60">
			<value id="analog"  value="1"/>
			<value id="digital" value="3"/>
		</control>
		<control id="audiospeakervolume" address="0x62"/>
		
		<control id="redblack" address="0x6C"/>
		<control id="greenblack" address="0x6E"/>
		<control id="blueblack" address="0x70"/>
		
		<control id="osdorientation" type="list" address="0xaa">
			<value id="landscape" value="1"/>
			<value id="portrait" value="2"/>
		</control>
		
		<control id="settings" address="0xb0"/>
		
		<control id="dpms" address="0xd6">
			<value id="on" value="1"/>
			<value id="standby" value="4"/>
		</control>
		
		<control id="power" type="list" address="0xe1">
			<value id="off" value="0"/>
			<value id="on"  value="1"/>
		</control>
	</controls>
</monitor>

Index: SAM0124.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0124.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM0124.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM0124.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!---The Samsung 712N is identical to 173P -->
+<!---The Samsung 712N is identical to 912N -->
 <monitor name="Samsung SyncMaster 712N">
-	<include file="SAM00D3"/>
+	<include file="SAM011F"/>
 </monitor>
\ No newline at end of file

Index: SAM00BA.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM00BA.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SAM00BA.xml	22 Feb 2006 22:16:40 -0000	1.7
+++ SAM00BA.xml	23 Feb 2006 00:54:31 -0000	1.8
@@ -1,46 +1,20 @@
 <?xml version="1.0"?>
-<monitor name="Samsung SyncMaster 173T" init="standard">
-	<controls>
-		<control id="auto" address="0x1e">
-			<value id="pos" value="1"/>
-		</control>
-		<!-- 0x62 has no meaning for SM173T -->
-		<!-- 0x6c Service: Red Video Black Level -->
-		<!-- 0x6e Service: Green Video Black Level -->
-		<!-- 0x70 Service: Blue Video Black Level -->
-		
-		<!-- 0xb6: +/3/8	[???] -->
-		<!-- 0xc6: +/1/1	[???] -->
-		<!-- 0xc8: +/5/16	[???] -->
-		<!-- 0xc9: +/1/0	[???] -->
-		<control id="osd" type="list" address="0xca">
-			<value id="disable" value="1"/>
-			<value id="enable" value="2"/>
-		</control>
-		<control id="language" type="list" address="0xcc">
-			<value id="english" value="2"/>
-			<value id="french" value="3"/>
-			<value id="german" value="4"/>
-			<value id="italian" value="5"/>
-			<value id="russian" value="9"/>
-			<value id="spanish" value="10"/>
-			<value id="swedish" value="11"/>
-		</control>
-		<control id="magicbright" type="list" address="0xdc">
-			<value id="text" value="1"/>
-			<value id="internet" value="2"/>
-			<value id="entertain" value="3"/>
-			<value id="custom" value="4"/>
-		</control>
-		<!-- 0xdf: +/512/0	[VCP Version] -->
-		<control id="colorpreset" type="list" address="0xe0">
-			<value id="normal" value="0"/>
-			<value id="warm" value="1"/>
-			<value id="cool" value="2"/>
-		</control>
-		<!-- 0xe2: +/0/1	[???] -->
-		<!-- 0xed: +/108/255	[SAM: Red Video Black Level] -->
-		<!-- 0xee: +/101/255	[SAM: Green Video Black Level] -->
-		<!-- 0xef: +/103/255	[SAM: Blue Video Black Level] -->
-	</controls>
+<monitor name="Samsung SyncMaster 173T">
+	<!--- (type(LCD)vcp(04 05 10 12 60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4) DF)) -->
+	<caps add="(vcp(1E CA CC E0 F5))"/>
+	<!-- 0x62 has no meaning for SM173T -->
+	<!-- 0x6c Service: Red Video Black Level -->
+	<!-- 0x6e Service: Green Video Black Level -->
+	<!-- 0x70 Service: Blue Video Black Level -->
+	
+	<!-- 0xb6: +/3/8	[???] -->
+	<!-- 0xc6: +/1/1	[???] -->
+	<!-- 0xc8: +/5/16	[???] -->
+	<!-- 0xc9: +/1/0	[???] -->
+	<!-- 0xdf: +/512/0	[VCP Version] -->
+	<!-- 0xe2: +/0/1	[???] -->
+	<!-- 0xed: +/108/255	[SAM: Red Video Black Level] -->
+	<!-- 0xee: +/101/255	[SAM: Green Video Black Level] -->
+	<!-- 0xef: +/103/255	[SAM: Blue Video Black Level] -->
+	<include file="SAMlcd"/>
 </monitor>

--- NEW FILE: SAMcp10.xml ---
<?xml version="1.0"?>
<!--- NOCHECKDB -->
<monitor name="Samsung LCD 10-value colorpreset">
	<controls>
		<control id="colorpreset" type="list" address="0xe0">
			<value id="normal" value="0"/>
			<value id="warm1" value="1"/>
			<value id="warm2" value="2"/>
			<value id="cool1" value="3"/>
			<value id="cool2" value="4"/>
			<value id="cool3" value="5"/>
			<value id="cool4" value="6"/>
			<value id="cool5" value="7"/>
			<value id="cool6" value="8"/>
			<value id="cool7" value="9"/>
		</control>
	</controls>
</monitor>
--- NEW FILE: SAMlcd.xml ---
<?xml version="1.0"?>
<!--- "Standard" Samsung controls, 87, CA, CC, F5 are useful but usually not in caps -->
<monitor name="Samsung LCD standard controls">
	<caps add="(vcp(E1))"/>
	<controls>
		<control id="auto" address="0x1e">
			<value id="pos" value="1"/>
			<value id="posfast" value="2"/>
		</control>
		
		<control id="sharpness" address="0x87"/>
		
		<control id="osd" type="list" address="0xca">
			<value id="disable" value="1"/>
			<value id="enable" value="2"/>
		</control>
		
		<control id="language" type="list" address="0xcc">
			<value id="english" value="2"/>
			<value id="french"  value="3"/>
			<value id="german"  value="4"/>
			<value id="italian" value="5"/>
			<value id="russian" value="9"/>
			<value id="spanish" value="10"/>
			<value id="swedish" value="11"/>
		</control>
		
		<!--- Some monitors use a 6-value magicbright, in this case include
			  SAMmb6.xml before including this file. -->
		<control id="magicbright" type="list" address="0xdc">
			<value id="text" value="1"/>
			<value id="internet" value="2"/>
			<value id="entertain" value="3"/>
			<value id="custom" value="4"/>
		</control>
		
		<!--- Some monitors use a 10-value colorpreset, in this case include
			  SAMcp10.xml before including this file. -->
		<control id="colorpreset" type="list" address="0xe0">
			<value id="custom" value="0"/> <!--- 3 = 0 -->
			<value id="warm" value="1"/>
			<value id="cool" value="2"/>
		</control>
		
		<control id="magiccolor" type="list" address="0xf0">
			<value id="off" value="0"/>
			<value id="demo" value="1"/>
			<value id="full" value="2"/>
			<value id="intelligent" value="3"/>
		</control>
		
		<!--- Some monitors use a 9-value gamma, in this case include
			  SAMg9.xml before including this file. -->
		<control id="gamma" type="list" address="0xf2">
			<value id="mode1" value="0"/>
			<value id="mode2" value="1"/>
			<value id="mode3" value="2"/>
		</control>
		
		<control id="osd2" type="list" address="0xf5">
			<value id="enable" value="0"/>
			<value id="disable" value="1"/>
		</control>
	</controls>
	<include file="VESA"/>
</monitor>

Index: SAM0115.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0115.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SAM0115.xml	22 Feb 2006 22:16:40 -0000	1.4
+++ SAM0115.xml	23 Feb 2006 00:54:31 -0000	1.5
@@ -2,59 +2,23 @@
 <!--- Thanks to Hubai Tamas for his help to create this database file -->
 <!--- CC, E1 and F5 are not in caps  (language, power and OSD enable) -->
 <monitor name="Samsung SyncMaster 913V" init="standard">
-	<caps add="(lcd(CC E1 F5))">
-	<controls>
-		<control id="auto" address="0x1e">
-			<value id="pos" value="1"/>
-			<value id="posfast" value="2"/>
-		</control>
-		<!-- 0x60: +/1/3 [Input source, not applicable on 913V] -->
-		<!-- 0x62: +/25/50 [???] -->
-		<!-- 0x6c Service: Red Video Black Level -->
-		<!-- 0x6e Service: Green Video Black Level -->
-		<!-- 0x70 Service: Blue Video Black Level -->
-		<control id="sharpness" address="0x87"/>
-		<!-- 0xb6: +/3/8	[???] -->
-		<!-- 0xc6: +/1/1	[???] -->
-		<!-- 0xc8: +/5/16	[???] -->
-		<!-- 0xc9: +/1/0	[???] -->
-		<!-- 0xca: +/2/2 [???] -->
-		<control id="language" type="list" address="0xcc">
-			<value id="english" value="2"/>
-			<value id="french"  value="3"/>
-			<value id="german"  value="4"/>
-			<value id="italian" value="5"/>
-			<value id="russian" value="9"/>
-			<value id="spanish" value="10"/>
-			<value id="swedish" value="11"/>
-		</control>
-		<control id="magicbright" type="list" address="0xdc">
-			<value id="text" value="1"/>
-			<value id="internet" value="2"/>
-            <value id="entertain" value="3"/> 
-			<value id="custom" value="4"/>
-		</control>
-		<!-- 0xdf: +/512/0	[VCP Version] -->
-		<control id="colorpreset" type="list" address="0xe0">
-			<value id="custom" value="0"/>
-			<value id="warm" value="1"/>
-			<value id="cool" value="2"/>
-		</control>
-		<!-- 0xe2: +/0/1	[???] -->
-		<!-- 0xed: +/100/100	[SAM: Red Video Black Level] -->
-		<!-- 0xee: +/100/100	[SAM: Green Video Black Level] -->
-		<!-- 0xef: +/100/100    [SAM: Blue Video Black Level] -->
-		<!-- Control 0xf0: +/3/0 [Magic Color on other models] RO -->
-		<control id="gamma" type="list" address="0xf2">
-			<value id="mode1" value="0"/>
-			<value id="mode2" value="1"/>
-			<value id="mode3" value="2"/>
-		</control>
-
-		<control id="osd" type="list" address="0xf5">
-			<value id="enable" value="0"/>
-			<value id="disable" value="1"/>
-		</control>
-	</controls>
-	<include file="VESA"/>
+	<!--- (type(LCD)vcp(04 05 06 08 0E 10 12 16 18 1A 1E 20 30 3E B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4) DF F2 87 E0(0 1 2 3))) -->
+	<caps add="(vcp(CA CC F5))"/>
+	<!-- 0x60: +/1/3 [Input source, not applicable on 913V] -->
+	<!-- 0x62: +/25/50 [???] -->
+	<!-- 0x6c Service: Red Video Black Level -->
+	<!-- 0x6e Service: Green Video Black Level -->
+	<!-- 0x70 Service: Blue Video Black Level -->
+	<!-- 0xb6: +/3/8	[???] -->
+	<!-- 0xc6: +/1/1	[???] -->
+	<!-- 0xc8: +/5/16	[???] -->
+	<!-- 0xc9: +/1/0	[???] -->
+	<!-- 0xca: +/2/2 [???] -->
+	<!-- 0xdf: +/512/0	[VCP Version] -->
+	<!-- 0xe2: +/0/1	[???] -->
+	<!-- 0xed: +/100/100	[SAM: Red Video Black Level] -->
+	<!-- 0xee: +/100/100	[SAM: Green Video Black Level] -->
+	<!-- 0xef: +/100/100    [SAM: Blue Video Black Level] -->
+	<!-- Control 0xf0: +/3/0 [Magic Color on other models] RO -->
+	<include file="SAMlcd"/>
 </monitor>

Index: DELE009.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/DELE009.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DELE009.xml	22 Feb 2006 22:16:40 -0000	1.3
+++ DELE009.xml	23 Feb 2006 00:54:31 -0000	1.4
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <monitor name="Dell 2005FPW (Digital)" init="standard">
-	<!--- vcp(page0(04 05 06 08 0E 10 12 14(01 04 05 08 0B) 16 18 1A 1E 20 30 3E B0 CC(2 3 4 6 0A) E3)asset_eep(40)mccs_ver(1.0)type(LCD) -->
-	<caps add="(vcp(60 e1))"/>
+	<!--- vcp(page0(04 05 06 08 0E 10 12 14(01 04 05 08 0B) 16 18 1A 1E 20 30 3E B0 CC(2 3 4 6 0A) E3)asset_eep(40)mccs_ver(1.0)type(LCD): INVALID -->
+	<caps add="(vcp(04 05 06 08 0E 10 12 14(01 04 05 08 0B) 16 18 1A 1E 20 30 3E 60 B0 CC(2 3 4 6 A) E1)"/>
 	<controls>
 		<control id="colorpreset" address="0x14">
 			<value id="warm"  value="0x04"/>
@@ -12,11 +12,6 @@
 
 		<!--- Control 0x1e: +/0/255 [???] -->
 
-		<control id="inputsource" type="list" address="0x60">
-			<value id="analog"  value="1"/>
-			<value id="digital" value="3"/>
-		</control>
-
 		<!--- Control 0x68: +/0/255 [???] -->
 		<!--- Control 0xca: +/0/2 [???] -->
 

Index: SAM010F.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM010F.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM010F.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM010F.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
 <!---The Samsung 910T is identical to 710T, so to 173P -->
 <monitor name="Samsung SyncMaster 910T">
-	<include file="SAM00D3"/>
+	<!--- (type(LCD)vcp(04 05 08 10 12 16 18 1A 60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4) DF E0(0 1 2 3))) -->
+	<caps add="(vcp(CA CC F5))"/>
+	<include file="SAMlcd"/>
 </monitor>
\ No newline at end of file

--- NEW FILE: SAMmb6.xml ---
<?xml version="1.0"?>
<!--- NOCHECKDB -->
<monitor name="Samsung LCD 6-value magicbright">
	<controls>
		<control id="magicbright" type="list" address="0xdc">
			<value id="text" value="1"/>
			<value id="internet" value="2"/>
			<value id="game" value="3"/>
			<value id="sport" value="4"/>
			<value id="entertain" value="5"/> 
			<value id="custom" value="6"/>
		</control>
	</controls>
</monitor>
Index: SAM01E5.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01E5.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM01E5.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM01E5.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <monitor name="Samsung SyncMaster 960BF (Digital)">
-	<include file="SAM01B4"/>
+	<include file="SAM01E3"/>
 </monitor>
\ No newline at end of file

Index: SAM010C.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM010C.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM010C.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM010C.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!---The Samsung 710T is identical to 173P -->
+<!---The Samsung 710T is identical to 910T -->
 <monitor name="Samsung SyncMaster 710T">
-	<include file="SAM00D3"/>
+	<include file="SAM010F"/>
 </monitor>
\ No newline at end of file

Index: SAM0168.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0168.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM0168.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM0168.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!---The Samsung 710TM is identical to 173P -->
+<!--- (type(LCD)vcp(04 05 08 10 12 16 18 1A 60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4) DF E0(0 1 2 3))) -->
 <monitor name="Samsung SyncMaster 710TM">
-	<include file="SAM00D3"/>
+	<include file="SAM010C"/> <!--- 710TM = 710T -->
 </monitor>
\ No newline at end of file

Index: SAM0196.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0196.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SAM0196.xml	22 Feb 2006 22:16:40 -0000	1.3
+++ SAM0196.xml	23 Feb 2006 00:54:31 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!---The Samsung 173P+ is identical to 173P -->
+<!---The Samsung 173P+ is identical to 193P+ -->
 <monitor name="Samsung SyncMaster 173P Plus (VGA)">
-	<include file="SAM00D3"/>
+	<include file="SAM0198"/>
 </monitor>
\ No newline at end of file

Index: SAM0198.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0198.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM0198.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM0198.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
-<!---The Samsung 193P+ is identical to 173P+ -->
+<!--- (type(LCD)vcp(04 05 06 08 0E 10 12 16 18 1A 1E 20 30 3E 60(1 3) B0(1 2) B6
+	  C6 C8 C9 D6(1 4) DC(1 2 3 4 5 6) DF F8 F0(0 1 2 3 4) F2 87 F9 FA FB FC FD FE 
+	  E0 )) -->
 <monitor name="Samsung SyncMaster 193P Plus (VGA)">
-	<include file="SAM0196"/>
+	<caps add="(vcp(CA))"/>
+	<include file="SAMg9"/>
+	<include file="SAMcp10"/>
+	<include file="SAMmb6"/>
+	<include file="SAMlcd"/>
 </monitor>
\ No newline at end of file

Index: SAM00D3.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM00D3.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SAM00D3.xml	22 Feb 2006 22:16:40 -0000	1.6
+++ SAM00D3.xml	23 Feb 2006 00:54:31 -0000	1.7
@@ -1,43 +1,23 @@
 <?xml version="1.0"?>
 <!--- CA and E1 are supported but not reported by CAPS -->
 <monitor name="Samsung SyncMaster 173P (VGA)" init="standard">
-	<caps add="(vcp(CA E1))"/>
-	<controls>
-		<control id="auto" address="0x1e">
-			<value id="pos" value="1"/>
-		</control>
-		
-		<!-- 0x62 has no meaning for SM173P -->
-		<!-- 0x6c Service: Red Video Black Level -->
-		<!-- 0x6e Service: Green Video Black Level -->
-		<!-- 0x70 Service: Blue Video Black Level -->
-		
-		<!-- 0xb6: +/3/8	[???] -->
-		<!-- 0xc6: +/1/1	[???] -->
-		<!-- 0xc8: +/5/16	[???] -->
-		<!-- 0xc9: +/1/0	[???] -->
-		<control id="osd" type="list" address="0xca">
-			<value id="disable" value="1"/>
-			<value id="enable" value="2"/>
-		</control>
-		<!--- 0xcc: language, always 2, english -->
-		<control id="magicbright" type="list" address="0xdc">
-			<value id="text" value="1"/>
-			<value id="internet" value="2"/>
-			<value id="entertain" value="3"/>
-			<value id="custom" value="4"/>
-		</control>
-		<!-- 0xdf: +/512/0	[VCP Version] -->
-		<control id="colorpreset" type="list" address="0xe0">
-			<value id="normal" value="0"/>
-			<value id="warm" value="1"/>
-			<value id="cool" value="2"/>
-		</control>
-		<!-- 0xe2: +/0/1	[???] -->
-		<!-- 0xed: +/108/255	[SAM: Red Video Black Level] -->
-		<!-- 0xee: +/101/255	[SAM: Green Video Black Level] -->
-		<!-- 0xef: +/103/255	[SAM: Blue Video Black Level] -->
-		<!-- 0xf5: +/1/2 [???] (on 712N) -->
-	</controls>
-	<include file="VESA"/>
+	<!--- (type(LCD)vcp(04 05 06 08 0E 10 12 16 18 1A 1E 20 30 3E 
+		  60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4) DF E0(0 1 2))) -->
+	<caps add="(vcp(CA))"/>
+	<!-- 0x62 has no meaning for SM173P -->
+	<!-- 0x6c Service: Red Video Black Level -->
+	<!-- 0x6e Service: Green Video Black Level -->
+	<!-- 0x70 Service: Blue Video Black Level -->
+	
+	<!-- 0xb6: +/3/8	[???] -->
+	<!-- 0xc6: +/1/1	[???] -->
+	<!-- 0xc8: +/5/16	[???] -->
+	<!-- 0xc9: +/1/0	[???] -->
+	<!--- 0xcc: language, always 2, english -->
+	<!-- 0xdf: +/512/0	[VCP Version] -->
+	<!-- 0xe2: +/0/1	[???] -->
+	<!-- 0xed: +/108/255	[SAM: Red Video Black Level] -->
+	<!-- 0xee: +/101/255	[SAM: Green Video Black Level] -->
+	<!-- 0xef: +/103/255	[SAM: Blue Video Black Level] -->
+	<include file="SAMlcd"/>
 </monitor>

--- NEW FILE: SAMg9.xml ---
<?xml version="1.0"?>
<!--- NOCHECKDB -->
<monitor name="Samsung LCD 9-value gamma">
	<controls>
		<control id="gamma" type ="list" address="0xf2" >
			<value id="-0.5" value="0"/>
			<value id="-0.3" value="1"/>
			<value id="-0.1" value="2"/>
			<value id="0" value="3"/>
			<value id="+0.1" value="4"/>
			<value id="+0.3" value="5"/>
			<value id="+0.5" value="6"/>
			<value id="+0.7" value="7"/>
			<value id="+0.9" value="8"/>
		</control>
	</controls>
</monitor>
Index: SAM0191.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0191.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM0191.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM0191.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,64 +1,23 @@
 <?xml version="1.0"?>
 <!--- CC, E1 and F5 are not in caps (language, power and OSD enable) -->
-<monitor name="Samsung SyncMaster 730BF (VGA)" init="standard" caps="">
-	<caps add="(vcp(CC E1 F5))"/>
-	<controls>
-		<control id="auto" address="0x1e">
-			<value id="pos" value="1"/>
-			<value id="posfast" value="2"/>
-		</control>
+<monitor name="Samsung SyncMaster 730BF (VGA)" init="standard">
+	<!--- (type(LCD)vcp(04 05 06 08 10 12 16 18 1A 60(1 3) 87 B0(1 2) B6 C6 C8 C9 D6(1 4)
+		  DC(1 2 3 4 5 6) DF F0(0 1 2 3 4) F2 FA FB F9 FC FD FE E0(0 1 2 3))) -->
+	<caps add="(vcp(CC F5))"/>
 		<!-- 0x62: +/25/50 [???] -->
 		<!-- 0x6c Service: Red Video Black Level -->
 		<!-- 0x6e Service: Green Video Black Level -->
 		<!-- 0x70 Service: Blue Video Black Level -->
-		<control id="sharpness" address="0x87"/>
 		<!-- 0xb6: +/3/8	[???] -->
 		<!-- 0xc6: +/1/1	[???] -->
 		<!-- 0xc8: +/5/16	[???] -->
 		<!-- 0xc9: +/1/0	[???] -->
 		<!-- 0xca: +/2/2 [???] -->
-		<control id="language" type="list" address="0xcc">
-			<value id="english" value="2"/>
-			<value id="french"  value="3"/>
-			<value id="german"  value="4"/>
-			<value id="italian" value="5"/>
-			<value id="russian" value="9"/>
-			<value id="spanish" value="10"/>
-			<value id="swedish" value="11"/>
-		</control>
-		<control id="magicbright" type="list" address="0xdc">
-			<value id="text" value="1"/>
-			<value id="internet" value="2"/>
-			<value id="game" value="3"/>
-			<value id="sport" value="4"/>
-            <value id="entertain" value="5"/> 
-			<value id="custom" value="6"/>
-		</control>
 		<!-- 0xdf: +/512/0	[VCP Version] -->
-		<control id="colorpreset" type="list" address="0xe0">
-			<value id="custom" value="0"/>
-			<value id="warm" value="1"/>
-			<value id="cool" value="2"/>
-		</control>
 		<!-- 0xe2: +/0/1	[???] -->
 		<!-- 0xed: +/100/100	[SAM: Red Video Black Level] -->
 		<!-- 0xee: +/100/100	[SAM: Green Video Black Level] -->
 		<!-- 0xef: +/100/100    [SAM: Blue Video Black Level] -->
-		<control id="magiccolor" type="list" address="0xf0">
-			<value id="off" value="0"/>
-			<value id="demo" value="1"/>
-			<value id="full" value="2"/>
-			<value id="intelligent" value="3"/>
-		</control>
-		<control id="gamma" type="list" address="0xf2">
-			<value id="mode1" value="0"/>
-			<value id="mode2" value="1"/>
-			<value id="mode3" value="2"/>
-		</control>
-
-		<control id="osd" type="list" address="0xf5">
-			<value id="enable" value="0"/>
-			<value id="disable" value="1"/>
-		</control>
-	</controls>
+	<include file="SAMmb6"/>
+	<include file="SAMlcd"/>
 </monitor>

Index: SAM010D.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM010D.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM010D.xml	22 Feb 2006 22:16:40 -0000	1.2
+++ SAM010D.xml	23 Feb 2006 00:54:31 -0000	1.3
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!---The Samsung 701T seems to work with the settings of the 173P -->
+<!--- (type(LCD)vcp(04 05 08 10 12 16 18 1A 60(1 3) B0(1 2) B6 C6 C8 C9 D6(1 4) DC(1 2 3 4) DF E0(0 1 2 3)))-->
 <monitor name="Samsung SyncMaster 701T">
-	<include file="SAM00D3"/>
+	<caps add="(vcp(CC F5))"/>
+	<include file="SAMlcd"/>
 </monitor>
\ No newline at end of file

[ddccontrol-cvs] ddccontrol-db/po ddccontrol-db.pot,1.7,1.8 fr.po,1.9,1.10 pl.po,1.1,1.2 ru.po,1.8,1.9 zh_CN.po,1.2,1.3

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1092/po

Modified Files:
	ddccontrol-db.pot fr.po pl.po ru.po zh_CN.po 
Log Message:
Update Samsung monitors to use generic profiles.

Index: pl.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/po/pl.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pl.po	19 Nov 2005 13:48:18 -0000	1.1
+++ pl.po	23 Feb 2006 00:54:31 -0000	1.2
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DDC/CI control tool database 20051114\n"
-"Report-Msgid-Bugs-To: ddc...@li...\n"
-"POT-Creation-Date: 2005-11-12 23:54+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-23 01:52+0100\n"
 "PO-Revision-Date: 2005-11-18 22:21+0100\n"
 "Last-Translator: Radek Marcinkowski <ra...@cb...>\n"
 "Language-Team: Polish\n"
@@ -17,722 +17,877 @@
[...1005 lines suppressed...]
 msgid "Digital"
 msgstr "Cyfrowe"
 
-#: db/options.xml.h:150 db/options.xml.h:154
+#: ../db/options.xml.h:185 ../db/options.xml.h:189
 #, c-format
 msgid "Power control"
 msgstr "Zarz±dzanie zasilaniem"
 
-#: db/options.xml.h:151
+#: ../db/options.xml.h:186
 #, c-format
 msgid "DPMS Control"
 msgstr "Zarz±dzanie DPMS"
 
-#: db/options.xml.h:153
+#: ../db/options.xml.h:188
 #, c-format
 msgid "Standby"
 msgstr "Stan czuwania"

Index: ddccontrol-db.pot
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/po/ddccontrol-db.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ddccontrol-db.pot	12 Nov 2005 22:55:19 -0000	1.7
+++ ddccontrol-db.pot	23 Feb 2006 00:54:31 -0000	1.8
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Oleg I. Vdovikin and Nicolas Boichat
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: ddc...@li...\n"
[...1012 lines suppressed...]
 msgid "Digital"
 msgstr ""
 
-#: db/options.xml.h:150 db/options.xml.h:154
+#: ../db/options.xml.h:185 ../db/options.xml.h:189
 #, c-format
 msgid "Power control"
 msgstr ""
 
-#: db/options.xml.h:151
+#: ../db/options.xml.h:186
 #, c-format
 msgid "DPMS Control"
 msgstr ""
 
-#: db/options.xml.h:153
+#: ../db/options.xml.h:188
 #, c-format
 msgid "Standby"
 msgstr ""

Index: fr.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/po/fr.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fr.po	14 Nov 2005 17:46:02 -0000	1.9
+++ fr.po	23 Feb 2006 00:54:31 -0000	1.10
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DDC/CI control tool database\n"
-"Report-Msgid-Bugs-To: ddc...@li...\n"
-"POT-Creation-Date: 2005-11-12 23:54+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-23 01:52+0100\n"
 "PO-Revision-Date: 2005-11-14 18:30+0100\n"
 "Last-Translator: Nicolas Boichat <ni...@bo...>\n"
 "Language-Team: French <tr...@tr...>\n"
@@ -17,728 +17,883 @@
[...1011 lines suppressed...]
 msgid "Digital"
 msgstr "Digital"
 
-#: db/options.xml.h:150 db/options.xml.h:154
+#: ../db/options.xml.h:185 ../db/options.xml.h:189
 #, c-format
 msgid "Power control"
 msgstr "Allumer/éteindre"
 
-#: db/options.xml.h:151
+#: ../db/options.xml.h:186
 #, c-format
 msgid "DPMS Control"
 msgstr "Contrôle DPMS"
 
-#: db/options.xml.h:153
+#: ../db/options.xml.h:188
 #, c-format
 msgid "Standby"
 msgstr "En veille"

Index: ru.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/po/ru.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ru.po	14 Nov 2005 17:46:02 -0000	1.8
+++ ru.po	23 Feb 2006 00:54:31 -0000	1.9
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DDC/CI control tool database\n"
-"Report-Msgid-Bugs-To: ddc...@li...\n"
-"POT-Creation-Date: 2005-11-12 23:54+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-23 01:52+0100\n"
 "PO-Revision-Date: 2005-11-14 11:32+0300\n"
 "Last-Translator: SergeiEpiphanov <se...@ni...>\n"
 "Language-Team: Russian <LL...@li...>\n"
@@ -15,722 +15,877 @@
[...1005 lines suppressed...]
 msgid "Digital"
 msgstr "Цифровой"
 
-#: db/options.xml.h:150 db/options.xml.h:154
+#: ../db/options.xml.h:185 ../db/options.xml.h:189
 #, c-format
 msgid "Power control"
 msgstr "Управление питанием"
 
-#: db/options.xml.h:151
+#: ../db/options.xml.h:186
 #, c-format
 msgid "DPMS Control"
 msgstr "Управление энергосбережением (DPMS)"
 
-#: db/options.xml.h:153
+#: ../db/options.xml.h:188
 #, c-format
 msgid "Standby"
 msgstr "Ожидание"

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/po/zh_CN.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- zh_CN.po	12 Nov 2005 22:55:19 -0000	1.2
+++ zh_CN.po	23 Feb 2006 00:54:31 -0000	1.3
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DDC/CI control tool database cvs version 2005-11-12\n"
-"Report-Msgid-Bugs-To: ddc...@li...\n"
-"POT-Creation-Date: 2005-11-12 23:54+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-23 01:52+0100\n"
 "PO-Revision-Date: 2005-11-12 15:50+0800\n"
 "Last-Translator: Wu Songhai wa...@21...\n"
 "Language-Team: Simple Chinese <LL...@li...>\n"
@@ -15,722 +15,877 @@
[...1005 lines suppressed...]
 msgid "Digital"
 msgstr "数字"
 
-#: db/options.xml.h:150 db/options.xml.h:154
+#: ../db/options.xml.h:185 ../db/options.xml.h:189
 #, c-format
 msgid "Power control"
 msgstr "电源控制"
 
-#: db/options.xml.h:151
+#: ../db/options.xml.h:186
 #, c-format
 msgid "DPMS Control"
 msgstr "DPMS 控制"
 
-#: db/options.xml.h:153
+#: ../db/options.xml.h:188
 #, c-format
 msgid "Standby"
 msgstr "待机"

[ddccontrol-cvs] ddccontrol-db/db Makefile.am,1.7,1.8 Makefile.in,1.10,1.11 options.xml,1.27,1.28 options.xml.h,1.9,1.10 options.xml.in,1.12,1.13

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1092/db

Modified Files:
	Makefile.am Makefile.in options.xml options.xml.h 
	options.xml.in 
Log Message:
Update Samsung monitors to use generic profiles.

Index: options.xml.h
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- options.xml.h	14 Feb 2006 14:46:04 -0000	1.9
+++ options.xml.h	23 Feb 2006 00:54:31 -0000	1.10
@@ -129,7 +129,6 @@
 printf(_("Bottom left screen purity"));
 printf(_("Bottom right screen purity"));
 printf(_("Various"));
-printf(_("Focus"));
 printf(_("Landing Adjust (RGB alignment)"));
 printf(_("Sharpness"));
 printf(_("Others"));
@@ -158,6 +157,9 @@
 printf(_("Disable"));
 printf(_("Enable"));
 printf(_("Enable only brightness/contrast settings"));
+printf(_("On Screen Display (Samsung)"));
+printf(_("Disable"));
+printf(_("Enable"));
 printf(_("OSD Orientation"));
 printf(_("Landscape"));
 printf(_("Portrait"));

Index: options.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- options.xml	22 Feb 2006 22:16:39 -0000	1.27
+++ options.xml	23 Feb 2006 00:54:31 -0000	1.28
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!---Do not edit this file, edit options.xml.in instead.-->
-<options date="20050813" dbversion="3">
+<options date="20060222" dbversion="3">
 	<group name="Color settings">
 		<subgroup name="Brightness and Contrast" pattern="brightnesscontrast">
 			<control id="brightness" type="value" name="Brightness" address="0x10"/>
@@ -160,7 +160,6 @@
 			<control id="brpurity" type="value" name="Bottom right screen purity" address="0xEB"/>
 		</subgroup>
 		<subgroup name="Various">
-			<control id="focus" type="value" name="Focus" address="0x1C"/>
 			<control id="landing" type="value" name="Landing Adjust (RGB alignment)" address="0x5C"/>
 			<control id="sharpness" type="value" name="Sharpness" address="0x8c"/>
 		</subgroup>
@@ -197,6 +196,10 @@
 				<value id="enable" name="Enable"/>
 				<value id="partenable" name="Enable only brightness/contrast settings"/>
 			</control>
+			<control id="osd2" type="list" name="On Screen Display (Samsung)" address="0xf5"> <!--- Samsung has 2 OSD controls -->
+				<value id="disable" name="Disable"/>
+				<value id="enable" name="Enable"/>
+			</control>
 			<control id="osdorientation" type="list" name="OSD Orientation" address="0xaa">
 				<value id="landscape" name="Landscape"/>
 				<value id="portrait" name="Portrait"/>

Index: Makefile.in
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.in	22 Feb 2006 22:16:38 -0000	1.10
+++ Makefile.in	23 Feb 2006 00:54:31 -0000	1.11
@@ -34,11 +34,16 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = db
 DIST_COMMON = $(nobase_dist_data_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -57,16 +62,25 @@
 DATA = $(nobase_dist_data_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMSGFMT = @GMSGFMT@
 HAVE_PERL_FALSE = @HAVE_PERL_FALSE@
 HAVE_PERL_TRUE = @HAVE_PERL_TRUE@
@@ -74,8 +88,40 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -84,6 +130,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -92,21 +139,35 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
+POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 datadir = @datadir@/ddccontrol-db
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -320,7 +381,7 @@
 	make options.xml
 
 check-db: options.xml
-	ls monitor/*.xml | awk -F/ '{print $$2}' | awk -F. '{print "ddccontrol -b . -v -v -i " $$1 "\nif [ $$? = 1 ]; then\nexit 1;\nfi"}' | bash -
+	ls monitor/*.xml | awk -F/ '{print $$2}' | awk -F. '{print "grep -q NOCHECKDB monitor/" $$1 ".xml\nif [ $$? = 1 ]; then\n ddccontrol -b . -v -v -i " $$1 "\nif [ $$? = 1 ]; then\nexit 1;\nfi\nfi"}' | bash -
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	13 Jul 2005 23:30:02 -0000	1.7
+++ Makefile.am	23 Feb 2006 00:54:31 -0000	1.8
@@ -26,4 +26,4 @@
 	make options.xml
 
 check-db: options.xml
-	ls monitor/*.xml | awk -F/ '{print $$2}' | awk -F. '{print "ddccontrol -b . -v -v -i " $$1 "\nif [ $$? = 1 ]; then\nexit 1;\nfi"}' | bash -
+	ls monitor/*.xml | awk -F/ '{print $$2}' | awk -F. '{print "grep -q NOCHECKDB monitor/" $$1 ".xml\nif [ $$? = 1 ]; then\n ddccontrol -b . -v -v -i " $$1 "\nif [ $$? = 1 ]; then\nexit 1;\nfi\nfi"}' | bash -

Index: options.xml.in
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/options.xml.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- options.xml.in	22 Feb 2006 22:16:39 -0000	1.12
+++ options.xml.in	23 Feb 2006 00:54:31 -0000	1.13
@@ -159,7 +159,6 @@
 			<control id="brpurity" type="value" name="Bottom right screen purity" address="0xEB"/>
 		</subgroup>
 		<subgroup name="Various">
-			<control id="focus" type="value" name="Focus" address="0x1C"/>
 			<control id="landing" type="value" name="Landing Adjust (RGB alignment)" address="0x5C"/>
 			<control id="sharpness" type="value" name="Sharpness" address="0x8c"/>
 		</subgroup>
@@ -196,6 +195,10 @@
 				<value id="enable" name="Enable"/>
 				<value id="partenable" name="Enable only brightness/contrast settings"/>
 			</control>
+			<control id="osd2" type="list" name="On Screen Display (Samsung)" address="0xf5"> <!--- Samsung has 2 OSD controls -->
+				<value id="disable" name="Disable"/>
+				<value id="enable" name="Enable"/>
+			</control>
 			<control id="osdorientation" type="list" name="OSD Orientation" address="0xaa">
 				<value id="landscape" name="Landscape"/>
 				<value id="portrait" name="Portrait"/>

[ddccontrol-cvs] ddccontrol-db configure.ac,1.8,1.9

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1092

Modified Files:
	configure.ac 
Log Message:
Update Samsung monitors to use generic profiles.

Index: configure.ac
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac	22 Feb 2006 22:16:37 -0000	1.8
+++ configure.ac	23 Feb 2006 00:54:30 -0000	1.9
@@ -6,7 +6,11 @@
 
 AM_MAINTAINER_MODE
 
-AM_PO_SUBDIRS
+AM_GNU_GETTEXT([external])
+GETTEXT_PACKAGE=ddccontrol-db
+AC_SUBST([GETTEXT_PACKAGE])
+
+AC_PROG_INTLTOOL
 
 AC_CHECK_PROG(PERL,perl,perl,)
 

[ddccontrol-cvs] ddccontrol-db ChangeLog,1.65,1.66

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7696

Modified Files:
	ChangeLog 
Log Message:
Update ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- ChangeLog	22 Feb 2006 13:35:00 -0000	1.65
+++ ChangeLog	22 Feb 2006 22:17:07 -0000	1.66
@@ -1,3 +1,30 @@
+2006-02-22 22:16  nboichat
+
+	* configure.ac, db/Makefile.in, db/options.xml, db/options.xml.in,
+	  db/monitor/DEL4005.xml, db/monitor/DELE009.xml,
+	  db/monitor/FUS0550.xml, db/monitor/FUS0552.xml,
+	  db/monitor/FUS0554.xml, db/monitor/FUS0555.xml,
+	  db/monitor/MEL44B0.xml, db/monitor/MEL4511.xml,
+	  db/monitor/MEL4513.xml, db/monitor/MEL4632.xml,
+	  db/monitor/NEC662B.xml, db/monitor/SAM001D.xml,
+	  db/monitor/SAM00BA.xml, db/monitor/SAM00D3.xml,
+	  db/monitor/SAM00E2.xml, db/monitor/SAM00EC.xml,
+	  db/monitor/SAM00ED.xml, db/monitor/SAM0109.xml,
+	  db/monitor/SAM010C.xml, db/monitor/SAM010D.xml,
+	  db/monitor/SAM010F.xml, db/monitor/SAM0115.xml,
+	  db/monitor/SAM011F.xml, db/monitor/SAM0124.xml,
+	  db/monitor/SAM0168.xml, db/monitor/SAM017C.xml,
+	  db/monitor/SAM0191.xml, db/monitor/SAM0192.xml,
+	  db/monitor/SAM0194.xml, db/monitor/SAM0196.xml,
+	  db/monitor/SAM0198.xml, db/monitor/SAM0199.xml,
+	  db/monitor/SAM01B3.xml, db/monitor/SAM01B4.xml,
+	  db/monitor/SAM01B5.xml, db/monitor/SAM01B6.xml,
+	  db/monitor/SAM01E3.xml, db/monitor/SAM01E4.xml,
+	  db/monitor/SAM01E5.xml, db/monitor/SUN0577.xml,
+	  po/Makefile.in.in: Database version 3 (add VESA generic profile).
+
+2006-02-22 13:34  tag Before_db_version_3
+
 2006-02-22 13:34  nboichat
 
 	* db/monitor/SUN0577.xml: Add support for SUN GDM-5410 (Thanks to

[ddccontrol-cvs] ddccontrol-db/db/monitor DEL4005.xml,1.1,1.2 DELE009.xml,1.2,1.3 FUS0550.xml,1.1,1.2 FUS0552.xml,1.3,1.4 FUS0554.xml,1.1,1.2 FUS0555.xml,1.1,1.2 MEL44B0.xml,1.2,1.3 MEL4511.xml,1.1.1.1,1.2 MEL4513.xml,1.10,1.11 MEL4632.xml,1.2,1.3 NEC662B.xml,1.4,1.5 SAM001D.xml,1.2,1.3 SAM00BA.xml,1.6,1.7 SAM00D3.xml,1.5,1.6 SAM00E2.xml,1.3,1.4 SAM00EC.xml,1.1,1.2 SAM00ED.xml,1.1,1.2 SAM0109.xml,1.2,1.3 SAM010C.xml,1.1,1.2 SAM010D.xml,1.1,1.2 SAM010F.xml,1.1,1.2 SAM0115.xml,1.3,1.4 SAM011F.xml,1.1,1.2 SAM0124.xml,1.1,1.2 SAM0168.xml,1.1,1.2 SAM017C.xml,1.1,1.2 SAM0191.xml,1.1,1.2 SAM0192.xml,1.1,1.2 SAM0194.xml,1.2,1.3 SAM0196.xml,1.2,1.3 SAM0198.xml,1.1,1.2 SAM0199.xml,1.1,1.2 SAM01B3.xml,1.2,1.3 SAM01B4.xml,1.2,1.3 SAM01B5.xml,1.1,1.2 SAM01B6.xml,1.3,1.4 SAM01E3.xml,1.1,1.2 SAM01E4.xml,1.1,1.2 SAM01E5.xml,1.1,1.2 SUN0577.xml,1.1,1.2

[Nicolas B. <nbo...@us...>]

Update of /cvsroot/ddccontrol/ddccontrol-db/db/monitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7457/db/monitor

Modified Files:
	DEL4005.xml DELE009.xml FUS0550.xml FUS0552.xml FUS0554.xml 
	FUS0555.xml MEL44B0.xml MEL4511.xml MEL4513.xml MEL4632.xml 
	NEC662B.xml SAM001D.xml SAM00BA.xml SAM00D3.xml SAM00E2.xml 
	SAM00EC.xml SAM00ED.xml SAM0109.xml SAM010C.xml SAM010D.xml 
	SAM010F.xml SAM0115.xml SAM011F.xml SAM0124.xml SAM0168.xml 
	SAM017C.xml SAM0191.xml SAM0192.xml SAM0194.xml SAM0196.xml 
	SAM0198.xml SAM0199.xml SAM01B3.xml SAM01B4.xml SAM01B5.xml 
	SAM01B6.xml SAM01E3.xml SAM01E4.xml SAM01E5.xml SUN0577.xml 
Log Message:
Database version 3 (add VESA generic profile).

Index: MEL44B0.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/MEL44B0.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MEL44B0.xml	19 Oct 2005 16:01:26 -0000	1.2
+++ MEL44B0.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -1,11 +1,14 @@
 <?xml version="1.0"?>
-<monitor name="Mitsubishi Diamond Plus 92" init="standard" caps="">
-	<!--- degauss not in caps -->
+<monitor name="Mitsubishi Diamond Plus 92" init="standard">
+	<!---
+		( prot(Monitor) type(CRT)       model(NFK99XX)
+		pwr({run( ) stdby( ) susp( )    shut( )} )
+		cmds( 01 02 03 )
+		vcp( 10 12 14 16 18 1A 20 22 24 26 28 30 32 38 40 42
+		44 46 4A 54 56 68 E1 E2 E3 E8 E9 EA EB EF)) 
+	-->
+	<caps add="(vcp (00))"/>
 	<controls>
-		<control id="degauss" address="0x00"/>
-
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
 		<control id="colorpreset" address="0x14">
 			<!--- Maybe we could try to find the meaning of these values -->
 			<value id="user1" value="0"/>
@@ -13,29 +16,7 @@
 			<value id="user3" value="2"/>
 			<value id="user4" value="3"/>
 		</control>
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1A"/>
 		
-		<control id="hpos" address="0x20"/>
-		<control id="hsize" address="0x22"/>
-		<control id="hpincushion" address="0x24"/>
-		<control id="hpincushionbalance" address="0x26"/>
-		<control id="hmisconvergence" address="0x28"/>
-
-		<control id="vpos" address="0x30"/>
-		<control id="vsize" address="0x32"/>
-		<control id="vmisconvergence" address="0x38"/>
-		
-		<control id="keybalance" address="0x40"/>
-		<control id="key" address="0x42"/>
-		<control id="tilt" address="0x44"/>
-		<control id="tdistortionctrl" address="0x46"/>
-		<control id="bdistortionctrl" address="0x4A"/>
-		
-		<control id="colortemp" address="0x54"/>
-		<control id="vmoire" address="0x56"/>
-
 		<control id="language" type="list" address="0x68">
 			<value id="english" value="0"/>
 			<value id="german"  value="1"/>
@@ -45,7 +26,6 @@
 			<value id="chinese" value="5"/>
 		</control>
 
-		<control id="power" address="0xE1"/>
 		<!--- Control 0xe2: +/1/1 [Clamp Pulse Position] -->
 		<control id="osd" type="list" address="0xE3"> <!--- Control lock = OSD lock ? -->
 			<value id="enable"  value="0"/>
@@ -57,4 +37,5 @@
 		<control id="brpurity" address="0xEB"/>
 		<!--- Control 0xef: +/0/4 [OSD Position] -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: NEC662B.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/NEC662B.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NEC662B.xml	14 Feb 2006 14:46:04 -0000	1.4
+++ NEC662B.xml	22 Feb 2006 22:16:40 -0000	1.5
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
 <monitor name="NEC Multisync 2080UX+" init="standard">
 	<controls>
-		<control id="defaults" address="0x04"/>
-		<control id="defaultgeom" address="0x06"/>
-		<control id="defaultcolor" address="0x08"/>
-		<control id="coarse" address="0x0e"/>
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
 		<control id="colorpreset" address="0x14">
 			<value id="5000k"  value="4"/>
 			<value id="6500k"  value="1"/>
@@ -19,11 +13,6 @@
 			<value id="pos" value="1"/>
 		</control>
 		
-		<control id="hpos" address="0x20"/>
-		<control id="vpos" address="0x30"/>
-		
-		<control id="fine" address="0x3e"/>
-		
 		<!-- Control 0x54: +/43/46 [Color Temperature], not working -->
 		
 		<control id="language" type="list" address="0x68">
@@ -60,4 +49,5 @@
 		</control>
 		<!-- Control 0xff: +/587/65535 [Power On Time in 30 min, RO] -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: FUS0554.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0554.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FUS0554.xml	15 Jul 2005 13:52:19 -0000	1.1
+++ FUS0554.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The P20-2 is identical to P19-2 -->
-<monitor include="FUS0552" name="Fujitsu Siemens P20-2 (VGA)"/>
+<monitor name="Fujitsu Siemens P20-2 (VGA)">
+	<include file="FUS0552"/>
+</monitor>
\ No newline at end of file

Index: FUS0555.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0555.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FUS0555.xml	15 Jul 2005 13:52:19 -0000	1.1
+++ FUS0555.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The P20-2 is identical to P19-2 -->
-<monitor include="FUS0552" name="Fujitsu Siemens P20-2 (DVI)"/>
+<monitor name="Fujitsu Siemens P20-2 (DVI)">
+	<include file="FUS0552"/>
+</monitor>
\ No newline at end of file

Index: SAM017C.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM017C.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM017C.xml	10 Sep 2005 09:47:01 -0000	1.1
+++ SAM017C.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 174T is identical to 173T -->
-<monitor include="SAM00BA" name="Samsung SyncMaster 174T"/>
+<monitor name="Samsung SyncMaster 174T">
+	<include file="SAM00BA"/>
+</monitor>
\ No newline at end of file

Index: FUS0552.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0552.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FUS0552.xml	13 Jul 2005 23:30:02 -0000	1.3
+++ FUS0552.xml	22 Feb 2006 22:16:40 -0000	1.4
@@ -2,14 +2,7 @@
 <monitor name="Fujitsu Siemens P19-2" init="standard">
 	<controls>
 		<!-- 0x02: +/1/2 New control value -->
-		<control id="defaults" address="0x04"/>
-		<control id="defaultluma" address="0x05"/>
-		<control id="defaultgeom" address="0x06"/>
-		<control id="defaultcolor" address="0x08"/>
-		<control id="coarse" address="0x0E"/>
 
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
 		<control id="colorpreset" address="0x14">
 			<value id="srgb"   value="0x1"/>
 			<value id="native" value="0x2"/>
@@ -26,38 +19,21 @@
 			<value id="user3"  value="0xD"/>
 		</control>
 
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1A"/>
-
 		<control id="auto" address="0x1e">
 			<value id="coarsefine" value="1"/>
 			<value id="pos" value="2"/>
 		</control>
 
-		<control id="hpos" address="0x20"/>
-		<control id="vpos" address="0x30"/>
-
-		<control id="fine" address="0x3e"/>
-
 		<control id="inputsource" type="list" address="0x60">
 			<value id="analog" value="1"/>
 			<value id="digital" value="3"/>
 		</control>
-		<control id="audiospeakervolume" address="0x62"/>
-		<!-- 0x6c Red Video Black Level -->
-		<!-- 0x6e Green Video Black Level -->
-		<!-- 0x70 Blue Video Black Level -->
-
+		
 		<control id="mute" type="list" address="0x94">
 			<value id="mute" value="0"/>
 			<value id="normal" value="2"/>
 		</control>
 
-		<control id="osdorientation" type="list" address="0xaa">
-				<value id="landscape" value="1"/>
-				<value id="portrait" value="2"/>
-		</control>
 		<!-- 0xac: +/6390/0 Horizontal freq.  [kHz] -->
 		<!-- 0xae: +/5990/0 Vertical freq. [Hz] -->
 		<!-- 0xb2: +/1/0 Flat panel sub pixel layout
@@ -91,10 +67,6 @@
 			<value id="swedish" value="12"/>
 		</control>
 
-		<control id="dpms" type="list" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="2"/>
-		</control>
 		<!-- 0xdf: +/512/0 VCP version (02 00) -->
 		<!-- 0xfe: Auto level : For the auto level function a suitable test
 picture is required which has at least 1 full white (0xFFFFFF) line. -->
@@ -103,4 +75,5 @@
 			<value id="off" value="0"/>
 		</control>
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SUN0577.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SUN0577.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SUN0577.xml	22 Feb 2006 13:34:48 -0000	1.1
+++ SUN0577.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -2,35 +2,12 @@
 <!--- SUN GDM-5410 is a CRT (Thanks to "bman" for providing this file) -->
 <monitor name="SUN GDM-5410" init="standard">
 	<controls>
-	
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
-
-		<control id="hsize" address="0x22"/>
-		<control id="hpos" address="0x20"/>
-
-		<control id="vpos" address="0x30"/>
-                <control id="vsize" address="0x32"/>
-
-		<control id="hpincushion" address="0x24"/>
-                <control id="hpincushionbalance" address="0x26"/>
-
-		<control id="tilt" address="0x44"/>
-
-		<control id="key" address="0x42"/>
-		<control id="keybalance" address="0x40"/>
-				
 		<control id="colorpreset" address="0x14">
 			<value id="5000k"  value="0x0"/>
 			<value id="6500k"  value="0x1"/>
 			<value id="9300k"  value="0x2"/>
 		</control>
 
-		<control id="hmoire" address="0x56"/>
-
-		<control id="hmisconvergence" address="0x28"/>
-		<control id="vmisconvergence" address="0x38"/>
-
 		<control id="tlpurity" address="0xF1"/>
 		<control id="trpurity" address="0xF2"/>
 		<control id="blpurity" address="0xF4"/>
@@ -52,4 +29,5 @@
 <!--		<control id="vbotmisconvergence" address="0xF7"/>	-->
 
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM01E4.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01E4.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM01E4.xml	24 Jan 2006 17:09:40 -0000	1.1
+++ SAM01E4.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,2 +1,4 @@
 <?xml version="1.0"?>
-<monitor include="SAM01B4" name="Samsung SyncMaster 960BF (Analog)"/>
+<monitor name="Samsung SyncMaster 960BF (VGA)">
+	<include file="SAM01B4"/>
+</monitor>
\ No newline at end of file

Index: DEL4005.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/DEL4005.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEL4005.xml	4 Nov 2005 16:03:53 -0000	1.1
+++ DEL4005.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 <monitor name="Dell 1704FPT (Digital)" init="standard">
 	<controls>
-		<control id="defaults" address="0x04"/>
-		<control id="defaultcolor" address="0x08"/>
-		
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
 		<control id="colorpreset" address="0x14">
 			<!--- Copied from Fujitsu, needs to be checked -->
 			<value id="srgb"   value="0x1"/>
@@ -22,10 +17,6 @@
 			<value id="user2"  value="0xC"/>
 		</control>
 		
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1A"/>
-		
 		<control id="language" type="list" address="0x68">
 			<!--- Copied from NEC662B, needs to be checked -->
 			<value id="english" value="1"/>
@@ -43,12 +34,8 @@
 		<!-- Control 0xb4: +/1/2 [RGB Ordering, RO] -->
 		<!-- Control 0xb6: +/3/5 [Monitor Type, RO] -->
 		
-		<control id="dpms" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="4"/>
-		</control>
-		
 		<!--- Control 0xd7: +/0/1 [???] -->
 		<!--- Control 0xd8: +/0/1 [???] -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM01B4.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01B4.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM01B4.xml	14 Feb 2006 14:46:04 -0000	1.2
+++ SAM01B4.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -2,36 +2,15 @@
 <!--- CA and E1 are supported but not reported by CAPS (OSD and power, so they're not very useful) -->
 <monitor name="Samsung SyncMaster 770P (DVI)" init="standard">
 	<controls>
-		<control id="defaults" address="0x04"/>
-		<control id="defaultluma" address="0x05"/>
-		<control id="defaultgeom" address="0x06"/>
-		<control id="defaultcolor" address="0x08"/>
-		<control id="coarse" address="0x0e"/>
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1a"/>
 		<control id="auto" address="0x1e">
 			<value id="pos" value="1"/>
 			<value id="posfast" value="2"/>
 		</control>
-		<control id="hpos" address="0x20"/>
-		<control id="vpos" address="0x30"/>
-		<control id="fine" address="0x3e"/>
-		<control id="inputsource" type="list" address="0x60">
-			<value id="analog" value="1"/>
-			<value id="digital" value="3"/>
-		</control>
 		<!-- 0x62: +/25/50 [???] -->
 		<!-- 0x6c Service: Red Video Black Level -->
 		<!-- 0x6e Service: Green Video Black Level -->
 		<!-- 0x70 Service: Blue Video Black Level -->
 		<control id="sharpness" address="0x87"/>
-		<control id="settings" type="command" address="0xb0">
-			<value id="store" value="1"/>
-			<value id="restorefactory" value="2"/>
-		</control>
 		<!-- 0xb6: +/3/8	[???] -->
 		<!-- 0xc6: +/1/1	[???] -->
 		<!-- 0xc8: +/5/16	[???] -->
@@ -41,10 +20,6 @@
 			<value id="enable" value="2"/>
 		</control>
 		<!--- 0xcc: language, always 2, english -->
-		<control id="dpms" type="list" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="4"/>
-		</control>
 		<control id="magicbright" type="list" address="0xdc">
 			<value id="text" value="1"/>
 			<value id="internet" value="2"/>
@@ -66,10 +41,6 @@
 			<value id="cool6" value="8"/>
 			<value id="cool7" value="9"/>
 		</control>
-		<control id="power" type="list" address="0xe1">
-			<value id="off" value="0"/>
-			<value id="on" value="1"/>
-		</control>
 		<!-- 0xe2: +/0/1	[???] -->
 		<!-- 0xed: +/100/100	[SAM: Red Video Black Level] -->
 		<!-- 0xee: +/100/100	[SAM: Green Video Black Level] -->
@@ -97,4 +68,5 @@
 		<!-- 0xfb: +/128/255 [???] -->
 		<!-- 0xfc: +/8/30 [???] -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM011F.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM011F.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM011F.xml	11 Aug 2005 12:38:04 -0000	1.1
+++ SAM011F.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 912N is identical to 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 912N"/>
+<monitor name="Samsung SyncMaster 912N">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: SAM00ED.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM00ED.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM00ED.xml	22 Mar 2005 23:15:41 -0000	1.1
+++ SAM00ED.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 193P is identical to 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 193P (DVI)"/>
+<monitor name="Samsung SyncMaster 193P (DVI)">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: SAM01E3.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01E3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM01E3.xml	21 Jan 2006 18:27:56 -0000	1.1
+++ SAM01E3.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 760BF seems to work with the settings of the 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 760BF"/>
+<monitor name="Samsung SyncMaster 760BF">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: MEL4632.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/MEL4632.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MEL4632.xml	19 Oct 2005 16:01:26 -0000	1.2
+++ MEL4632.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
-<monitor name="Mitsubishi Diamond Pro 2070sb" init="standard" caps="">
+<monitor name="Mitsubishi Diamond Pro 2070sb">
+	<!---  mccs_ver(1.1) type(CRT_AG) vcp(00 01 04 06 08 10 12 14(01 04 06 07 08) 16 18 1A 1E 20 22 24 26 28 30 32 38 3A 3C 40 42 44 46 47 48 4A 4C 54 56 68 6C 6E 70 D6 E1 E2 E3 E6 E8 E9 EA EB EF F6 F9 FA FC FF) vcp_p02(3B 3C 42 43 44 46 49 4A 4B 4C 4E 4F 54 56) asset_eep(40) mpu_ver(2.1.0) -->
 	<controls>
-		<control id="degauss" address="0x00"/>
-		<control id="defaults" address="0x04" delay="1000"/>
 		<control id="defaultsizepos" address="0x06" delay="1000"/>
 		<control id="defaultluma" address="0x08" delay="1000"/>
-
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
+		
 		<control id="colorpreset" address="0x14">
 			<!--- Copied from NEC 2080UX+, needs to be checked -->
 			<value id="5000k"  value="4"/>
@@ -17,35 +14,9 @@
 			<value id="9300k"  value="8"/>
 			<value id="native" value="2"/>
 		</control>
-
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1A"/>
-		
+	
 		<!--- Control 0x1e: +/0/1 [???] -->
-
-		<control id="hpos" address="0x20"/>
-		<control id="hsize" address="0x22"/>
-		<control id="hpincushion" address="0x24"/>
-		<control id="hpincushionbalance" address="0x26"/>
-		<control id="hmisconvergence" address="0x28"/>
-		<control id="vpos" address="0x30"/>
-		<control id="vsize" address="0x32"/>	
-		<control id="vmisconvergence" address="0x38"/>
-		<control id="vlinearity"  address="0x3A"/>
-		<control id="vlinearitybalance" address="0x3C"/>
-		
-		<control id="keybalance" address="0x40"/>
-		<control id="key" address="0x42"/>
-		<control id="tilt" address="0x44"/>
-		<control id="tdistortionctrl" address="0x46"/>
-		<control id="tdistortionbalance" address="0x48"/>
-		<control id="bdistortionctrl" address="0x4A"/>
-		<control id="bdistortionbalance" address="0x4C"/>
-		
-		<control id="colortemp" address="0x54"/>
-		<control id="vmoire" address="0x56"/>
-
+	
 		<control id="language" type="list" address="0x68">
 			<value id="english" value="0"/>
 			<value id="german"  value="1"/>
@@ -54,27 +25,16 @@
 			<value id="italian" value="4"/>
 			<value id="chinese" value="5"/>
 		</control>
-		<control id="redblack" address="0x6C"/>
-		<control id="greenblack" address="0x6E"/>
-
-		<control id="blueblack" address="0x70"/>
 
 		<!---Control 0xa8: +/1/3 [Sync Type]-->
 
-		<control id="settings" address="0xb0"/>
-
-		<control id="dpms" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="4"/>
-		</control>
-
 		<control id="power" address="0xE1"/>
 		<!--- Control 0xe2: +/0/1 [Clamp Pulse Position] -->
 		<control id="osd" type="list" address="0xE3"> <!--- Control lock = OSD lock ? -->
 			<value id="enable"  value="0"/>
 			<value id="disable" value="1"/>
 		</control>
-		<control id="cpincushion" address="0xE1"/>
+		<control id="cpincushion" address="0xE6"/>
 		<control id="tlpurity" address="0xE8"/>
 		<control id="trpurity" address="0xE9"/>
 		<control id="blpurity" address="0xEA"/>
@@ -87,4 +47,5 @@
 		<!--- Control 0xfc: +/9/24 [OSD Turn Off Delay] -->
 		<!--- Control 0xff: +/6060/65535 [Power On Time in 30 min, RO] -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM0124.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0124.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM0124.xml	25 Jul 2005 16:52:29 -0000	1.1
+++ SAM0124.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 712N is identical to 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 712N"/>
+<monitor name="Samsung SyncMaster 712N">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: FUS0550.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/FUS0550.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FUS0550.xml	15 Jul 2005 13:52:19 -0000	1.1
+++ FUS0550.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The P17-2 is identical to P19-2 -->
-<monitor include="FUS0552" name="Fujitsu Siemens P17-2"/>
+<monitor name="Fujitsu Siemens P17-2">
+	<include file="FUS0552"/>
+</monitor>

Index: SAM0109.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0109.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM0109.xml	12 Nov 2005 22:55:19 -0000	1.2
+++ SAM0109.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -3,14 +3,10 @@
 <monitor name="Samsung SyncMaster 997MB" init="standard">
 	<controls>
 		<control id="degauss" address="0x01"/>
-		<control id="defaultluma" address="0x05" delay="1000"/>
 		<control id="defaultsizepos" address="0x06" delay="1000"/>
-		<control id="defaultcolor" address="0x08" delay="1000"/>
 		<!--- Control 0x0b: +/100/100 [???] -->
 		<!--- Control 0x0c: +/35/63 [???] -->
 
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
 		<control id="colorpreset" address="0x14"> <!--- Color preset. Looks invalid (value=5, max=3) -->
 			<!--- Values need to be tested -->
 			<value id="srgb"   value="0x1"/>
@@ -18,29 +14,7 @@
 			<value id="6500k"  value="0x5"/>
 			<value id="9300k"  value="0x8"/>
 		</control>
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1A"/>
-		<control id="focus" address="0x1C"/>
 
-		<control id="hpos" address="0x20"/>
-		<control id="hsize" address="0x22"/>	
-		<control id="hpincushion" address="0x24"/>
-		<control id="hpincushionbalance" address="0x26"/>
-
-		<control id="vpos" address="0x30"/>
-		<control id="vsize" address="0x32"/>
-		<control id="vlinearity"  address="0x3A"/>
-		
-		<control id="keybalance" address="0x40"/>
-		<control id="key" address="0x42"/>
-		<control id="tilt" address="0x44"/>
-		<control id="tdistortionctrl" address="0x46"/>
-		<control id="bdistortionctrl" address="0x4A"/>
-		
-		<control id="hmoire" address="0x56"/>
-		<control id="vmoire" address="0x58"/>
-		
 		<!--- Control 0x6c: +/128/255 [Red Video Black Level] -->
 		<!--- Control 0x6e: +/118/255 [Green Video Black Level] -->
 		<!--- Control 0x70: +/126/255 [Blue Video Black Level] -->
@@ -48,11 +22,6 @@
 		<!--- Control 0xac: +/28164/2 [Horizontal freq. [? * Hz]] -->
 		<!--- Control 0xae: +/7400/0 [Vertical freq. [Hz]] -->
 
-		<control id="settings" type="command" address="0xb0">
-			<value id="store" value="1"/>
-			<value id="restorefactory" value="2"/>
-		</control>
-
 		<control id="magicbright" type="list" address="0xdc">
 			<value id="text" value="1"/>
 			<value id="internet" value="2"/>
@@ -78,4 +47,5 @@
 		<!--- Control 0xf8: +/55/127 [???] -->
 		<!--- Control 0xff: +/0/127 [???] -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM00BA.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM00BA.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SAM00BA.xml	13 Jul 2005 17:49:38 -0000	1.6
+++ SAM00BA.xml	22 Feb 2006 22:16:40 -0000	1.7
@@ -1,34 +1,14 @@
 <?xml version="1.0"?>
 <monitor name="Samsung SyncMaster 173T" init="standard">
 	<controls>
-		<control id="defaults" address="0x04"/>
-		<control id="defaultluma" address="0x05"/>
-		<control id="defaultgeom" address="0x06"/>
-		<control id="defaultcolor" address="0x08"/>
-		<control id="coarse" address="0x0e"/>
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1a"/>
 		<control id="auto" address="0x1e">
 			<value id="pos" value="1"/>
 		</control>
-		<control id="hpos" address="0x20"/>
-		<control id="vpos" address="0x30"/>
-		<control id="fine" address="0x3e"/>
-		<control id="inputsource" type="list" address="0x60">
-			<value id="analog" value="1"/>
-			<value id="digital" value="3"/>
-		</control>
 		<!-- 0x62 has no meaning for SM173T -->
 		<!-- 0x6c Service: Red Video Black Level -->
 		<!-- 0x6e Service: Green Video Black Level -->
 		<!-- 0x70 Service: Blue Video Black Level -->
-		<control id="settings" type="command" address="0xb0">
-			<value id="store" value="1"/>
-			<value id="restorefactory" value="2"/>
-		</control>
+		
 		<!-- 0xb6: +/3/8	[???] -->
 		<!-- 0xc6: +/1/1	[???] -->
 		<!-- 0xc8: +/5/16	[???] -->
@@ -46,10 +26,6 @@
 			<value id="spanish" value="10"/>
 			<value id="swedish" value="11"/>
 		</control>
-		<control id="dpms" type="list" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="4"/>
-		</control>
 		<control id="magicbright" type="list" address="0xdc">
 			<value id="text" value="1"/>
 			<value id="internet" value="2"/>
@@ -62,10 +38,6 @@
 			<value id="warm" value="1"/>
 			<value id="cool" value="2"/>
 		</control>
-		<control id="power" type="list" address="0xe1">
-			<value id="off" value="0"/>
-			<value id="on" value="1"/>
-		</control>
 		<!-- 0xe2: +/0/1	[???] -->
 		<!-- 0xed: +/108/255	[SAM: Red Video Black Level] -->
 		<!-- 0xee: +/101/255	[SAM: Green Video Black Level] -->

Index: SAM0115.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0115.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SAM0115.xml	21 Feb 2006 11:38:15 -0000	1.3
+++ SAM0115.xml	22 Feb 2006 22:16:40 -0000	1.4
@@ -1,35 +1,19 @@
 <?xml version="1.0"?>
 <!--- Thanks to Hubai Tamas for his help to create this database file -->
 <!--- CC, E1 and F5 are not in caps  (language, power and OSD enable) -->
-<monitor name="Samsung SyncMaster 913V" init="standard" caps="">
+<monitor name="Samsung SyncMaster 913V" init="standard">
+	<caps add="(lcd(CC E1 F5))">
 	<controls>
-		<control id="defaults" address="0x04"/>
-		<control id="defaultluma" address="0x05"/>
-		<control id="defaultgeom" address="0x06"/>
-		<control id="defaultcolor" address="0x08"/>
-		<control id="coarse" address="0x0e"/>
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1a"/>
 		<control id="auto" address="0x1e">
 			<value id="pos" value="1"/>
 			<value id="posfast" value="2"/>
 		</control>
-		<control id="hpos" address="0x20"/>
-		<control id="vpos" address="0x30"/>
-		<control id="fine" address="0x3e"/>
 		<!-- 0x60: +/1/3 [Input source, not applicable on 913V] -->
 		<!-- 0x62: +/25/50 [???] -->
 		<!-- 0x6c Service: Red Video Black Level -->
 		<!-- 0x6e Service: Green Video Black Level -->
 		<!-- 0x70 Service: Blue Video Black Level -->
 		<control id="sharpness" address="0x87"/>
-		<control id="settings" type="command" address="0xb0">
-			<value id="store" value="1"/>
-			<value id="restorefactory" value="2"/>
-		</control>
 		<!-- 0xb6: +/3/8	[???] -->
 		<!-- 0xc6: +/1/1	[???] -->
 		<!-- 0xc8: +/5/16	[???] -->
@@ -44,10 +28,6 @@
 			<value id="spanish" value="10"/>
 			<value id="swedish" value="11"/>
 		</control>
-		<control id="dpms" type="list" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="4"/>
-		</control>
 		<control id="magicbright" type="list" address="0xdc">
 			<value id="text" value="1"/>
 			<value id="internet" value="2"/>
@@ -60,10 +40,6 @@
 			<value id="warm" value="1"/>
 			<value id="cool" value="2"/>
 		</control>
-		<control id="power" type="list" address="0xe1">
-			<value id="off" value="0"/>
-			<value id="on" value="1"/>
-		</control>
 		<!-- 0xe2: +/0/1	[???] -->
 		<!-- 0xed: +/100/100	[SAM: Red Video Black Level] -->
 		<!-- 0xee: +/100/100	[SAM: Green Video Black Level] -->
@@ -80,4 +56,5 @@
 			<value id="disable" value="1"/>
 		</control>
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM0194.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0194.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM0194.xml	21 Feb 2006 11:38:15 -0000	1.2
+++ SAM0194.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -1,2 +1,4 @@
 <?xml version="1.0"?>
-<monitor include="SAM0191" name="Samsung SyncMaster 930BF (VGA)"/>
+<monitor name="Samsung SyncMaster 930BF (VGA)">
+	<include file="SAM0191"/>
+</monitor>
\ No newline at end of file

Index: DELE009.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/DELE009.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DELE009.xml	27 Nov 2005 09:11:16 -0000	1.2
+++ DELE009.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -1,34 +1,16 @@
 <?xml version="1.0"?>
-<monitor name="Dell 2005FPW (Digital)" init="standard" caps="">
+<monitor name="Dell 2005FPW (Digital)" init="standard">
+	<!--- vcp(page0(04 05 06 08 0E 10 12 14(01 04 05 08 0B) 16 18 1A 1E 20 30 3E B0 CC(2 3 4 6 0A) E3)asset_eep(40)mccs_ver(1.0)type(LCD) -->
+	<caps add="(vcp(60 e1))"/>
 	<controls>
-		<control id="defaults" address="0x04"/>
-		
-		<!--- Control 0x05: +/0/1 [???] -->
-		<!--- Control 0x06: +/0/255 [???] -->
-
-		<control id="defaultcolor" address="0x08"/>
-		
-		<!--- Control 0x0e: +/0/255 [???] -->
-		
-		<control id="brightness" address="0x10"/>
-		
-		<!--- Control 0x12: +/0/255 [???] -->
-
 		<control id="colorpreset" address="0x14">
 			<value id="warm"  value="0x04"/>
 			<value id="srgb"  value="0x05"/>
 			<value id="cool"  value="0x08"/>
 			<value id="user1" value="0x0b"/>
 		</control>
-		
-		<control id="red"   address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue"  address="0x1a"/>
-		
+
 		<!--- Control 0x1e: +/0/255 [???] -->
-		<!--- Control 0x20: +/0/255 [???] -->
-		<!--- Control 0x30: +/0/255 [???] -->
-		<!--- Control 0x3e: +/0/255 [???] -->
 
 		<control id="inputsource" type="list" address="0x60">
 			<value id="analog"  value="1"/>
@@ -36,7 +18,6 @@
 		</control>
 
 		<!--- Control 0x68: +/0/255 [???] -->
-		<!--- Control 0xb0: +/0/1 [???] -->
 		<!--- Control 0xca: +/0/2 [???] -->
 
 		<control id="language" type="list" address="0xcc">
@@ -44,18 +25,14 @@
 			<value id="french"   value="0x03"/>
 			<value id="german"   value="0x04"/>
 			<value id="japanese" value="0x06"/>
-			<value id="spanish"  value="0x0a"/>			
+			<value id="spanish"  value="0x0a"/>
 		</control>
 		
 		<!--- Control 0xd6: +/1/4 [???] -->
 		<!--- Control 0xe0: +/0/3 [???] -->
 		
-		<control id="power" type="list" address="0xe1">
-			<value id="off" value="0"/>
-			<value id="on"  value="1"/>
-		</control>
-		
 		<!--- Control 0xe3: +/0/2 [???] -->
 		<!--- Control 0xe4: +/0/1 [???] -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM010F.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM010F.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM010F.xml	21 Jan 2006 18:30:11 -0000	1.1
+++ SAM010F.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 910T is identical to 710T, so to 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 910T"/>
+<monitor name="Samsung SyncMaster 910T">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: MEL4511.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/MEL4511.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- MEL4511.xml	31 Aug 2004 16:56:00 -0000	1.1.1.1
+++ MEL4511.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Mitsubishi Diamond Pro 2060u has two different IDs. -->
-<monitor include="MEL4513" name="Mitsubishi Diamond Pro 2060u (4511)"/>
+<monitor name="Mitsubishi Diamond Pro 2060u (4511)">
+	<include file="MEL4513"/>
+</monitor>

Index: SAM01E5.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01E5.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM01E5.xml	24 Jan 2006 17:09:40 -0000	1.1
+++ SAM01E5.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,2 +1,4 @@
 <?xml version="1.0"?>
-<monitor include="SAM01B4" name="Samsung SyncMaster 960BF (Digital)"/>
+<monitor name="Samsung SyncMaster 960BF (Digital)">
+	<include file="SAM01B4"/>
+</monitor>
\ No newline at end of file

Index: SAM010C.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM010C.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM010C.xml	19 Oct 2005 16:01:26 -0000	1.1
+++ SAM010C.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 710T is identical to 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 710T"/>
+<monitor name="Samsung SyncMaster 710T">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: SAM00E2.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM00E2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SAM00E2.xml	9 Oct 2004 15:40:50 -0000	1.3
+++ SAM00E2.xml	22 Feb 2006 22:16:40 -0000	1.4
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 173P has two different IDs, one for VGA, the other for DVI -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 173P (DVI)"/>
+<monitor name="Samsung SyncMaster 173P (DVI)">
+	<include file="SAM00D3"/>
+</monitor>

Index: SAM0192.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0192.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM0192.xml	21 Feb 2006 11:38:15 -0000	1.1
+++ SAM0192.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
 <!--- CC, E1 and F5 are not in caps (language, power and OSD enable) -->
-<monitor include="SAM0191" name="Samsung SyncMaster 730BF (DVI)"
-	caps="type(LCD) vcp(04 05 06 08 10 12 16 18 1A 60(1 3) 87 B0(1 2) B6 C6 C8 C9 CC D6(1 4) DC(1 2 3 4 5 6) DF E1 F0(0 1 2 3 4) F2 F5 FA FB F9 FC FD FE E0(0 1 2 3))"/>
+<monitor name="Samsung SyncMaster 730BF (DVI)">
+	<include file="SAM0191"/>
+</monitor>
\ No newline at end of file

Index: SAM0168.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0168.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM0168.xml	17 Oct 2005 13:29:35 -0000	1.1
+++ SAM0168.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 710TM is identical to 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 710TM"/>
+<monitor name="Samsung SyncMaster 710TM">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: SAM0196.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0196.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM0196.xml	15 Jul 2005 13:52:19 -0000	1.2
+++ SAM0196.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 173P+ is identical to 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 173P Plus (VGA)"/>
+<monitor name="Samsung SyncMaster 173P Plus (VGA)">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: MEL4513.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/MEL4513.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MEL4513.xml	28 Jul 2005 23:43:10 -0000	1.10
+++ MEL4513.xml	22 Feb 2006 22:16:40 -0000	1.11
@@ -1,44 +1,20 @@
 <?xml version="1.0"?>
-<monitor name="Mitsubishi Diamond Pro 2060u" init="standard" caps="">
-<!--- language is not in caps... -->
+<monitor name="Mitsubishi Diamond Pro 2060u">
+	<!--- ( prot(monitor) type(crt)       model(NSZ21XXK) pwr({run()
+		  stdby() susp() shut()})  cmds( 01 02 03 ) vcp( 00 04 06
+		  08 10 12 14 16 18 1A 20 22 24   26 28 30 32 38 3A 3C 40 42 44
+		  46 48 4A 4C 54 56 6C 6E 70 C9   E1 E2 E3 E8 E9 EA EB F7 FB FC ) )
+	-->
+	<caps add="(vcp ( 68 (00 01 02 03 04 05) ))"/>
 	<controls>
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1A"/>
-		
-		<control id="hpos" address="0x20"/>
-		<control id="hsize" address="0x22"/>
-		<control id="vpos" address="0x30"/>
-		<control id="vsize" address="0x32"/>
-		
-		<control id="hpincushion" address="0x24"/>
-		<control id="hpincushionbalance" address="0x26"/>
-		<control id="hmisconvergence" address="0x28"/>
-		<control id="vmisconvergence" address="0x38"/>
-		<control id="vlinearity"  address="0x3A"/>
-		<control id="vlinearitybalance" address="0x3C"/>
-		
-		<control id="keybalance" address="0x40"/>
-		<control id="key" address="0x42"/>
-		<control id="tilt" address="0x44"/>
-		<control id="tdistortionctrl" address="0x46"/>
-		<control id="tdistortionbalance" address="0x48"/>
-		<control id="bdistortionctrl" address="0x4A"/>
-		<control id="bdistortionbalance" address="0x4C"/>
+		<control id="defaultsizepos" address="0x06" delay="1000"/>
+		<control id="defaultluma" address="0x08" delay="1000"/>
 		
-		<control id="vmoire" address="0x56"/>
 		<control id="tlpurity" address="0xE8"/>
 		<control id="trpurity" address="0xE9"/>
 		<control id="blpurity" address="0xEA"/>
 		<control id="brpurity" address="0xEB"/>
 		
-		<control id="degauss" address="0x00"/>
-		<control id="defaults" address="0x04" delay="1000"/>
-		<control id="defaultsizepos" address="0x06" delay="1000"/>
-		<control id="defaultluma" address="0x08" delay="1000"/>
-		
 		<control id="language" type="list" address="0x68">
 			<value id="english" value="0"/>
 			<value id="german"  value="1"/>
@@ -48,4 +24,5 @@
 			<value id="chinese" value="5"/>
 		</control>
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM001D.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM001D.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM001D.xml	27 Nov 2005 09:26:00 -0000	1.2
+++ SAM001D.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -1,15 +1,10 @@
 <?xml version="1.0"?>
 <!--- Samsung SyncMaster 171P has some primitive DDC/CI support (no caps, only a few controls) -->
-<monitor name="Samsung SyncMaster 171P (VGA)" init="standard" caps="">
+<monitor name="Samsung SyncMaster 171P (VGA)" init="standard">
+	<caps add="(vcp(10 12 16 18 1a 20 30 d0 d2))"/>
 	<controls>
-		<control id="brightness" address="0x10"/>
-		<control id="contrast"   address="0x12"/>
-		<control id="red"        address="0x16"/>
-		<control id="green"      address="0x18"/>
-		<control id="blue"       address="0x1a"/>
-
-		<control id="hpos"       address="0x20"/> <!-- max should be 100 instead of 255 (as recognised by ddccontrol -p -c -d) -->
-		<control id="vpos"       address="0x30"/> <!-- max should be 100 instead of 255 (as recognised by ddccontrol -p -c -d) -->
+		<!-- <control id="hpos"       address="0x20"/> max should be 100 instead of 255 (as recognised by ddccontrol -p -c -d) -->
+		<!-- <control id="vpos"       address="0x30"/> max should be 100 instead of 255 (as recognised by ddccontrol -p -c -d) -->
 
 		<!-- The following two controls corresponds to menu -->
 		<!-- "Image Lock: Fine/Coarse", they change left-right position and size -->
@@ -25,4 +20,5 @@
 		<!--- Control 0xe6: +/163/63 [???] -->
 		<!--- Control 0xe8: +/165/63 [???] -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM0198.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0198.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM0198.xml	25 Oct 2005 18:27:38 -0000	1.1
+++ SAM0198.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
-<!---The Samsung 193P+ seems to be identical to 173P and 193P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 193P Plus (VGA)"/>
-
+<!---The Samsung 193P+ is identical to 173P+ -->
+<monitor name="Samsung SyncMaster 193P Plus (VGA)">
+	<include file="SAM0196"/>
+</monitor>
\ No newline at end of file

Index: SAM01B6.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01B6.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SAM01B6.xml	27 Dec 2005 22:27:01 -0000	1.3
+++ SAM01B6.xml	22 Feb 2006 22:16:40 -0000	1.4
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 970P is identical to 770P -->
-<monitor include="SAM01B4" name="Samsung SyncMaster 970P (Digital)"/>
+<monitor name="Samsung SyncMaster 970P (Digital)">
+	<include file="SAM01B4"/>
+</monitor>
\ No newline at end of file

Index: SAM01B5.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01B5.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM01B5.xml	27 Dec 2005 22:27:01 -0000	1.1
+++ SAM01B5.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 970P is identical to 770P -->
-<monitor include="SAM01B4" name="Samsung SyncMaster 970P (Analog)"/>
+<monitor name="Samsung SyncMaster 970P (Analog)">
+	<include file="SAM01B4"/>
+</monitor>
\ No newline at end of file

Index: SAM00D3.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM00D3.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SAM00D3.xml	25 Jul 2005 16:52:29 -0000	1.5
+++ SAM00D3.xml	22 Feb 2006 22:16:40 -0000	1.6
@@ -1,35 +1,17 @@
 <?xml version="1.0"?>
-<!--- CA and E1 are supported but not reported by CAPS (OSD and power, so they're not very useful) -->
+<!--- CA and E1 are supported but not reported by CAPS -->
 <monitor name="Samsung SyncMaster 173P (VGA)" init="standard">
+	<caps add="(vcp(CA E1))"/>
 	<controls>
-		<control id="defaults" address="0x04"/>
-		<control id="defaultluma" address="0x05"/>
-		<control id="defaultgeom" address="0x06"/>
-		<control id="defaultcolor" address="0x08"/>
-		<control id="coarse" address="0x0e"/>
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1a"/>
 		<control id="auto" address="0x1e">
 			<value id="pos" value="1"/>
 		</control>
-		<control id="hpos" address="0x20"/>
-		<control id="vpos" address="0x30"/>
-		<control id="fine" address="0x3e"/>
-		<control id="inputsource" type="list" address="0x60">
-			<value id="analog" value="1"/>
-			<value id="digital" value="3"/>
-		</control>
+		
 		<!-- 0x62 has no meaning for SM173P -->
 		<!-- 0x6c Service: Red Video Black Level -->
 		<!-- 0x6e Service: Green Video Black Level -->
 		<!-- 0x70 Service: Blue Video Black Level -->
-		<control id="settings" type="command" address="0xb0">
-			<value id="store" value="1"/>
-			<value id="restorefactory" value="2"/>
-		</control>
+		
 		<!-- 0xb6: +/3/8	[???] -->
 		<!-- 0xc6: +/1/1	[???] -->
 		<!-- 0xc8: +/5/16	[???] -->
@@ -39,10 +21,6 @@
 			<value id="enable" value="2"/>
 		</control>
 		<!--- 0xcc: language, always 2, english -->
-		<control id="dpms" type="list" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="4"/>
-		</control>
 		<control id="magicbright" type="list" address="0xdc">
 			<value id="text" value="1"/>
 			<value id="internet" value="2"/>
@@ -55,14 +33,11 @@
 			<value id="warm" value="1"/>
 			<value id="cool" value="2"/>
 		</control>
-		<control id="power" type="list" address="0xe1">
-			<value id="off" value="0"/>
-			<value id="on" value="1"/>
-		</control>
 		<!-- 0xe2: +/0/1	[???] -->
 		<!-- 0xed: +/108/255	[SAM: Red Video Black Level] -->
 		<!-- 0xee: +/101/255	[SAM: Green Video Black Level] -->
 		<!-- 0xef: +/103/255	[SAM: Blue Video Black Level] -->
 		<!-- 0xf5: +/1/2 [???] (on 712N) -->
 	</controls>
+	<include file="VESA"/>
 </monitor>

Index: SAM00EC.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM00EC.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM00EC.xml	22 Mar 2005 23:15:41 -0000	1.1
+++ SAM00EC.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 193P is identical to 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 193P (VGA)"/>
+<monitor name="Samsung SyncMaster 193P (VGA)">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file

Index: SAM0199.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0199.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM0199.xml	4 Nov 2005 16:30:23 -0000	1.1
+++ SAM0199.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!---The Samsung 193P+ seems to be identical to 173P and 193P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 193P Plus (DVI)"/>
-
-
+<monitor name="Samsung SyncMaster 193P Plus (DVI)">
+	<include file="SAM0198"/>
+</monitor>
\ No newline at end of file

Index: SAM01B3.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM01B3.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SAM01B3.xml	24 Jan 2006 17:09:40 -0000	1.2
+++ SAM01B3.xml	22 Feb 2006 22:16:40 -0000	1.3
@@ -1,2 +1,4 @@
 <?xml version="1.0"?>
-<monitor include="SAM01B4" name="Samsung SyncMaster 770P (Analog)"/>
+<monitor name="Samsung SyncMaster 770P (VGA)">
+	<include file="SAM01B4"/>
+</monitor>
\ No newline at end of file

Index: SAM0191.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM0191.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM0191.xml	21 Feb 2006 11:38:15 -0000	1.1
+++ SAM0191.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,37 +1,17 @@
 <?xml version="1.0"?>
 <!--- CC, E1 and F5 are not in caps (language, power and OSD enable) -->
 <monitor name="Samsung SyncMaster 730BF (VGA)" init="standard" caps="">
+	<caps add="(vcp(CC E1 F5))"/>
 	<controls>
-		<control id="defaults" address="0x04"/>
-		<control id="defaultluma" address="0x05"/>
-		<control id="defaultgeom" address="0x06"/>
-		<control id="defaultcolor" address="0x08"/>
-		<control id="coarse" address="0x0e"/>
-		<control id="brightness" address="0x10"/>
-		<control id="contrast" address="0x12"/>
-		<control id="red" address="0x16"/>
-		<control id="green" address="0x18"/>
-		<control id="blue" address="0x1a"/>
 		<control id="auto" address="0x1e">
 			<value id="pos" value="1"/>
 			<value id="posfast" value="2"/>
 		</control>
-		<control id="hpos" address="0x20"/>
-		<control id="vpos" address="0x30"/>
-		<control id="fine" address="0x3e"/>
-		<control id="inputsource" type="list" address="0x60">
-			<value id="analog" value="1"/>
-			<value id="digital" value="3"/>
-		</control>
 		<!-- 0x62: +/25/50 [???] -->
 		<!-- 0x6c Service: Red Video Black Level -->
 		<!-- 0x6e Service: Green Video Black Level -->
 		<!-- 0x70 Service: Blue Video Black Level -->
 		<control id="sharpness" address="0x87"/>
-		<control id="settings" type="command" address="0xb0">
-			<value id="store" value="1"/>
-			<value id="restorefactory" value="2"/>
-		</control>
 		<!-- 0xb6: +/3/8	[???] -->
 		<!-- 0xc6: +/1/1	[???] -->
 		<!-- 0xc8: +/5/16	[???] -->
@@ -46,10 +26,6 @@
 			<value id="spanish" value="10"/>
 			<value id="swedish" value="11"/>
 		</control>
-		<control id="dpms" type="list" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="4"/>
-		</control>
 		<control id="magicbright" type="list" address="0xdc">
 			<value id="text" value="1"/>
 			<value id="internet" value="2"/>
@@ -64,10 +40,6 @@
 			<value id="warm" value="1"/>
 			<value id="cool" value="2"/>
 		</control>
-		<control id="power" type="list" address="0xe1">
-			<value id="off" value="0"/>
-			<value id="on" value="1"/>
-		</control>
 		<!-- 0xe2: +/0/1	[???] -->
 		<!-- 0xed: +/100/100	[SAM: Red Video Black Level] -->
 		<!-- 0xee: +/100/100	[SAM: Green Video Black Level] -->

Index: SAM010D.xml
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol-db/db/monitor/SAM010D.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SAM010D.xml	28 Dec 2005 11:16:51 -0000	1.1
+++ SAM010D.xml	22 Feb 2006 22:16:40 -0000	1.2
@@ -1,3 +1,5 @@
 <?xml version="1.0"?>
 <!---The Samsung 701T seems to work with the settings of the 173P -->
-<monitor include="SAM00D3" name="Samsung SyncMaster 701T"/>
+<monitor name="Samsung SyncMaster 701T">
+	<include file="SAM00D3"/>
+</monitor>
\ No newline at end of file