Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:06:10 UTC 2018
Modified Files:
src/sys/external/bsd/common/include/linux: kernel.h
Added Files:
src/sys/external/bsd/common/include/linux: printk.h
Removed Files:
src/sys/external/bsd/drm2/include/linux: printk.h
Log Message:
move printk to common so we can reasonably include it from kernel.h
(linux side-loads the same)
Author: coypu <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/common/include/linux/kernel.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/common/include/linux/printk.h
cvs rdiff -u -r1.4 -r0 src/sys/external/bsd/drm2/include/linux/printk.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/linux/kernel.h
diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.9 src/sys/external/bsd/common/include/linux/kernel.h:1.10
--- src/sys/external/bsd/common/include/linux/kernel.h:1.9 Mon Aug 6 00:30:33 2018
+++ src/sys/external/bsd/common/include/linux/kernel.h Mon Aug 27 06:06:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.h,v 1.9 2018/08/06 00:30:33 riastradh Exp $ */
+/* $NetBSD: kernel.h,v 1.10 2018/08/27 06:06:10 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
#include <sys/systm.h>
#include <lib/libkern/libkern.h>
+#include <linux/printk.h>
#define oops_in_progress (panicstr != NULL)
Added files:
Index: src/sys/external/bsd/common/include/linux/printk.h
diff -u /dev/null src/sys/external/bsd/common/include/linux/printk.h:1.1
--- /dev/null Mon Aug 27 06:06:10 2018
+++ src/sys/external/bsd/common/include/linux/printk.h Mon Aug 27 06:06:10 2018
@@ -0,0 +1,130 @@
+/* $NetBSD: printk.h,v 1.1 2018/08/27 06:06:10 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 _LINUX_PRINTK_H_
+#define _LINUX_PRINTK_H_
+
+#include <sys/param.h>
+#include <sys/systm.h>
+
+#define printk printf
+#define vprintk vprintf
+#define printk_once printf
+#define pr_err printf /* XXX */
+#define pr_cont printf /* XXX */
+#define pr_info printf /* XXX */
+#define pr_info_once printf /* XXX */
+#define pr_warn_once printf /* XXX */
+#define KERN_DEBUG "drm kern debug: "
+#define KERN_INFO "drm kern info: "
+#define KERN_WARNING "drm kern warning: "
+#define KERN_ERR "drm kern error: "
+#define KERN_CRIT "drm kern crit: "
+#define KERN_CONT ""
+
+#define DUMP_PREFIX_NONE 0
+#define DUMP_PREFIX_OFFSET 1
+#define DUMP_PREFIX_ADDRESS 2
+
+static inline void
+hex_dump_to_buffer(const void *buf, size_t buf_size, int bytes_per_line,
+ int bytes_per_group, char *output, size_t output_size, bool ascii __unused)
+{
+ const uint8_t *bytes = buf;
+ size_t i = 0, n;
+
+ KASSERT(output_size >= 1);
+ KASSERT((bytes_per_line == 16) || (bytes_per_line == 32));
+ KASSERT(powerof2(bytes_per_group));
+ KASSERT(0 < bytes_per_group);
+ KASSERT(bytes_per_group <= 8);
+
+ output[output_size - 1] = '\0';
+ while (i < buf_size) {
+ n = snprintf(output, output_size, "%02x", bytes[i++]);
+ if (n >= output_size)
+ break;
+ output += n; output_size -= n;
+ if ((i == buf_size) || (0 == (i % bytes_per_line)))
+ n = snprintf(output, output_size, "\n");
+ else if ((0 < i) && (0 == (i % bytes_per_group)))
+ n = snprintf(output, output_size, " ");
+ else
+ n = 0;
+ if (n >= output_size)
+ break;
+ output += n; output_size -= n;
+ }
+}
+
+static inline void
+print_hex_dump(const char *level, const char *prefix, int prefix_type,
+ int bytes_per_line, int bytes_per_group, const void *buf, size_t buf_size,
+ bool ascii)
+{
+ const uint8_t *bytes = buf;
+ /* Two digits and one space/newline per byte, plus a null. */
+ char line[32*3 + 1];
+
+ KASSERT((bytes_per_line == 16) || (bytes_per_line == 32));
+ KASSERT(powerof2(bytes_per_group));
+ KASSERT(0 < bytes_per_group);
+ KASSERT(bytes_per_group <= 8);
+
+ while (0 < buf_size) {
+ const size_t n = MIN(buf_size, 32);
+
+ switch (prefix_type) {
+ case DUMP_PREFIX_OFFSET:
+ printf("%08zu: ", (bytes - (const uint8_t *)buf));
+ break;
+
+ case DUMP_PREFIX_ADDRESS:
+ printf("%p: ", bytes);
+ break;
+
+ case DUMP_PREFIX_NONE:
+ default:
+ break;
+ }
+
+ hex_dump_to_buffer(bytes, n, bytes_per_line, bytes_per_group,
+ line, sizeof(line), ascii);
+ KASSERT(0 < strnlen(line, sizeof(line)));
+ KASSERT(line[strnlen(line, sizeof(line)) - 1] == '\n');
+ printf("%s", line);
+
+ bytes += n;
+ buf_size -= n;
+ }
+}
+
+#endif /* _LINUX_PRINTK_H_ */
