Clean up CORE build system mode makefile.

[pub/USBasp.git] / Projects / Webserver / Lib / uIPManagement.h

diff --git a/Projects/Webserver/Lib/uIPManagement.h b/Projects/Webserver/Lib/uIPManagement.h
index 7409eab..3e4e6a7 100644 (file)
--- a/Projects/Webserver/Lib/uIPManagement.h
+++ b/Projects/Webserver/Lib/uIPManagement.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -43,28 +43,17 @@
                #include <uip_arp.h>
                #include <uip-split.h>
                #include <timer.h>
                #include <uip_arp.h>
                #include <uip-split.h>
                #include <timer.h>

+               
+               #include "Config/AppConfig.h"

 
 

-               #include "Lib/DHCPClientApp.h"
-               #include "Lib/HTTPServerApp.h"
-               #include "Lib/TELNETServerApp.h"
-
-       /* Macros: */
-               /** IP address that the webserver should use once connected to a RNDIS device (when DHCP is disabled). */
-               #define DEVICE_IP_ADDRESS         (uint8_t[]){192, 168, 1, 10}
-
-               /** Netmask that the webserver should once connected to a RNDIS device (when DHCP is disabled). */
-               #define DEVICE_NETMASK            (uint8_t[]){255, 255, 255, 0}
-
-               /** IP address of the default gateway the webserver should use when routing outside the local subnet
-                *  (when DHCP is disabled).
-                */
-               #define DEVICE_GATEWAY            (uint8_t[]){192, 168, 1, 1}
+               #include "DHCPClientApp.h"
+               #include "DHCPServerApp.h"
+               #include "HTTPServerApp.h"
+               #include "TELNETServerApp.h"

 
        /* External Variables: */
                extern struct uip_eth_addr MACAddress;
 
 
        /* External Variables: */
                extern struct uip_eth_addr MACAddress;
 

-               extern bool HaveIPConfiguration;
-

        /* Function Prototypes: */
                void uIPManagement_Init(void);
                void uIPManagement_ManageNetwork(void);
        /* Function Prototypes: */
                void uIPManagement_Init(void);
                void uIPManagement_ManageNetwork(void);