From f127495caa2d45a1b1fff3be7a9d3756259d23e2 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Fri, 11 Jan 2013 02:14:43 -0800
Subject: Manually fixup merge botches via direct comparison with NuttX r5447.

---
 nuttx/libc/misc/lib_dumpbuffer.c | 129 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 nuttx/libc/misc/lib_dumpbuffer.c

(limited to 'nuttx/libc/misc/lib_dumpbuffer.c')

diff --git a/nuttx/libc/misc/lib_dumpbuffer.c b/nuttx/libc/misc/lib_dumpbuffer.c
new file mode 100644
index 000000000..52158b220
--- /dev/null
+++ b/nuttx/libc/misc/lib_dumpbuffer.c
@@ -0,0 +1,129 @@
+/****************************************************************************
+ * libc/misc/lib_dumpbuffer.c
+ *
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
+ * COPYRIGHT OWNER 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/compiler.h>
+
+#include <stdint.h>
+#include <debug.h>
+
+/****************************************************************************
+ * Pre-processor definitions
+ ****************************************************************************/
+
+/* Select the lowest level debug interface available */
+
+#ifdef CONFIG_CPP_HAVE_VARARGS
+#  ifdef CONFIG_ARCH_LOWPUTC
+#    define message(format, arg...) lib_lowprintf(format, ##arg)
+#  else
+#    define message(format, arg...) lib_rawprintf(format, ##arg)
+#  endif
+#else
+#  ifdef CONFIG_ARCH_LOWPUTC
+#    define message lib_lowprintf
+#  else
+#    define message lib_rawprintf
+#  endif
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lib_dumpbuffer
+ *
+ * Description:
+ *  Do a pretty buffer dump
+ *
+ ****************************************************************************/
+
+void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, unsigned int buflen)
+{
+  int i, j, k;
+
+  message("%s (%p):\n", msg, buffer);
+  for (i = 0; i < buflen; i += 32)
+    {
+      message("%04x: ", i);
+      for (j = 0; j < 32; j++)
+        {
+          k = i + j;
+
+          if (j == 16)
+            {
+              message(" ");
+            }
+
+          if (k < buflen)
+            {
+              message("%02x", buffer[k]);
+            }
+          else
+            {
+              message("  ");
+            }
+        }
+
+      message(" ");
+      for (j = 0; j < 32; j++)
+        {
+         k = i + j;
+
+          if (j == 16)
+            {
+              message(" ");
+            }
+
+          if (k < buflen)
+            {
+              if (buffer[k] >= 0x20 && buffer[k] < 0x7f)
+                {
+                  message("%c", buffer[k]);
+                }
+              else
+                {
+                  message(".");
+                }
+            }
+        }
+      message("\n");
+   }
+}
-- 
cgit v1.2.3