Merge commit 'nima/xml'

Conflicts:
	debian/changelog
		Had the same changelog entry in both xml and master
		branch, with a minor wording difference.  Removed the
		duplicate and merged in the changelog entries from the
		XML branch

	src/dmidecode.c
		Merge process got confused by some functions which was not
		changed.  Removed the code coming from the master branch and
		let the XML be the base.

	src/setup-dbg.py
	src/setup.py
		In the XML branch, the version of the python-dmidecode is
		now a function which retrieves the version number from
		src/version.h.  Merged in this feature to master as well.

1 files changed, 19 insertions, 20 deletions

diff --git a/src/dmidecode.h b/src/dmidecode.h
index 7e99faa..10412c6 100644
--- a/src/dmidecode.h
+++ b/src/dmidecode.h
@@ -1,3 +1,4 @@
+
 /*
  * This file is part of the dmidecode project.
  *
@@ -17,29 +18,27 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-#include <Python.h>
+
+#include <libxml/tree.h>
+#include "dmihelper.h"
 
 struct dmi_header {
-  u8 type;
-  u8 length;
-  u16 handle;
-  u8 *data;
+        u8 type;
+        u8 length;
+        u16 handle;
+        u8 *data;
 };
 
-PyObject *dmi_dump(struct dmi_header *h);
-PyObject* dmi_decode(struct dmi_header *h, u16 ver);
-int address_from_efi(size_t *address);
-void to_dmi_header(struct dmi_header *h, u8 *data);
-int smbios_decode_set_version(u8 *buf, const char *devmem, PyObject** pydata);
-int smbios_decode(u8 *buf, const char *devmem, PyObject* pydata);
-int legacy_decode_set_version(u8 *buf, const char *devmem, PyObject** pydata);
-int legacy_decode(u8 *buf, const char *devmem, PyObject* pydata);
+void dmi_dump(xmlNode *node, struct dmi_header * h);
+xmlNode *dmi_decode(xmlNode *parent_n, dmi_codes_major *dmiMajor, struct dmi_header * h, u16 ver);
+void to_dmi_header(struct dmi_header *h, u8 * data);
 
-const char *dmi_string(const struct dmi_header *dm, u8 s);
-const char *dmi_system_uuid(u8 *p);
-PyObject *dmi_system_uuid_py(const u8 *p, u16 ver);
-const char *dmi_chassis_type(u8 code);
-int dmi_processor_frequency(const u8 *p);
+xmlNode *smbios_decode_get_version(u8 * buf, const char *devmem);
+xmlNode *legacy_decode_get_version(u8 * buf, const char *devmem);
+int smbios_decode(int type, u8 *buf, const char *devmem, xmlNode *xmlnode);
+int legacy_decode(int type, u8 *buf, const char *devmem, xmlNode *xmlnode);
 
-int dump(const char *dumpfile);
-int dumpling(u8 *buf, const char *devmem, u8 mode);
+const char *dmi_string(const struct dmi_header *dm, u8 s);
+void dmi_system_uuid(xmlNode *node, const u8 * p, u16 ver);
+void dmi_chassis_type(xmlNode *node, u8 code);
+int dmi_processor_frequency(const u8 * p);