Squashed 'tmk_core/' changes from caca2c0..dc0e46e

dc0e46e Rename LUFA to LUFA-git
3bfa7fa Remove LUFA-120730
215b764 Merge commit 'afa0f22a9299686fd88f58ce09c5b521ac917e8f' as 'protocol/lufa/LUFA'
afa0f22 Squashed 'protocol/lufa/LUFA/' content from commit def7fca
c0c42fa Remove submodule of LUFA
30f897d Merge commit '87ced33feb74e79c3281dda36eb6d6d153399b41' as 'protocol/usb_hid/USB_Host_Shield_2.0'
87ced33 Squashed 'protocol/usb_hid/USB_Host_Shield_2.0/' content from commit aab4a69
14f6d49 Remove submodule of USB_Host_Shield_2.0

git-subtree-dir: tmk_core
git-subtree-split: dc0e46eaa4367d4e218f8816e3c117895820f07c

2 files changed, 69 insertions, 0 deletions

diff --git a/protocol/lufa/LUFA-git b/protocol/lufa/LUFA-git
deleted file mode 160000
-Subproject b6c18b2a7c544653efbe12a1d4e8ba65e7d83c3
diff --git a/protocol/lufa/LUFA-git/Projects/Webserver/Lib/uIPManagement.h b/protocol/lufa/LUFA-git/Projects/Webserver/Lib/uIPManagement.h
new file mode 100644
index 0000000000..9a6fa17599
--- /dev/null
+++ b/protocol/lufa/LUFA-git/Projects/Webserver/Lib/uIPManagement.h
@@ -0,0 +1,69 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2014.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2014  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaims all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Header file for uIPManagement.c.
+ */
+
+#ifndef _UIP_MANAGEMENT_H_
+#define _UIP_MANAGEMENT_H_
+
+	/* Includes: */
+		#include <LUFA/Drivers/USB/USB.h>
+
+		#include <uip.h>
+		#include <uip_arp.h>
+		#include <uip-split.h>
+		#include <timer.h>
+
+		#include "Config/AppConfig.h"
+
+		#include "DHCPClientApp.h"
+		#include "DHCPServerApp.h"
+		#include "HTTPServerApp.h"
+		#include "TELNETServerApp.h"
+
+	/* External Variables: */
+		extern struct uip_eth_addr MACAddress;
+
+	/* Function Prototypes: */
+		void uIPManagement_Init(void);
+		void uIPManagement_ManageNetwork(void);
+		void uIPManagement_TCPCallback(void);
+		void uIPManagement_UDPCallback(void);
+
+		#if defined(INCLUDE_FROM_UIPMANAGEMENT_C)
+			static void uIPManagement_ProcessIncomingPacket(void);
+			static void uIPManagement_ManageConnections(void);
+		#endif
+
+#endif
+