Use immediate variable expansion in the second-deepest level makefile scripts to...

[pub/USBasp.git] / Projects / Webserver / Lib / DHCPClientApp.c

diff --git a/Projects/Webserver/Lib/DHCPClientApp.c b/Projects/Webserver/Lib/DHCPClientApp.c
index 6a2f029..91c0f1f 100644 (file)
--- a/Projects/Webserver/Lib/DHCPClientApp.c
+++ b/Projects/Webserver/Lib/DHCPClientApp.c
@@ -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


@@ -28,8 +28,6 @@
   this software.
 */
 
   this software.
 */
 

-#if defined(ENABLE_DHCP_CLIENT) || defined(__DOXYGEN__)
-

 /** \file
  *
  *  DHCP Client Application. When connected to the uIP stack, this will retrieve IP configuration settings from the
 /** \file
  *
  *  DHCP Client Application. When connected to the uIP stack, this will retrieve IP configuration settings from the


@@ -39,6 +37,8 @@
 #define  INCLUDE_FROM_DHCPCLIENTAPP_C
 #include "DHCPClientApp.h"
 
 #define  INCLUDE_FROM_DHCPCLIENTAPP_C
 #include "DHCPClientApp.h"
 

+#if defined(ENABLE_DHCP_CLIENT) || defined(__DOXYGEN__)
+

 /** Initialization function for the DHCP client. */
 void DHCPClientApp_Init(void)
 {
 /** Initialization function for the DHCP client. */
 void DHCPClientApp_Init(void)
 {


@@ -157,9 +157,6 @@ void DHCPClientApp_Callback(void)
                                uip_setnetmask((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.Netmask);
                                uip_setdraddr((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.GatewayIP);
 
                                uip_setnetmask((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.Netmask);
                                uip_setdraddr((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.GatewayIP);
 

-                               /* Indicate to the user that we now have a valid IP configuration */
-                               HaveIPConfiguration = true;
-

                                AppState->DHCPClient.CurrentState = DHCP_STATE_AddressLeased;
                        }
 
                                AppState->DHCPClient.CurrentState = DHCP_STATE_AddressLeased;
                        }