diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-07-12 16:01:37 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-07-12 16:01:37 -0600 |
commit | 97a9ac8e49b06572bf929529366d7000e6dfa0ee (patch) | |
tree | 5e16267087f820c59fcd552b05c1205c553ca4ef /apps/system | |
parent | 0f587cfa8c982f90b28780136c6e6436b666c92d (diff) | |
download | px4-nuttx-97a9ac8e49b06572bf929529366d7000e6dfa0ee.tar.gz px4-nuttx-97a9ac8e49b06572bf929529366d7000e6dfa0ee.tar.bz2 px4-nuttx-97a9ac8e49b06572bf929529366d7000e6dfa0ee.zip |
Build/test framework for the Zmodem sz and rz commands which are on their way
Diffstat (limited to 'apps/system')
-rw-r--r-- | apps/system/Kconfig | 4 | ||||
-rw-r--r-- | apps/system/Make.defs | 4 | ||||
-rw-r--r-- | apps/system/Makefile | 2 | ||||
-rw-r--r-- | apps/system/zmodem/.gitignore | 11 | ||||
-rw-r--r-- | apps/system/zmodem/Kconfig | 104 | ||||
-rw-r--r-- | apps/system/zmodem/Makefile | 117 | ||||
-rw-r--r-- | apps/system/zmodem/rz_main.c | 67 | ||||
-rw-r--r-- | apps/system/zmodem/sz_main.c | 67 |
8 files changed, 375 insertions, 1 deletions
diff --git a/apps/system/Kconfig b/apps/system/Kconfig index f683ac00a..5b36a43bf 100644 --- a/apps/system/Kconfig +++ b/apps/system/Kconfig @@ -46,3 +46,7 @@ endmenu menu "USB Monitor" source "$APPSDIR/system/usbmonitor/Kconfig" endmenu + +menu "Zmodem Commands" +source "$APPSDIR/system/zmodem/Kconfig" +endmenu diff --git a/apps/system/Make.defs b/apps/system/Make.defs index d27479599..337bde5a6 100644 --- a/apps/system/Make.defs +++ b/apps/system/Make.defs @@ -77,3 +77,7 @@ endif ifeq ($(CONFIG_SYSTEM_USBMONITOR),y) CONFIGURED_APPS += system/usbmonitor endif + +ifeq ($(CONFIG_SYSTEM_ZMODEM),y) +CONFIGURED_APPS += system/zmodem +endif diff --git a/apps/system/Makefile b/apps/system/Makefile index b998bf166..a8cb5a338 100644 --- a/apps/system/Makefile +++ b/apps/system/Makefile @@ -38,7 +38,7 @@ # Sub-directories containing system task SUBDIRS = flash_eraseall free i2c install poweroff ramtest ramtron readline -SUBDIRS += sdcard sysinfo usbmonitor +SUBDIRS += sdcard sysinfo usbmonitor zmodem # Create the list of installed runtime modules (INSTALLED_DIRS) diff --git a/apps/system/zmodem/.gitignore b/apps/system/zmodem/.gitignore new file mode 100644 index 000000000..fa1ec7579 --- /dev/null +++ b/apps/system/zmodem/.gitignore @@ -0,0 +1,11 @@ +/Make.dep +/.depend +/.built +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/apps/system/zmodem/Kconfig b/apps/system/zmodem/Kconfig new file mode 100644 index 000000000..570429485 --- /dev/null +++ b/apps/system/zmodem/Kconfig @@ -0,0 +1,104 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +config SYSTEM_ZMODEM + bool "Zmodem commands" + default n + ---help--- + This selection enables the 'sz' and 'rz' NSH commands. + +if SYSTEM_ZMODEM + +config SYSTEM_ZMODEM_RCVBUFSIZE + int "Receive buffer size" + default 512 + ---help--- + The size of one buffer used to read data from the remote peer. + +config SYSTEM_ZMODEM_PKTBUFSIZE + int "Maximum packet size" + default 512 + ---help--- + Data may be received in gulps of varying size and alignment. + Received packets data is properly packed into a packet buffer of + this size. + +config SYSTEM_ZMODEM_SNDBUFSIZE + int "Send buffer size" + default 512 + ---help--- + The size of one transmit buffer used for composing messages sent to + the remote peer. + +config SYSTEM_ZMODEM_MOUNTPOINT + string "Zmodem sandbox" + default "/tmp" + ---help--- + Absolute pathes are not accepted. This configuration value must be + set to provide the path to the file storage directory (such as a + mountpoint directory). + +config SYSTEM_ZMODEM_SENDSAMPLE + bool "Reverse channel" + default y + ---help--- + Sender can sample reverse channel + +config SYSTEM_ZMODEM_SENDATTN + bool "Attn interrupt" + default y + ---help--- + Sender can be interrupted with ATTN + +config SYSTEM_ZMODEM_ALWAYSSINT + bool "Send ZSINIT" + default y + ---help--- + Always send ZSINIT header + +config SYSTEM_ZMODEM_TIMESTAMPS + bool "File timestamps" + default y + depends on RTC + ---help--- + File timestamps may be supported + +config SYSTEM_ZMODEM_SENDATTN + bool "Send Attn string" + default n + ---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 + ---help--- + Can not yet send BREAK + +config SYSTEM_ZMODEM_RESPTIME + bool "Response time" + default 10 + ---help--- + Response time for sender to respond to requests. + +config SYSTEM_ZMODEM_SERIALNO + int "Serial number" + default 0 + ---help--- + Receiver serial number + +config SYSTEM_ZMODEM_MAXERRORS + int "Max error" + default 20 + ---help--- + Max receive errors before canceling the transfer. + +endif diff --git a/apps/system/zmodem/Makefile b/apps/system/zmodem/Makefile new file mode 100644 index 000000000..f62aa818d --- /dev/null +++ b/apps/system/zmodem/Makefile @@ -0,0 +1,117 @@ +############################################################################ +# apps/system/zmodem/Makefile +# +# 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. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +ifeq ($(WINTOOL),y) +INCDIROPT = -w +endif + +# Zmodem sz and rz commands + +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 768 + +ASRCS = +CSRCS = sz_main.c rz_main.c + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + BIN = ..\..\libapps$(LIBEXT) +else +ifeq ($(WINTOOL),y) + BIN = ..\\..\\libapps$(LIBEXT) +else + BIN = ../../libapps$(LIBEXT) +endif +endif + +ROOTDEPPATH = --dep-path . + +# Common build + +VPATH = + +all: .built +.PHONY: context depend clean distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + $(call ARCHIVE, $(BIN), $(OBJS)) + $(Q) touch .built + +# Register application + +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)sz.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,"sz",$(PRIORITY),$(STACKSIZE),sz_main) + +$(BUILTIN_REGISTRY)$(DELIM)rz.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,"rz",$(PRIORITY),$(STACKSIZE),rz_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)sz.bdat $(BUILTIN_REGISTRY)$(DELIM)rz.bdat +else +context: +endif + +# Create dependencies + +.depend: Makefile $(SRCS) + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ + +depend: .depend + +clean: + $(call DELFILE, .built) + $(call CLEAN) + +distclean: clean + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + +-include Make.dep diff --git a/apps/system/zmodem/rz_main.c b/apps/system/zmodem/rz_main.c new file mode 100644 index 000000000..752d51349 --- /dev/null +++ b/apps/system/zmodem/rz_main.c @@ -0,0 +1,67 @@ +/**************************************************************************** + * system/xmodem/rz_main.c + * + * 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdio.h> + +#include <apps/zmodem.h> + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: rz_main + ****************************************************************************/ + +int rz_main(int argc, char *argv[]) +{ + printf("Not yet implemented!!\n"); + return 0; +} + diff --git a/apps/system/zmodem/sz_main.c b/apps/system/zmodem/sz_main.c new file mode 100644 index 000000000..6f77042c1 --- /dev/null +++ b/apps/system/zmodem/sz_main.c @@ -0,0 +1,67 @@ +/**************************************************************************** + * system/xmodem/sz_main.c + * + * 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdio.h> + +#include <apps/zmodem.h> + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: sz_main + ****************************************************************************/ + +int sz_main(int argc, char *argv[]) +{ + printf("Not yet implemented!!\n"); + return 0; +} + |