Use dbg.c from the CPU dir and delete platform file

arch/cpu/nrf52832/dbg.c

@@ -37,34 +37,32 @@
  *         Wojciech Bober <wojciech.bober@nordicsemi.no>
  *
  */
-/*---------------------------------------------------------------------------*/
-#include <string.h>
 #include "dev/uart0.h"
 /*---------------------------------------------------------------------------*/
+unsigned int
+dbg_send_bytes(const unsigned char *s, unsigned int len)
+{
+  unsigned int i = 0;
+
+  while (s && *s != 0) {
+    if (i >= len) {
+      break;
+    }
+    uart0_writeb(*s++);
+    i++;
+  }
+
+  return i;
+}
+/*---------------------------------------------------------------------------*/
 int
-putchar(int c)
+dbg_putchar(int c)
 {
   uart0_writeb(c);
   return c;
 }
 /*---------------------------------------------------------------------------*/
-int
-puts(const char *str)
-{
-  int i;
-
-  if (str == NULL) {
-    return 0;
-  }
-
-  for (i = 0; i < strlen(str); i++) {
-    uart0_writeb(str[i]);
-  }
-
-  uart0_writeb('\n');
-  return i;
-}
-/*---------------------------------------------------------------------------*/
 /**
+ * @}
  * @}
  */

arch/platform/nrf52dk/Makefile.nrf52dk

@@ -13,7 +13,6 @@ ifeq ($(NRF52_USE_RTT),1)
 CONTIKI_TARGET_DIRS += rtt
 CONTIKI_SOURCEFILES += rtt-printf.c segger-rtt.c segger-rtt-printf.c
 else
-CONTIKI_TARGET_DIRS += dbg-io
 CONTIKI_SOURCEFILES += dbg.c
 MODULES += os/lib/dbg-io
 endif

arch/platform/nrf52dk/dbg-io/dbg.c

@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2015, Nordic Semiconductor
- * 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.
- * 3. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- *
- */
-
-/**
- * \addtogroup nrf52dk
- * @{
- *
- * \addtogroup nrf52dk-dbg-io Debug IO over UART
- * @{
- *
- * \file
- *         Function implementations for debug io module.
- * \author
- *         Wojciech Bober <wojciech.bober@nordicsemi.no>
- *
- */
-#include "dev/uart0.h"
-/*---------------------------------------------------------------------------*/
-unsigned int
-dbg_send_bytes(const unsigned char *s, unsigned int len)
-{
-  unsigned int i = 0;
-
-  while (s && *s != 0) {
-    if (i >= len) {
-      break;
-    }
-    uart0_writeb(*s++);
-    i++;
-  }
-
-  return i;
-}
-/*---------------------------------------------------------------------------*/
-int
-dbg_putchar(int c)
-{
-  uart0_writeb(c);
-  return c;
-}
-/*---------------------------------------------------------------------------*/
-/**
- * @}
- * @}
- */