Menu
▾
▴
[Opensync-commits] r218 - in wbxml2/trunk: . src
|
From: <svn...@op...> - 2009-06-09 08:40:59
|
Author: bellmich Date: Tue Jun 9 10:40:48 2009 New Revision: 218 URL: http://libwbxml.opensync.org/changeset/218 Log: added support for Nokia ConML (ticket #35) This is the original patch from ticket #35. Modified: wbxml2/trunk/CMakeLists.txt wbxml2/trunk/src/wbxml.h wbxml2/trunk/src/wbxml_config.h.cmake wbxml2/trunk/src/wbxml_tables.c wbxml2/trunk/src/wbxml_tables.h Modified: wbxml2/trunk/CMakeLists.txt ============================================================================== --- wbxml2/trunk/CMakeLists.txt Thu Jun 4 11:48:05 2009 (r217) +++ wbxml2/trunk/CMakeLists.txt Tue Jun 9 10:40:48 2009 (r218) @@ -133,6 +133,7 @@ OPTION( WBXML_SUPPORT_SYNCML "enable SYNCML support" ON ) OPTION( WBXML_SUPPORT_WV "enable WV support" ON ) OPTION( WBXML_SUPPORT_AIRSYNC "enable AIRSYNC support" ON ) +OPTION( WBXML_SUPPORT_CONML "enable Nokia ConML support" ON ) SET( PACKAGE "libwbxml" ) SET( PACKAGE_BUGREPORT " " ) @@ -214,6 +215,7 @@ SHOW_STATUS( WBXML_SUPPORT_SYNCML "enable SYNCML support\t" ) SHOW_STATUS( WBXML_SUPPORT_WV "enable WV support\t\t" ) SHOW_STATUS( WBXML_SUPPORT_AIRSYNC "enable AIRSYNC support\t" ) +SHOW_STATUS( WBXML_SUPPORT_CONML "enable Nokia ConML support\t" ) SHOW_STATUS( BUILD_DOCUMENTATION "build dynamic documentation\t" ) SHOW_STATUS( ENABLE_INSTALL_DOC "install documentation\t" ) Modified: wbxml2/trunk/src/wbxml.h ============================================================================== --- wbxml2/trunk/src/wbxml.h Thu Jun 4 11:48:05 2009 (r217) +++ wbxml2/trunk/src/wbxml.h Tue Jun 9 10:40:48 2009 (r218) @@ -240,8 +240,13 @@ /* Microsoft AirSync */ #if defined( WBXML_SUPPORT_AIRSYNC ) - WBXML_LANG_AIRSYNC /**< AirSync */ + WBXML_LANG_AIRSYNC, /**< AirSync */ #endif /* WBXML_SUPPORT_AIRSYNC */ + + /* Nokia ConML */ +#if defined( WBXML_SUPPORT_CONML ) + WBXML_LANG_CONML /**< ConML */ +#endif /* WBXML_SUPPORT_CONML */ } WBXMLLanguage; Modified: wbxml2/trunk/src/wbxml_config.h.cmake ============================================================================== --- wbxml2/trunk/src/wbxml_config.h.cmake Thu Jun 4 11:48:05 2009 (r217) +++ wbxml2/trunk/src/wbxml_config.h.cmake Tue Jun 9 10:40:48 2009 (r218) @@ -25,5 +25,6 @@ #cmakedefine WBXML_SUPPORT_SYNCML #cmakedefine WBXML_SUPPORT_WV #cmakedefine WBXML_SUPPORT_AIRSYNC +#cmakedefine WBXML_SUPPORT_CONML #endif /* WBXML_CONFIG_H */ Modified: wbxml2/trunk/src/wbxml_tables.c ============================================================================== --- wbxml2/trunk/src/wbxml_tables.c Thu Jun 4 11:48:05 2009 (r217) +++ wbxml2/trunk/src/wbxml_tables.c Tue Jun 9 10:40:48 2009 (r218) @@ -119,6 +119,10 @@ const WBXMLPublicIDEntry sv_airsync_public_id = { WBXML_PUBLIC_ID_AIRSYNC, XML_PUBLIC_ID_AIRSYNC, "AirSync", "http://www.microsoft.com/"}; #endif /* WBXML_SUPPORT_AIRSYNC */ +#if defined( WBXML_SUPPORT_CONML ) +const WBXMLPublicIDEntry sv_conml_public_id = { WBXML_PUBLIC_ID_CONML, XML_PUBLIC_ID_CONML, "ConML", "http://www.nokia.com/"}; +#endif /* WBXML_SUPPORT_CONML */ + /************************************** * Languages Tables @@ -3136,6 +3140,54 @@ #endif /* WBXML_SUPPORT_AIRSYNC */ +#if defined( WBXML_SUPPORT_CONML ) + +/************************************************* + * ConML + */ + +const WBXMLTagEntry sv_conml_tag_table[] = { + /* Code Page: "ConML" */ + { "All", 0x00, 0x05 }, + { "Application", 0x00, 0x06 }, + { "Applications", 0x00, 0x07 }, + { "Cancel", 0x00, 0x09 }, + { "Complete", 0x00, 0x0a }, + { "ConML", 0x00, 0x0b }, + { "Data", 0x00, 0x0c }, + { "DeviceInfo", 0x00, 0x10 }, + { "Drives", 0x00, 0x12 }, + { "Execute", 0x00, 0x13 }, + { "GetDataSize", 0x00, 0x17 }, + { "GetStatus", 0x00, 0x18 }, + { "HasFiles", 0x00, 0x19 }, + { "ID", 0x00, 0x1a }, + { "IncType", 0x00, 0x1b }, + { "Install", 0x00, 0x1c }, + { "InstParams", 0x00, 0x1d }, + { "ListInstalledApps", 0x00, 0x1f }, + { "MaxObjectSize", 0x00, 0x21 }, + { "Modified", 0x00, 0x22 }, + { "MoreData", 0x00, 0x23 }, + { "Name", 0x00, 0x24 }, + { "PackageInfo", 0x00, 0x25 }, + { "Param", 0x00, 0x26 }, + { "PartialType", 0x00, 0x27 }, + { "Progress", 0x00, 0x28 }, + { "Reboot", 0x00, 0x29 }, + { "Results", 0x00, 0x2c }, + { "Status", 0x00, 0x31 }, + { "Task", 0x00, 0x35 }, + { "Type", 0x00, 0x37 }, + { "UID", 0x00, 0x38 }, + { "UnInstall", 0x00, 0x39 }, + { "Value", 0x00, 0x3c }, + { "Version", 0x00, 0x3d }, + { NULL, 0x00, 0x00 } +}; + +#endif /* WBXML_SUPPORT_CONML */ + /****************************** * Main Table @@ -3216,6 +3268,10 @@ { WBXML_LANG_AIRSYNC, &sv_airsync_public_id, sv_airsync_tag_table, sv_airsync_ns_table, NULL, NULL, NULL }, #endif /* WBXML_SUPPORT_AIRSYNC */ +#if defined( WBXML_SUPPORT_CONML ) + { WBXML_LANG_CONML, &sv_conml_public_id, sv_conml_tag_table, NULL, NULL, NULL, NULL }, +#endif /* WBXML_SUPPORT_CONML */ + { WBXML_LANG_UNKNOWN, NULL, NULL, NULL, NULL, NULL, NULL } }; Modified: wbxml2/trunk/src/wbxml_tables.h ============================================================================== --- wbxml2/trunk/src/wbxml_tables.h Thu Jun 4 11:48:05 2009 (r217) +++ wbxml2/trunk/src/wbxml_tables.h Tue Jun 9 10:40:48 2009 (r218) @@ -126,6 +126,9 @@ #define WBXML_PUBLIC_ID_AIRSYNC WBXML_PUBLIC_ID_UNKNOWN #define XML_PUBLIC_ID_AIRSYNC "-//AIRSYNC//DTD AirSync//EN" +/* Nokia ConML */ +#define WBXML_PUBLIC_ID_CONML 0x8F +#define XML_PUBLIC_ID_CONML "-//CONML//DTD ConML//EN" /**************************************************** * WBXML Tables Structures |
