Author: ray
Date: Wed Jan 4 23:26:22 2012
New Revision: 229533
URL: http://svn.freebsd.org/changeset/base/229533
Log:
Update contrib/xz-embedded to build with new GEOM_UNCOMPRESS module.
Approved by: adrian (mentor)
Added:
head/sys/contrib/xz-embedded/freebsd/
head/sys/contrib/xz-embedded/freebsd/xz_config.h (contents, props changed)
head/sys/contrib/xz-embedded/freebsd/xz_malloc.c (contents, props changed)
head/sys/contrib/xz-embedded/freebsd/xz_malloc.h (contents, props changed)
Modified:
head/sys/conf/files
head/sys/contrib/xz-embedded/linux/include/linux/xz.h
head/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Wed Jan 4 23:00:25 2012 (r229532)
+++ head/sys/conf/files Wed Jan 4 23:26:22 2012 (r229533)
@@ -2266,6 +2266,21 @@ geom/raid3/g_raid3.c optional geom_raid
geom/raid3/g_raid3_ctl.c optional geom_raid3
geom/shsec/g_shsec.c optional geom_shsec
geom/stripe/g_stripe.c optional geom_stripe
+contrib/xz-embedded/freebsd/xz_malloc.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
+ optional xz_embedded \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/
-I$S/contrib/xz-embedded/linux/lib/xz/
-I$S/contrib/xz-embedded/linux/include/linux/"
geom/uzip/g_uzip.c optional geom_uzip
geom/virstor/binstream.c optional geom_virstor
geom/virstor/g_virstor.c optional geom_virstor
Added: head/sys/contrib/xz-embedded/freebsd/xz_config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/contrib/xz-embedded/freebsd/xz_config.h Wed Jan 4 23:26:22
2012 (r229533)
@@ -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__ */
Added: head/sys/contrib/xz-embedded/freebsd/xz_malloc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/contrib/xz-embedded/freebsd/xz_malloc.c Wed Jan 4 23:26:22
2012 (r229533)
@@ -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);
+}
Added: head/sys/contrib/xz-embedded/freebsd/xz_malloc.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/contrib/xz-embedded/freebsd/xz_malloc.h Wed Jan 4 23:26:22
2012 (r229533)
@@ -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__ */
+
Modified: head/sys/contrib/xz-embedded/linux/include/linux/xz.h
==============================================================================
--- head/sys/contrib/xz-embedded/linux/include/linux/xz.h Wed Jan 4
23:00:25 2012 (r229532)
+++ head/sys/contrib/xz-embedded/linux/include/linux/xz.h Wed Jan 4
23:26:22 2012 (r229533)
@@ -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" {
Modified: head/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h
==============================================================================
--- head/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h Wed Jan 4
23:00:25 2012 (r229532)
+++ head/sys/contrib/xz-embedded/linux/lib/xz/xz_private.h Wed Jan 4
23:26:22 2012 (r229533)
@@ -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. */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
