Merge pull request #2688 from authmillenon/ng_slip/feat/initial

ng_slip: initial import
RIOT-OS · May 23, 2015 · 1d74a73 · 1d74a73
2 parents b11eb90 + d2275ae
commit 1d74a73
Show file tree

Hide file tree

Showing 34 changed files with 3,938 additions and 4,054 deletions.
diff --git a/Makefile.dep b/Makefile.dep
@@ -180,6 +180,10 @@ ifneq (,$(filter ng_pktdump,$(USEMODULE)))
   USEMODULE += od
 endif
 
+ifneq (,$(filter ng_slip,$(USEMODULE)))
+  USEMODULE += ng_netbase
+endif
+
 ifneq (,$(filter aodvv2,$(USEMODULE)))
   USEMODULE += vtimer
   USEMODULE += sixlowpan

diff --git a/dist/tools/licenses/patterns/3c-BSD-v3 b/dist/tools/licenses/patterns/3c-BSD-v3
@@ -0,0 +1 @@
+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\. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission\. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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\.
diff --git a/dist/tools/linux-border_router/Doxyfile b/dist/tools/linux-border_router/Doxyfile
diff --git a/dist/tools/linux-border_router/Makefile b/dist/tools/linux-border_router/Makefile
diff --git a/dist/tools/linux-border_router/control_2xxx.c b/dist/tools/linux-border_router/control_2xxx.c
diff --git a/dist/tools/linux-border_router/control_2xxx.h b/dist/tools/linux-border_router/control_2xxx.h
diff --git a/dist/tools/linux-border_router/flowcontrol.c b/dist/tools/linux-border_router/flowcontrol.c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		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\. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission\. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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\.