From f0315cf5c7c97c8409906abdb32ba3dd48ea7818 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Fri, 30 Mar 2018 15:33:13 +0100 Subject: [PATCH] Implement dbg_putchar() and dbg_send_bytes() Those two functions are needed so we can use os/lib/dbg-io for this platform. The old putchar() in slip.c is no longer needed. --- arch/platform/jn516x/dbg.c | 56 +++++++++++++++++++++++++++++++++++++ arch/platform/jn516x/slip.c | 6 ---- 2 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 arch/platform/jn516x/dbg.c diff --git a/arch/platform/jn516x/dbg.c b/arch/platform/jn516x/dbg.c new file mode 100644 index 000000000..ac6cc3888 --- /dev/null +++ b/arch/platform/jn516x/dbg.c @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2014, SICS Swedish ICT. + * 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. + */ +/*---------------------------------------------------------------------------*/ +#include "contiki.h" + +#include +#include "dev/uart0.h" +/*---------------------------------------------------------------------------*/ +int +dbg_putchar(int c) +{ + uart0_writeb(c); + return 1; +} +/*---------------------------------------------------------------------------*/ +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; +} +/*---------------------------------------------------------------------------*/ diff --git a/arch/platform/jn516x/slip.c b/arch/platform/jn516x/slip.c index bdf3c81b5..173a14d60 100644 --- a/arch/platform/jn516x/slip.c +++ b/arch/platform/jn516x/slip.c @@ -429,9 +429,3 @@ slip_input_byte(unsigned char c) return error_return_code; } /*---------------------------------------------------------------------------*/ -int -putchar(int c) -{ - uart0_writeb(c); - return 1; -}