Update contrib/xz-embedded to build with new GEOM_UNCOMPRESS module.

Approved by:	adrian (mentor)

5 files changed, 162 insertions, 1 deletions

diff --git a/sys/contrib/xz-embedded/freebsd/xz_config.h b/sys/contrib/xz-embedded/freebsd/xz_config.h
new file mode 100644
index 0000000..75c63fd
--- /dev/null
+++ b/sys/contrib/xz-embedded/freebsd/xz_config.h
@@ -0,0 +1,73 @@
+/*-
+ * Copyright (c) 2010-2012 Aleksandr Rybalko
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __FREEBSD_XZ_CONFIG_H__
+#define __FREEBSD_XZ_CONFIG_H__
+
+#include <sys/param.h>
+#include <sys/endian.h>
+#include <sys/types.h>
+#include <sys/systm.h>
+
+#include <contrib/xz-embedded/linux/include/linux/xz.h>
+#include "xz_malloc.h"
+
+#define	XZ_DEC_SINGLE	1
+#define	XZ_PREBOOT	1
+
+#undef	XZ_EXTERN
+#define	XZ_EXTERN	extern
+
+#undef	STATIC
+#define	STATIC
+
+#undef	INIT
+#define	INIT
+
+#undef	bool
+#undef	true
+#undef	false
+#define	bool	int
+#define	true	1
+#define	false	0
+
+#define	kmalloc(size, flags)	xz_malloc(size)
+#define	kfree(ptr)		xz_free(ptr)
+#define	vmalloc(size)		xz_malloc(size)
+#define	vfree(ptr)		xz_free(ptr)
+
+#define	memeq(a, b, size)	(memcmp((a), (b), (size)) == 0)
+#define	memzero(buf, size)	bzero((buf), (size))
+
+#ifndef min
+#	define min(x, y)	MIN((x), (y))
+#endif
+
+#define	min_t(type, x, y)	min((x), (y))
+
+#define	get_le32(ptr)	le32toh(*(const uint32_t *)(ptr))
+
+#endif /* __FREEBSD_XZ_CONFIG_H__ */
diff --git a/sys/contrib/xz-embedded/freebsd/xz_malloc.c b/sys/contrib/xz-embedded/freebsd/xz_malloc.c
new file mode 100644
index 0000000..17f45bd
--- /dev/null
+++ b/sys/contrib/xz-embedded/freebsd/xz_malloc.c
@@ -0,0 +1,49 @@
+/*-
+ * Copyright (c) 2010-2012 Aleksandr Rybalko
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include "xz_malloc.h"
+
+/* Wraper for XZ decompressor memmory pool */
+
+static MALLOC_DEFINE(XZ_DEC, "XZ_DEC", "XZ decompressor data");
+
+void *
+xz_malloc(unsigned long size)
+{
+	void *addr;
+
+	addr = malloc(size, XZ_DEC, M_NOWAIT);
+	return (addr);
+}
+
+void
+xz_free(void *addr)
+{
+
+	free(addr, XZ_DEC);
+}
diff --git a/sys/contrib/xz-embedded/freebsd/xz_malloc.h b/sys/contrib/xz-embedded/freebsd/xz_malloc.h
new file mode 100644
index 0000000..f584d4e
--- /dev/null
+++ b/sys/contrib/xz-embedded/freebsd/xz_malloc.h
@@ -0,0 +1,34 @@
+/*-
+ * Copyright (c) 2010-2012 Aleksandr Rybalko
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __XZ_MALLOC_H__
+#define __XZ_MALLOC_H__
+
+extern void *xz_malloc(unsigned long size);
+extern void xz_free(void *addr);
+
+#endif /* __XZ_MALLOC_H__ */
+
diff --git a/sys/contrib/xz-embedded/linux/include/linux/xz.h b/sys/contrib/xz-embedded/linux/include/linux/xz.h
index 810cb10..56245a1 100644
--- a/sys/contrib/xz-embedded/linux/include/linux/xz.h
+++ b/sys/contrib/xz-embedded/linux/include/linux/xz.h
@@ -15,9 +15,14 @@
 #	include <linux/stddef.h>
 #	include <linux/types.h>
 #else
+#ifdef __FreeBSD__
+#	include <sys/stddef.h>
+#	include <sys/types.h>
+#else
 #	include <stddef.h>
 #	include <stdint.h>
 #endif
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h b/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h
index 482b90f..3e92303 100644
--- a/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h
+++ b/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h
@@ -47,7 +47,7 @@
 	 * macros and functions. This makes it easier to adapt the code into
 	 * different environments and avoids clutter in the Linux kernel tree.
 	 */
-#	include "xz_config.h"
+#	include <contrib/xz-embedded/freebsd/xz_config.h>
 #endif
 
 /* If no specific decoding mode is requested, enable support for all modes. */