From 4303ec02b1756b3b931ebdf636d882beffe13022 Mon Sep 17 00:00:00 2001 From: Gregory Nutt <gnutt@nuttx.org> Date: Mon, 15 Jul 2013 17:50:17 -0600 Subject: [PATCH] Zmodem utilities can now be built for Linux; Fix some configuration confusion --- ChangeLog.txt | 3 + include/zmodem.h | 8 +- system/zmodem/.gitignore | 4 + system/zmodem/Kconfig | 6 - system/zmodem/Makefile.host | 92 +++++++++++++ system/zmodem/host/apps/.gitignore | 2 + system/zmodem/host/crc16.c | 138 +++++++++++++++++++ system/zmodem/host/crc16.h | 83 ++++++++++++ system/zmodem/host/crc32.c | 123 +++++++++++++++++ system/zmodem/host/crc32.h | 83 ++++++++++++ system/zmodem/host/debug.h | 69 ++++++++++ system/zmodem/host/nuttx/ascii.h | 202 ++++++++++++++++++++++++++++ system/zmodem/host/nuttx/compiler.h | 167 +++++++++++++++++++++++ system/zmodem/host/nuttx/config.h | 91 +++++++++++++ system/zmodem/zm.h | 1 + system/zmodem/zm_send.c | 4 +- 16 files changed, 1064 insertions(+), 12 deletions(-) create mode 100755 system/zmodem/Makefile.host create mode 100644 system/zmodem/host/apps/.gitignore create mode 100644 system/zmodem/host/crc16.c create mode 100644 system/zmodem/host/crc16.h create mode 100644 system/zmodem/host/crc32.c create mode 100644 system/zmodem/host/crc32.h create mode 100644 system/zmodem/host/debug.h create mode 100644 system/zmodem/host/nuttx/ascii.h create mode 100644 system/zmodem/host/nuttx/compiler.h create mode 100644 system/zmodem/host/nuttx/config.h diff --git a/ChangeLog.txt b/ChangeLog.txt index 0029d0ca8..7800c837c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -610,3 +610,6 @@ * apps/system/zmodem: The 'rz' command is now complete and functional under certain conditaions. There are, however, some data overrun issues that I am still uncertain how should be handled (2012-7-15). + * apps/system/zmodem/Makefile.host and host/: The Zmodem utilities + can now be built to execute on a Linux host. + diff --git a/include/zmodem.h b/include/zmodem.h index d249875ad..98eedcb2a 100644 --- a/include/zmodem.h +++ b/include/zmodem.h @@ -112,8 +112,8 @@ * in the code now! */ -#ifndef CONFIG_SYSTEM_ZMODEM_MOUNTPOINT -# warning CONFIG_SYSTEM_ZMODEM_RCVSAMPLE not yet support +#ifdef CONFIG_SYSTEM_ZMODEM_RCVSAMPLE +# warning CONFIG_SYSTEM_ZMODEM_RCVSAMPLE not yet supported # undef CONFIG_SYSTEM_ZMODEM_RCVSAMPLE #endif @@ -124,8 +124,8 @@ * in the code now! */ -#ifndef CONFIG_SYSTEM_ZMODEM_SENDATTN -# warning CONFIG_SYSTEM_ZMODEM_SENDATTN not yet support +#ifdef CONFIG_SYSTEM_ZMODEM_SENDATTN +# warning CONFIG_SYSTEM_ZMODEM_SENDATTN not yet supported # undef CONFIG_SYSTEM_ZMODEM_SENDATTN #endif diff --git a/system/zmodem/.gitignore b/system/zmodem/.gitignore index fa1ec7579..01a12bcb2 100644 --- a/system/zmodem/.gitignore +++ b/system/zmodem/.gitignore @@ -9,3 +9,7 @@ /*.adb /*.lib /*.src +/*.exe +sz +rz + diff --git a/system/zmodem/Kconfig b/system/zmodem/Kconfig index 120aa702b..7ec838efc 100644 --- a/system/zmodem/Kconfig +++ b/system/zmodem/Kconfig @@ -106,12 +106,6 @@ config SYSTEM_ZMODEM_SENDATTN ---help--- Send attention string not yet supported -config SYSTEM_ZMODEM_FULLSTREAMING - bool "Full streaming" - default n - ---help--- - Full streaming is not yet supported - config SYSTEM_ZMODEM_SENDBRAK bool "Can break" default n diff --git a/system/zmodem/Makefile.host b/system/zmodem/Makefile.host new file mode 100755 index 000000000..00f28ecec --- /dev/null +++ b/system/zmodem/Makefile.host @@ -0,0 +1,92 @@ +############################################################################ +# apps/system/zmodem/Makefile.host +# +# Copyright (C) 2013 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. +# +############################################################################ +# TOPDIR and APPDIR must be defined on the make command line + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +NUTTXINC = $(TOPDIR)/include +APPSINC = $(APPDIR)/include + +ZMODEM = $(APPDIR)/system/zmodem +HOSTDIR = $(ZMODEM)/host +HOSTAPPS = $(ZMODEM)/host/apps + +HOSTCFLAGS += -isystem $(HOSTDIR) -I $(ZMODEM) +HOSTCFLAGS += -Dsz_main=main -Drz_main=main +ifeq ($(CONFIG_DEBUG),y) +HOSTCFLAGS += -DCONFIG_DEBUG_ZMODEM=1 -DCONFIG_SYSTEM_ZMODEM_DUMPBUFFER=1 +endif + +# Zmodem sz and rz commands + +SZSRCS = sz_main.c zm_send.c +RZSRCS = rz_main.c zm_receive.c +CMNSRCS = zm_state.c zm_proto.c zm_watchdog.c zm_utils.c zm_dumpbuffer.c +CMNSRCS += crc16.c crc32.c +SRCS = $(SZSRCS) $(RZSRCS) $(CMNSRCS) + +SZOBJS = $(SZSRCS:.c=$(OBJEXT)) +RZOBJS = $(RZSRCS:.c=$(OBJEXT)) +CMNOBJS = $(CMNSRCS:.c=$(OBJEXT)) +OBJS = $(SRCS:.c=$(OBJEXT)) + +RZBIN = rz$(EXEEXT) +SZBIN = sz$(EXEEXT) + +VPATH = host + +all: $(RZBIN) $(SZBIN) +.PHONY: clean + +$(OBJS): %$(OBJEXT): %.c + $(Q) $(HOSTCC) -c $(HOSTCFLAGS) -o $@ $< + +$(HOSTAPPS)/zmodem.h: $(APPSINC)/zmodem.h + $(Q) cp $(APPSINC)/zmodem.h $(HOSTAPPS)/zmodem.h + +$(RZBIN): $(HOSTAPPS)/zmodem.h $(RZOBJS) $(CMNOBJS) + $(Q) $(HOSTCC) $(HOSTCFLAGS) -o $@ $(RZOBJS) $(CMNOBJS) + +$(SZBIN): $(HOSTAPPS)/zmodem.h $(SZOBJS) $(CMNOBJS) + $(Q) $(HOSTCC) $(HOSTCFLAGS) -o $@ $(SZOBJS) $(CMNOBJS) + +clean: +ifneq ($(OBJEXT),) + rm -f *$(OBJEXT) +endif + rm -f $(RZBIN) $(SZBIN) + rm -f $(HOSTAPPS)/zmodem.h diff --git a/system/zmodem/host/apps/.gitignore b/system/zmodem/host/apps/.gitignore new file mode 100644 index 000000000..44dfc6691 --- /dev/null +++ b/system/zmodem/host/apps/.gitignore @@ -0,0 +1,2 @@ +zmodem.h + diff --git a/system/zmodem/host/crc16.c b/system/zmodem/host/crc16.c new file mode 100644 index 000000000..f37609996 --- /dev/null +++ b/system/zmodem/host/crc16.c @@ -0,0 +1,138 @@ +/************************************************************************************************ + * apps/system/zmodem/host/crc16.c + * + * This file is a part of NuttX: + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * References: + * + * crc16_tab calculated by Mark G. Mendel, Network Systems Corporation. + * crc16part() logic derived from article Copyright (C) 1986 Stephen Satchell. + * + * "Programmers may incorporate any or all code into their programs, + * giving proper credit within the source. Publication of the + * source routines is permitted so long as proper credit is given + * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg, + * Omen Technology." + * + * Re-released under the Modified BSD license which, I believe, is consistent with the + * original authors' intent: + * + * 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 <sys/types.h> +#include <stdint.h> +#include <crc16.h> + +/************************************************************************************************ + * Private Data + ************************************************************************************************/ + +/* crc16_tab calculated by Mark G. Mendel, Network Systems Corporation */ + +static uint16_t crc16_tab[256] = +{ + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, + 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, + 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, + 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, + 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, + 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, + 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, + 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, + 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, + 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, + 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, + 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, + 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, + 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, + 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, + 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, + 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, + 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, + 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, + 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, + 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, + 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, + 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, + 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, + 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, + 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, + 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, + 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, + 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, + 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 +}; + +#define updcrc(cp, crc) ( crc16_tab[((crc >> 8) & 255)] ^ (crc << 8) ^ cp) + +/************************************************************************************************ + * Public Functions + ************************************************************************************************/ +/************************************************************************************************ + * Name: crc16part + * + * Description: + * Continue CRC calculation on a part of the buffer. + * + ************************************************************************************************/ + +uint16_t crc16part(const uint8_t *src, size_t len, uint16_t crc16val) +{ + size_t i; + + for (i = 0; i < len; i++) + { + crc16val = crc16_tab[((crc16val >> 8) & 255)] ^ (crc16val << 8) ^ src[i]; + } + + return crc16val; +} + +/************************************************************************************************ + * Name: crc16 + * + * Description: + * Return a 16-bit CRC of the contents of the 'src' buffer, length 'len' + * + ************************************************************************************************/ + +uint16_t crc16(const uint8_t *src, size_t len) +{ + return crc16part(src, len, 0); +} diff --git a/system/zmodem/host/crc16.h b/system/zmodem/host/crc16.h new file mode 100644 index 000000000..7e0ac5e85 --- /dev/null +++ b/system/zmodem/host/crc16.h @@ -0,0 +1,83 @@ +/**************************************************************************** + * apps/system/zmodem/host/crc16.h + * + * Copyright (C) 2013 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. + * + ****************************************************************************/ + +#ifndef __APPS_SYSTEM_ZMODEM_HOST_CRC16_H +#define __APPS_SYSTEM_ZMODEM_HOST_CRC16_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <sys/types.h> +#include <stdint.h> + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Name: crc16part + * + * Description: + * Continue CRC calculation on a part of the buffer. + * + ****************************************************************************/ + +uint16_t crc16part(const uint8_t *src, size_t len, uint16_t crc16val); + +/**************************************************************************** + * Name: crc16 + * + * Description: + * Return a 16-bit CRC of the contents of the 'src' buffer, length 'len' + * + ****************************************************************************/ + +uint16_t crc16(const uint8_t *src, size_t len); + +#undef EXTERN +#ifdef __cplusplus +} +#endif + +#endif /* __APPS_SYSTEM_ZMODEM_HOST_CRC16_H */ diff --git a/system/zmodem/host/crc32.c b/system/zmodem/host/crc32.c new file mode 100644 index 000000000..01b92a32c --- /dev/null +++ b/system/zmodem/host/crc32.c @@ -0,0 +1,123 @@ +/************************************************************************************************ + * apps/system/zmodem/host/crc32.c + * + * This file is a part of NuttX: + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * + * The logic in this file was developed by Gary S. Brown: + * + * COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or code or tables + * extracted from it, as desired without restriction. + * + * First, the polynomial itself and its table of feedback terms. The polynomial is: + * + * X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 + * + * Note that we take it "backwards" and put the highest-order term in the lowest-order bit. + * The X^32 term is "implied"; the LSB is the X^31 term, etc. The X^0 term (usually shown + * as "+1") results in the MSB being 1 + * + * Note that the usual hardware shift register implementation, which is what we're using + * (we're merely optimizing it by doing eight-bit chunks at a time) shifts bits into the + * lowest-order term. In our implementation, that means shifting towards the right. Why + * do we do it this way? Because the calculated CRC must be transmitted in order from + * highest-order term to lowest-order term. UARTs transmit characters in order from LSB + * to MSB. By storing the CRC this way we hand it to the UART in the order low-byte to + * high-byte; the UART sends each low-bit to hight-bit; and the result is transmission bit + * by bit from highest- to lowest-order term without requiring any bit shuffling on our + * part. Reception works similarly + * + * The feedback terms table consists of 256, 32-bit entries. Notes + * + * - The table can be generated at runtime if desired; code to do so is shown later. It + * might not be obvious, but the feedback terms simply represent the results of eight + * shift/xor operations for all combinations of data and CRC register values + * + * - The values must be right-shifted by eight bits by the updcrc logic; the shift must + * be u_(bring in zeroes). On some hardware you could probably optimize the shift in + * assembler by using byte-swap instructions polynomial $edb88320 + ************************************************************************************************/ + +/************************************************************************************************ + * Included Files + ************************************************************************************************/ + +#include <sys/types.h> +#include <stdint.h> +#include <crc32.h> + +/************************************************************************************************ + * Private Data + ************************************************************************************************/ + +static const uint32_t crc32_tab[] = +{ + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, + 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, + 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, + 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, + 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, + 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, + 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, + 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, + 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, + 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, + 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, + 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, + 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, + 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, + 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, + 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, + 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, + 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, + 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, + 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, + 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, + 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d +}; + +/************************************************************************************************ + * Public Functions + ************************************************************************************************/ +/************************************************************************************************ + * Name: crc32part + * + * Description: + * Continue CRC calculation on a part of the buffer. + * + ************************************************************************************************/ + +uint32_t crc32part(const uint8_t *src, size_t len, uint32_t crc32val) +{ + size_t i; + + for (i = 0; i < len; i++) + { + crc32val = crc32_tab[(crc32val ^ src[i]) & 0xff] ^ (crc32val >> 8); + } + return crc32val; +} + +/************************************************************************************************ + * Name: crc32 + * + * Description: + * Return a 32-bit CRC of the contents of the 'src' buffer, length 'len' + * + ************************************************************************************************/ + +uint32_t crc32(const uint8_t *src, size_t len) +{ + return crc32part(src, len, 0); +} diff --git a/system/zmodem/host/crc32.h b/system/zmodem/host/crc32.h new file mode 100644 index 000000000..b73e62e6c --- /dev/null +++ b/system/zmodem/host/crc32.h @@ -0,0 +1,83 @@ +/**************************************************************************** + * apps/system/zmodem/host/crc16.h + * + * Copyright (C) 2013 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. + * + ****************************************************************************/ + +#ifndef __APPS_SYSTEM_ZMODEM_HOST_CRC32_H +#define __APPS_SYSTEM_ZMODEM_HOST_CRC32_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <sys/types.h> +#include <stdint.h> + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Name: crc32part + * + * Description: + * Continue CRC calculation on a part of the buffer. + * + ****************************************************************************/ + +uint32_t crc32part(const uint8_t *src, size_t len, uint32_t crc32val); + +/**************************************************************************** + * Name: crc32 + * + * Description: + * Return a 32-bit CRC of the contents of the 'src' buffer, length 'len' + * + ****************************************************************************/ + +uint32_t crc32(const uint8_t *src, size_t len); + +#undef EXTERN +#ifdef __cplusplus +} +#endif + +#endif /* __APPS_SYSTEM_ZMODEM_HOST_CRC32_H */ diff --git a/system/zmodem/host/debug.h b/system/zmodem/host/debug.h new file mode 100644 index 000000000..de9194f79 --- /dev/null +++ b/system/zmodem/host/debug.h @@ -0,0 +1,69 @@ +/**************************************************************************** + * apps/system/zmodem/host/debug.h + * + * Copyright (C) 2007-2011, 2013 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. + * + ****************************************************************************/ + +#ifndef __APPS_SYSTEM_ZMODEM_HOST_DEBUG_H +#define __APPS_SYSTEM_ZMODEM_HOST_DEBUG_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#ifdef CONFIG_HAVE_FUNCTIONNAME +# define EXTRA_FMT "%s: " +# define EXTRA_ARG ,__FUNCTION__ +#else +# define EXTRA_FMT +# define EXTRA_ARG +#endif + +/**************************************************************************** + * Public Type Declarations + ****************************************************************************/ + +/**************************************************************************** + * Public Variables + ****************************************************************************/ + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#endif /* __APPS_SYSTEM_ZMODEM_HOST_DEBUG_H */ diff --git a/system/zmodem/host/nuttx/ascii.h b/system/zmodem/host/nuttx/ascii.h new file mode 100644 index 000000000..19bde9242 --- /dev/null +++ b/system/zmodem/host/nuttx/ascii.h @@ -0,0 +1,202 @@ +/**************************************************************************** + * apps/system/zmodem/host/ascii.h + * ASCII Control Codes + * + * Copyright (C) 2013 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. + * + ****************************************************************************/ + +#ifndef __APPS_SYSTEM_ZMODEM_HOST_NUTTX_ASCII_H +#define __APPS_SYSTEM_ZMODEM_HOST_NUTTX_ASCII_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ +/* All 7-bit ASCII codes */ + +#define ASCII_NUL 0x00 /* Null character (^@) */ +#define ASCII_SOH 0x01 /* Start of header (^A) */ +#define ASCII_STX 0x02 /* Start of tex (^B) */ +#define ASCII_ETX 0x03 /* End of text (^C) */ +#define ASCII_EOT 0x04 /* End of transmission (^D) */ +#define ASCII_ENQ 0x05 /* Enquiry (^E) */ +#define ASCII_ACK 0x06 /* Acknowledge (^F) */ +#define ASCII_BEL 0x07 /* Bell (^G) */ +#define ASCII_BS 0x08 /* Backspace (^H) */ +#define ASCII_TAB 0x09 /* Horizontal tab (^I) */ +#define ASCII_LF 0x0a /* Line Feed (^J) */ +#define ASCII_VT 0x0b /* Vertical tab(^K) */ +#define ASCII_FF 0x0c /* Form Feed (^L) */ +#define ASCII_CR 0x0d /* Carriage Return (^M) */ +#define ASCII_SO 0x0e /* Shift Out (^N) */ +#define ASCII_SI 0x0f /* Shift In (^O) */ + +#define ASCII_DLE 0x10 /* Data link escape (^P) */ +#define ASCII_DC1 0x11 /* Device control 1, XON (^Q) */ +#define ASCII_XON ASCII_DC1 +#define ASCII_DC2 0x12 /* Device control 2, block-mode flow control (^R) */ +#define ASCII_DC3 0x13 /* Device control 3, XOFF (^S) */ +#define ASCII_XOFF ASCII_DC3 +#define ASCII_DC4 0x14 /* Device control 4 (^T) */ +#define ASCII_NAK 0x15 /* Negative acknowledge (^U) */ +#define ASCII_SYN 0x16 /* Synchronous idle (^V) */ +#define ASCII_ETB 0x17 /* End transmission block(^W) */ +#define ASCII_CAN 0x18 /* Cancel line(^X) */ +#define ASCII_EM 0x19 /* End of medium(^Y) */ +#define ASCII_SUB 0x1a /* Substitute (^Z) */ +#define ASCII_ESC 0x1b /* Escape (^[) */ +#define ASCII_FS 0x1c /* File separator (^\) */ +#define ASCII_GS 0x1d /* Group separator (^]) */ +#define ASCII_RS 0x1e /* Record separator, block-mode terminator (^^) */ +#define ASCII_US 0x1f /* Unit separator (^_) */ + +#define ASCII_SPACE 0x20 /* Space ( ) */ +#define ASCII_EXCLAM 0x21 /* Exclamation mark (!) */ +#define ASCII_QUOTE 0x22 /* Quotation mark (") */ +#define ASCII_NUMBER 0x23 /* Number sign (#) */ +#define ASCII_HASH 0x23 /* Hash (#) */ +#define ASCII_DOLLAR 0x24 /* Dollar sign ($) */ +#define ASCII_PERCENT 0x25 /* Percent sign (%) */ +#define ASCII_AMPERSAND 0x26 /* Ampersand (&) */ +#define ASCII_RSQUOTE 0x27 /* Closing single quote (') */ +#define ASCII_APOSTROPHE 0x27 /* Apostrophe (') */ +#define ASCII_LPAREN 0x28 /* Opening parenthesis (() */ +#define ASCII_RPAREN 0x29 /* Closing parenthesis ()) */ +#define ASCII_ASTERISK 0x2a /* Asterisk (*) */ +#define ASCII_PLUS 0x2b /* Plus sign (+) */ +#define ASCII_COMMA 0x2c /* Comma (,) */ +#define ASCII_HYPHEN 0x2d /* Hyphen (-) */ +#define ASCII_DASH 0x2d /* Dash (-) */ +#define ASCII_MINUS 0x2d /* Minus sign (-) */ +#define ASCII_PERIOD 0x2e /* Period (.) */ +#define ASCII_SLASH 0x2f /* Forward Slash (/) */ +#define ASCII_DIVIDE 0x2f /* Divide (/) */ + +#define ASCII_0 0x30 /* Numbers */ +#define ASCII_1 0x31 /* " " */ +#define ASCII_2 0x32 /* " " */ +#define ASCII_3 0x33 /* " " */ +#define ASCII_4 0x34 /* " " */ +#define ASCII_5 0x35 /* " " */ +#define ASCII_6 0x36 /* " " */ +#define ASCII_7 0x37 /* " " */ +#define ASCII_8 0x38 /* " " */ +#define ASCII_9 0x39 /* " " */ +#define ASCII_COLON 0x3a /* Colon (:) */ +#define ASCII_SEMICOLON 0x3b /* Semicolon (;) */ +#define ASCII_LT 0x3c /* Less than (<) */ +#define ASCII_EQUAL 0x3d /* Equal (=) */ +#define ASCII_GT 0x3e /* Greater than (>) */ +#define ASCII_QUESTION 0x3f /* Question mark (?) */ + +#define ASCII_AT 0x40 /* At sign (@) */ +#define ASCII_A 0x41 /* Upper case letters */ +#define ASCII_B 0x42 /* " " " " " " */ +#define ASCII_C 0x43 /* " " " " " " */ +#define ASCII_D 0x44 /* " " " " " " */ +#define ASCII_E 0x45 /* " " " " " " */ +#define ASCII_F 0x46 /* " " " " " " */ +#define ASCII_G 0x47 /* " " " " " " */ +#define ASCII_H 0x48 /* " " " " " " */ +#define ASCII_I 0x49 /* " " " " " " */ +#define ASCII_J 0x4a /* " " " " " " */ +#define ASCII_K 0x4b /* " " " " " " */ +#define ASCII_L 0x4c /* " " " " " " */ +#define ASCII_M 0x4d /* " " " " " " */ +#define ASCII_N 0x4e /* " " " " " " */ +#define ASCII_O 0x4f /* " " " " " " */ + +#define ASCII_P 0x50 /* " " " " " " */ +#define ASCII_Q 0x51 /* " " " " " " */ +#define ASCII_R 0x52 /* " " " " " " */ +#define ASCII_S 0x53 /* " " " " " " */ +#define ASCII_T 0x54 /* " " " " " " */ +#define ASCII_U 0x55 /* " " " " " " */ +#define ASCII_V 0x56 /* " " " " " " */ +#define ASCII_W 0x57 /* " " " " " " */ +#define ASCII_X 0x58 /* " " " " " " */ +#define ASCII_Y 0x59 /* " " " " " " */ +#define ASCII_Z 0x5a /* " " " " " " */ +#define ASCII_LBRACKET 0x5b /* Left bracket ([) */ +#define ASCII_BACKSLASH 0x5c /* Back slash (\) */ +#define ASCII_RBRACKET 0x5d /* Right bracket (]) */ +#define ASCII_CARET 0x5e /* Caret (^) */ +#define ASCII_CIRCUMFLEX 0x5e /* Circumflex (^) */ +#define ASCII_UNDERSCORE 0x5f /* Underscore (_) */ + +#define ASCII_RSQUOT 0x60 /* Closing single quote */ +#define ASCII_a 0x61 /* Lower case letters */ +#define ASCII_b 0x62 /* " " " " " " */ +#define ASCII_c 0x63 /* " " " " " " */ +#define ASCII_d 0x64 /* " " " " " " */ +#define ASCII_e 0x65 /* " " " " " " */ +#define ASCII_f 0x66 /* " " " " " " */ +#define ASCII_g 0x67 /* " " " " " " */ +#define ASCII_h 0x68 /* " " " " " " */ +#define ASCII_i 0x69 /* " " " " " " */ +#define ASCII_j 0x6a /* " " " " " " */ +#define ASCII_k 0x6b /* " " " " " " */ +#define ASCII_l 0x6c /* " " " " " " */ +#define ASCII_m 0x6d /* " " " " " " */ +#define ASCII_n 0x6e /* " " " " " " */ +#define ASCII_o 0x6f /* " " " " " " */ + +#define ASCII_p 0x70 /* " " " " " " */ +#define ASCII_q 0x71 /* " " " " " " */ +#define ASCII_r 0x72 /* " " " " " " */ +#define ASCII_s 0x73 /* " " " " " " */ +#define ASCII_t 0x74 /* " " " " " " */ +#define ASCII_u 0x75 /* " " " " " " */ +#define ASCII_v 0x76 /* " " " " " " */ +#define ASCII_w 0x77 /* " " " " " " */ +#define ASCII_x 0x78 /* " " " " " " */ +#define ASCII_y 0x79 /* " " " " " " */ +#define ASCII_z 0x7a /* " " " " " " */ +#define ASCII_LBRACE 0x7b /* Left brace ({) */ +#define ASCII_VERTBAR 0x7c /* Vertical bar (|) */ +#define ASCII_PIPE 0x7c /* Pipe (|) */ +#define ASCII_RBRACE 0x7d /* Right brace (}) */ +#define ASCII_TILDE 0x7e /* Tilde (~) */ +#define ASCII_DEL 0x7f /* Delete (rubout) */ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#endif /* __APPS_SYSTEM_ZMODEM_HOST_NUTTX_ASCII_H */ diff --git a/system/zmodem/host/nuttx/compiler.h b/system/zmodem/host/nuttx/compiler.h new file mode 100644 index 000000000..ed80571e2 --- /dev/null +++ b/system/zmodem/host/nuttx/compiler.h @@ -0,0 +1,167 @@ +/**************************************************************************** + * include/nuttx/compiler.h + * + * Copyright (C) 2013 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. + * + ****************************************************************************/ + +#ifndef __APPS_SYSTEM_ZMODEM_HOST_NUTTX_COMPILER_H +#define __APPS_SYSTEM_ZMODEM_HOST_NUTTX_COMPILER_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/* GCC-specific definitions *************************************************/ + +#ifdef __GNUC__ + +/* Pre-processor */ + +# define CONFIG_CPP_HAVE_VARARGS 1 /* Supports variable argument macros */ +# define CONFIG_CPP_HAVE_WARNING 1 /* Supports #warning */ + +/* Intriniscs */ + +# define CONFIG_HAVE_FUNCTIONNAME 1 /* Has __FUNCTION__ */ +# define CONFIG_HAVE_FILENAME 1 /* Has __FILE__ */ + +/* Attributes + * + * GCC supports weak symbols which can be used to reduce code size because + * unnecessary "weak" functions can be excluded from the link. + */ + +# ifndef __CYGWIN__ +# define CONFIG_HAVE_WEAKFUNCTIONS 1 +# define weak_alias(name, aliasname) \ + extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))); +# define weak_function __attribute__ ((weak)) +# define weak_const_function __attribute__ ((weak, __const__)) +# else +# undef CONFIG_HAVE_WEAKFUNCTIONS +# define weak_alias(name, aliasname) +# define weak_function +# define weak_const_function +# endif + +/* The noreturn attribute informs GCC that the function will not return. */ + +# define noreturn_function __attribute__ ((noreturn)) + +/* The farcall_function attribute informs GCC that is should use long calls + * (even though -mlong-calls does not appear in the compilation options) + */ + +# define farcall_function __attribute__ ((long_call)) + +/* The packed attribute informs GCC that the stucture elements are packed, + * ignoring other alignment rules. + */ + +# define packed_struct __attribute__ ((packed)) + +/* GCC does not support the reentrant attribute */ + +# define reentrant_function + +/* The naked attribute informs GCC that the programmer will take care of + * the function prolog and epilog. + */ + +# define naked_function __attribute__ ((naked,no_instrument_function)) + +/* The inline_function attribute informs GCC that the function should always + * be inlined, regardless of the level of optimization. The noinline_function + * indicates that the function should never be inlined. + */ + +# define inline_function __attribute__ ((always_inline)) +# define noinline_function __attribute__ ((noinline)) + +/* GCC has does not use storage classes to qualify addressing */ + +# define FAR +# define NEAR +# define DSEG +# define CODE + +/* Unknown compiler *********************************************************/ + +#else + +# undef CONFIG_CPP_HAVE_VARARGS +# undef CONFIG_CPP_HAVE_WARNING +# undef CONFIG_HAVE_FUNCTIONNAME +# undef CONFIG_HAVE_FILENAME +# undef CONFIG_HAVE_WEAKFUNCTIONS +# define weak_alias(name, aliasname) +# define weak_function +# define weak_const_function +# define noreturn_function +# define farcall_function +# define packed_struct +# define reentrant_function +# define naked_function +# define inline_function +# define noinline_function + +# define FAR +# define NEAR +# define DSEG +# define CODE + +# undef CONFIG_SMALL_MEMORY +# undef CONFIG_LONG_IS_NOT_INT +# undef CONFIG_PTR_IS_NOT_INT +# undef CONFIG_HAVE_INLINE +# define inline 1 +# undef CONFIG_HAVE_LONG_LONG +# define CONFIG_HAVE_FLOAT 1 +# undef CONFIG_HAVE_DOUBLE +# undef CONFIG_HAVE_LONG_DOUBLE +# undef CONFIG_CAN_PASS_STRUCTS + +#endif + +/**************************************************************************** + * Global Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Global Function Prototypes + ****************************************************************************/ + +#endif /* __APPS_SYSTEM_ZMODEM_HOST_NUTTX_COMPILER_H */ diff --git a/system/zmodem/host/nuttx/config.h b/system/zmodem/host/nuttx/config.h new file mode 100644 index 000000000..002a60d55 --- /dev/null +++ b/system/zmodem/host/nuttx/config.h @@ -0,0 +1,91 @@ +/**************************************************************************** + * include/nuttx/compiler.h + * + * Copyright (C) 2013 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. + * + ****************************************************************************/ + +#ifndef __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CONFIG_H +#define __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CONFIG_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <stdlib.h> +#include <string.h> + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ +/* Environment stuff */ + +#define OK 0 +#define ERROR -1 +#define FAR +#define DEBUGASSERT assert + +/* Configuration */ + +#define CONFIG_SYSTEM_ZMODEM_DEVNAME "/dev/ttyS0" +#define CONFIG_SYSTEM_ZMODEM_RCVBUFSIZE 512 +#define CONFIG_SYSTEM_ZMODEM_PKTBUFSIZE 1024 +#define CONFIG_SYSTEM_ZMODEM_SNDBUFSIZE 512 +#define CONFIG_SYSTEM_ZMODEM_MOUNTPOINT "/tmp" +#undef CONFIG_SYSTEM_ZMODEM_RCVSAMPLE +#undef CONFIG_SYSTEM_ZMODEM_SENDATTN +#define CONFIG_SYSTEM_ZMODEM_RESPTIME 10 +#define CONFIG_SYSTEM_ZMODEM_CONNTIME 30 +#define CONFIG_SYSTEM_ZMODEM_SERIALNO 1 +#define CONFIG_SYSTEM_ZMODEM_MAXERRORS 20 +#define CONFIG_SYSTEM_ZMODEM_WRITESIZE 0 +#define CONFIG_SYSTEM_ZMODEM_MOUNTPOINT "/tmp" + +/* Cannot control pre-emption from Linux (don't need to) */ + +#define sched_lock() +#define sched_unlock() + +/**************************************************************************** + * Inline Functions + ****************************************************************************/ + +static inline void *zalloc(unsigned long size) +{ + void *ret = malloc(size); + if (ret) + { + memset(ret, 0, size); + } + return ret; +} + +#endif /* __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CONFIG_H */ diff --git a/system/zmodem/zm.h b/system/zmodem/zm.h index d025e94ef..ec653d796 100644 --- a/system/zmodem/zm.h +++ b/system/zmodem/zm.h @@ -50,6 +50,7 @@ #include <stdint.h> #include <debug.h> +#include <nuttx/compiler.h> #include <nuttx/ascii.h> #include <apps/zmodem.h> diff --git a/system/zmodem/zm_send.c b/system/zmodem/zm_send.c index f93a90304..df8e8414f 100644 --- a/system/zmodem/zm_send.c +++ b/system/zmodem/zm_send.c @@ -1065,8 +1065,8 @@ static int zms_sendpacket(FAR struct zm_state_s *pzm) /* And send the packet */ - dbg("Sending %d bytes. New offset: %ld\n", - pktsize, (unsigned long)pzms->offset); + zmdbg("Sending %d bytes. New offset: %ld\n", + pktsize, (unsigned long)pzms->offset); nwritten = zm_remwrite(pzm->remfd, pzm->scratch, pktsize); if (nwritten < 0)