summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-04-14 06:56:20 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-04-14 06:56:20 -0600
commitd98cd13d425a5502e1f6d764148b276048c0730a (patch)
tree2733457d50fc2b6fa4608aa692e971ad4f351212
parent13de7c41a3f02dc7ac8a249f325d3d1a3a2512f1 (diff)
downloadpx4-nuttx-d98cd13d425a5502e1f6d764148b276048c0730a.tar.gz
px4-nuttx-d98cd13d425a5502e1f6d764148b276048c0730a.tar.bz2
px4-nuttx-d98cd13d425a5502e1f6d764148b276048c0730a.zip
Add apps/examples/pppd test case. From Brennan Ashton.
-rw-r--r--apps/examples/Kconfig1
-rw-r--r--apps/examples/Make.defs4
-rw-r--r--apps/examples/Makefile3
-rw-r--r--apps/examples/pppd/.gitignore11
-rw-r--r--apps/examples/pppd/Kconfig14
-rw-r--r--apps/examples/pppd/Makefile137
-rw-r--r--apps/examples/pppd/pppd_main.c92
7 files changed, 261 insertions, 1 deletions
diff --git a/apps/examples/Kconfig b/apps/examples/Kconfig
index ee8dcc3a0..b24cfcca4 100644
--- a/apps/examples/Kconfig
+++ b/apps/examples/Kconfig
@@ -49,6 +49,7 @@ source "$APPSDIR/examples/ostest/Kconfig"
source "$APPSDIR/examples/pashello/Kconfig"
source "$APPSDIR/examples/pipe/Kconfig"
source "$APPSDIR/examples/poll/Kconfig"
+source "$APPSDIR/examples/pppd/Kconfig"
source "$APPSDIR/examples/pwm/Kconfig"
source "$APPSDIR/examples/posix_spawn/Kconfig"
source "$APPSDIR/examples/qencoder/Kconfig"
diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs
index d81ad14f6..cbea7ad69 100644
--- a/apps/examples/Make.defs
+++ b/apps/examples/Make.defs
@@ -222,6 +222,10 @@ ifeq ($(CONFIG_EXAMPLES_POLL),y)
CONFIGURED_APPS += examples/poll
endif
+ifeq ($(CONFIG_EXAMPLES_PPPD),y)
+CONFIGURED_APPS += examples/pppd
+endif
+
ifeq ($(CONFIG_EXAMPLES_PWM),y)
CONFIGURED_APPS += examples/pwm
endif
diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index 0ad5e46ef..f600ea8bf 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -45,7 +45,7 @@ SUBDIRS += nxffs nxflat nxhello nximage nxlines nxtext ostest pashello pipe
SUBDIRS += poll posix_spawn pwm qencoder random relays rgmp romfs sendmail
SUBDIRS += serialblaster serloop serialrx slcd smart smart_test tcpecho
SUBDIRS += telnetd thttpd tiff timer touchscreen udp usbserial usbterm
-SUBDIRS += ustream udgram watchdog webserver wget wgetjson xmlrpc
+SUBDIRS += ustream udgram watchdog webserver wget wgetjson xmlrpc pppd
# Sub-directories that might need context setup. Directories may need
# context setup for a variety of reasons, but the most common is because
@@ -60,6 +60,7 @@ CNTXTDIRS += ltdc modbus lcdrw mtdpart mtdrwb netpkt nettest nx nxhello
CNTXTDIRS += nximage nxlines nxtext nrf24l01_term ostest random relays
CNTXTDIRS += qencoder serialblasters lcd serialrx smart_test tcpecho telnetd
CNTXTDIRS += tiff timer touchscreen usbterm udgram ustream watchdog wgetjson
+CNTXTDIRS += pppd
endif
all: nothing
diff --git a/apps/examples/pppd/.gitignore b/apps/examples/pppd/.gitignore
new file mode 100644
index 000000000..fa1ec7579
--- /dev/null
+++ b/apps/examples/pppd/.gitignore
@@ -0,0 +1,11 @@
+/Make.dep
+/.depend
+/.built
+/*.asm
+/*.obj
+/*.rel
+/*.lst
+/*.sym
+/*.adb
+/*.lib
+/*.src
diff --git a/apps/examples/pppd/Kconfig b/apps/examples/pppd/Kconfig
new file mode 100644
index 000000000..be94c64f9
--- /dev/null
+++ b/apps/examples/pppd/Kconfig
@@ -0,0 +1,14 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config EXAMPLES_PPPD
+ bool "pppd client example"
+ default n
+ ---help---
+ Enable the pppd client example
+
+if EXAMPLES_PPPD
+
+endif
diff --git a/apps/examples/pppd/Makefile b/apps/examples/pppd/Makefile
new file mode 100644
index 000000000..924c57ed4
--- /dev/null
+++ b/apps/examples/pppd/Makefile
@@ -0,0 +1,137 @@
+############################################################################
+# apps/examples/pppd/Makefile
+#
+# Copyright (C) 2015 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
+
+# pppd Example
+
+ASRCS =
+CSRCS =
+MAINSRC = pppd_main.c
+
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
+MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
+
+SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
+OBJS = $(AOBJS) $(COBJS)
+
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+ BIN = ..\..\libapps$(LIBEXT)
+else
+ifeq ($(WINTOOL),y)
+ BIN = ..\\..\\libapps$(LIBEXT)
+else
+ BIN = ../../libapps$(LIBEXT)
+endif
+endif
+
+ifeq ($(WINTOOL),y)
+ INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}"
+else
+ INSTALL_DIR = $(BIN_DIR)
+endif
+
+CONFIG_EXAMPLES_PPPD_PROGNAME ?= pppd$(EXEEXT)
+PROGNAME = $(CONFIG_EXAMPLES_PPPD_PROGNAME)
+
+ROOTDEPPATH = --dep-path .
+
+# PPPD built-in application info
+
+APPNAME = pppd
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = 2048
+
+# Common build
+
+VPATH =
+
+all: .built
+.PHONY: clean depend distclean
+
+$(AOBJS): %$(OBJEXT): %.S
+ $(call ASSEMBLE, $<, $@)
+
+$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c
+ $(call COMPILE, $<, $@)
+
+.built: $(OBJS)
+ $(call ARCHIVE, $(BIN), $(OBJS))
+ @touch .built
+
+ifeq ($(CONFIG_BUILD_KERNEL),y)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
+ @echo "LD: $(PROGNAME)"
+ $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
+ $(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME)
+
+install: $(BIN_DIR)$(DELIM)$(PROGNAME)
+
+else
+install:
+
+endif
+
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
+ $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+
+context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
+else
+context:
+endif
+
+.depend: Makefile $(SRCS)
+ @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+ @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/examples/pppd/pppd_main.c b/apps/examples/pppd/pppd_main.c
new file mode 100644
index 000000000..43993f6fd
--- /dev/null
+++ b/apps/examples/pppd/pppd_main.c
@@ -0,0 +1,92 @@
+/****************************************************************************
+ * examples/pppd/pppd_main.c
+ *
+ * Copyright (C) 2015 Brennan Ashton. All rights reserved.
+ * Author: Brennan Ashton <brennan@ombitron.com>
+ *
+ * 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/netutils/pppd.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct chat_script_s connect_script =
+{
+ .timeout = 30,
+ .lines =
+ {
+ {"AT", "OK"},
+ {"AT+CGDCONT = 1,\"IP\",\"internet\"", "OK"},
+ {"ATD*99***1#", "CONNECT"},
+ {0, 0}
+ },
+};
+
+static struct chat_script_s disconnect_script =
+{
+ .timeout = 30,
+ .lines =
+ {
+ {"ATZ", "OK"},
+ {0, 0}
+ },
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: pppd_main
+ ****************************************************************************/
+
+int pppd_main(int argc, char *argv[])
+{
+ struct pppd_settings_s pppd_settings =
+ {
+ .disconnect_script = &disconnect_script,
+ .connect_script = &connect_script,
+ .ttyname = "/dev/ttyS2",
+ };
+ return pppd(&pppd_settings);
+}