From a3845caff59550486be6f96a213900772df830b2 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 30 Oct 2006 14:11:16 +0000
Subject: Update service record DTD and example record

---
 hcid/service-opp.xml    |  2 +-
 hcid/service-record.dtd | 32 +++++++++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/hcid/service-opp.xml b/hcid/service-opp.xml
index 877044c9..acdc508f 100644
--- a/hcid/service-opp.xml
+++ b/hcid/service-opp.xml
@@ -38,7 +38,7 @@
   </attribute>
 
   <attribute id="0x0100">
-    <string value="OBEX Object Push"/>
+    <text value="OBEX Object Push"/>
   </attribute>
 
   <attribute id="0x0303">
diff --git a/hcid/service-record.dtd b/hcid/service-record.dtd
index 8f86ca32..86b2bc43 100644
--- a/hcid/service-record.dtd
+++ b/hcid/service-record.dtd
@@ -1,11 +1,37 @@
 <!ELEMENT record (attribute)*>
 
-<!ELEMENT attribute (data|sequence|alternate)+>
+<!ELEMENT attribute (sequence|alternate|text|url|uuid|boolean|uint8|uint16|uint32|uint64|nil|data)+>
 <!ATTLIST attribute id CDATA #REQUIRED>
 
-<!ELEMENT sequence (data|sequence|alternate)+>
+<!ELEMENT sequence (sequence|alternate|text|url|uuid|boolean|uint8|uint16|uint32|uint64|nil|data)+>
 
-<!ELEMENT alternate (data|sequence|alternate)+>
+<!ELEMENT alternate (sequence|alternate|text|url|uuid|boolean|uint8|uint16|uint32|uint64|nil|data)+>
+
+<!ELEMENT text EMPTY>
+<!ATTLIST text value CDATA #REQUIRED>
+
+<!ELEMENT url EMPTY>
+<!ATTLIST url value CDATA #REQUIRED>
+
+<!ELEMENT uuid EMPTY>
+<!ATTLIST uuid value CDATA #REQUIRED>
+
+<!ELEMENT boolean EMPTY>
+<!ATTLIST boolean value CDATA #REQUIRED>
+
+<!ELEMENT uint8 EMPTY>
+<!ATTLIST uint8 value CDATA #REQUIRED>
+
+<!ELEMENT uint16 EMPTY>
+<!ATTLIST uint16 value CDATA #REQUIRED>
+
+<!ELEMENT uint32 EMPTY>
+<!ATTLIST uint32 value CDATA #REQUIRED>
+
+<!ELEMENT uint64 EMPTY>
+<!ATTLIST uint64 value CDATA #REQUIRED>
+
+<!ELEMENT nil EMPTY>
 
 <!ELEMENT data EMPTY>
 <!ATTLIST data type CDATA #REQUIRED>
-- 
cgit