hal/fdi fdi.dtd,1.1,1.2

[David Zeuthen]

Update of /cvs/hal/hal/fdi
In directory gabe:/tmp/cvs-serv16750/fdi

Modified Files:
	fdi.dtd 
Log Message:
2005-12-12  David Zeuthen  <david at fubar.dk>

        Patch from Artem Kachitchkine <Artem.Kachitchkin at Sun.COM>.

        * fdi/fdi.dtd: I tried to validate fdi files using fdi.dtd and got
        a whole lot of errors. Looks like DTD is out of date. This patch
        updates the DTD and adds fdi validation to 'make check'. I'm not
        an XML expert, please review carefully.

        * fdi/preprobe/10osvendor/Makefile.am,
        fdi/policy/10osvendor/Makefile.am,
        fdi/information/10freedesktop/Makefile.am: Add xmllint to the
        check target



Index: fdi.dtd
===================================================================
RCS file: /cvs/hal/hal/fdi/fdi.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fdi.dtd	2 Jan 2004 12:11:24 -0000	1.1
+++ fdi.dtd	12 Dec 2005 16:09:58 -0000	1.2
@@ -9,16 +9,44 @@
 
 <!ELEMENT device (match|merge)*  >
 
-<!ELEMENT match (match|merge)* >
+<!ELEMENT match (match|merge|prepend|append|remove)* >
 <!ATTLIST match 
-    key    CDATA #REQUIRED
-    string CDATA #IMPLIED
-    int    CDATA #IMPLIED
-    bool   CDATA #IMPLIED
+    key              CDATA #REQUIRED
+    string           CDATA #IMPLIED
+    int              CDATA #IMPLIED
+    bool             (false|true) #IMPLIED
+    exists           (false|true) #IMPLIED
+    empty            (false|true) #IMPLIED
+    is_ascii         (false|true) #IMPLIED
+    is_absolute_path (false|true) #IMPLIED
+    contains         CDATA #IMPLIED
+    contains_ncase   CDATA #IMPLIED
+    compare_lt       CDATA #IMPLIED
+    compare_le       CDATA #IMPLIED
+    compare_gt       CDATA #IMPLIED
+    compare_ge       CDATA #IMPLIED
 >
 
 <!ELEMENT merge (#PCDATA) >
 <!ATTLIST merge 
     key    CDATA #REQUIRED
-    type   (string|int|bool|double) #REQUIRED
+    type   (string|int|uint64|bool|double|strlist|copy_property) #REQUIRED
+>
+
+<!ELEMENT prepend (#PCDATA) >
+<!ATTLIST prepend 
+    key    CDATA #REQUIRED
+    type   (string|strlist|int|bool|double|copy_property) #REQUIRED
+>
+
+<!ELEMENT append (#PCDATA) >
+<!ATTLIST append 
+    key    CDATA #REQUIRED
+    type   (string|strlist|int|bool|double|copy_property) #REQUIRED
+>
+
+<!ELEMENT remove (#PCDATA) >
+<!ATTLIST remove
+    key    CDATA #REQUIRED
+    type   (strlist) #REQUIRED
 >