diff --git a/libc/Makefile b/libc/Makefile index 8d05825bf2e..4b23e458c1b 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -67,6 +67,7 @@ include dirent/Make.defs include dllfcn/Make.defs include fixedmath/Make.defs include hex2bin/Make.defs +include inttypes/Make.defs include libgen/Make.defs include locale/Make.defs include machine/Make.defs diff --git a/libc/README.txt b/libc/README.txt index 67499e02a04..ccc69a3cf46 100644 --- a/libc/README.txt +++ b/libc/README.txt @@ -34,6 +34,7 @@ we have: libgen - libgen.h locale - locale.h fixedmath - fixedmath.h + inttypes - inttypes.h machine - Various architecture-specifica implementations. math - math.h modlib - Part of module and shared libary logic: nuttx/lib/modlib.h diff --git a/libc/inttypes/Make.defs b/libc/inttypes/Make.defs new file mode 100644 index 00000000000..d41d30ccb7e --- /dev/null +++ b/libc/inttypes/Make.defs @@ -0,0 +1,43 @@ +############################################################################ +# libc/inttypes/Make.defs +# +# Copyright (C) 2017 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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. +# +############################################################################ + +# Add the inttypes C files to the build + +CSRCS += lib_imaxabs.c + +# Add the inttypes directory to the build + +DEPPATH += --dep-path inttypes +VPATH += :inttypes diff --git a/libc/stdlib/lib_imaxabs.c b/libc/inttypes/lib_imaxabs.c similarity index 98% rename from libc/stdlib/lib_imaxabs.c rename to libc/inttypes/lib_imaxabs.c index 12c5dc15a71..315af34114d 100644 --- a/libc/stdlib/lib_imaxabs.c +++ b/libc/inttypes/lib_imaxabs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * libc/stdlib//lib_abs.c + * libc/inttypes/lib_imaxabs.c * * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,5 +50,6 @@ intmax_t imaxabs(intmax_t j) { j = -j; } + return j; } diff --git a/libc/libc.csv b/libc/libc.csv index e54fa5a7df8..c8e4bed84b4 100644 --- a/libc/libc.csv +++ b/libc/libc.csv @@ -173,6 +173,7 @@ "strtoul","stdlib.h","","unsigned long","FAR const char *","FAR char **","int" "strtoull","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","unsigned long long","FAR const char *","FAR char **","int" "strxfrm","string.h","defined(CONFIG_LIBC_LOCALE)","size_t","FAR char *","FAR const char *","size_t" +"swab","unistd.h","","void","int","FAR const void *","FAR void *","ssize_t" "syslog","syslog.h","","int","int","FAR const char *","..." "tcflush","termios.h","CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","int" "tcgetattr","termios.h","CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","FAR struct termios *" diff --git a/libc/unistd/lib_swab.c b/libc/unistd/lib_swab.c new file mode 100644 index 00000000000..269b228100a --- /dev/null +++ b/libc/unistd/lib_swab.c @@ -0,0 +1,99 @@ +/**************************************************************************** + * libc/unistd/lib_swab.c + * + * Copyright (C) 2017 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 + +#include +#include +#include + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: strncpy + * + * Description: + * The swab() function will copy nbytes bytes, which are pointed to by + * 'src', to the object pointed to by 'dest', exchanging adjacent bytes. + * The 'nbytes' argument should be even. If 'nbytes' is odd, swab() copies + * and exchanges 'nbytes'-1 bytes and the disposition of the last byte is + * unspecified. If copying takes place between objects that overlap, the + * behavior is undefined. If nbytes is negative, swab() does nothing. + * + * Returned Value: + * None + * + ****************************************************************************/ + +void swab(FAR const void *src, FAR void *dest, ssize_t nbytes) +{ + FAR const uint8_t *src8 = (FAR const uint8_t *)src; + FAR uint8_t *dest8 = (FAR uint8_t *)dest; + FAR uint8_t *end8; + + DEBUGASSERT(src != NULL && dest != NULL); + + /* Do nother if nbytes is negative or it there are few then 2 bytes to be + * transferred. + */ + + if (nbytes > 1) + { + /* The end of dest buffer + 1 byte (skipping any odd numbered byte at + * the end of the buffer. + */ + + end8 = dest8 + (nbytes & ~1); + + /* Loop until the destination is equal to the end + 1 address */ + + while (dest8 != end8) + { + register uint8_t tmp; + + /* Transfer the bytes, swapping the order */ + + tmp = *src8++; + *dest8++ = *src8++; + *dest8++ = tmp; + } + } +}