Add DHCP server to the Webserver demo for automatic network configuration. Correct...

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

diff --git a/Projects/Webserver/Webserver.h b/Projects/Webserver/Webserver.h
index 8d23bc1..13462a2 100644 (file)
--- a/Projects/Webserver/Webserver.h
+++ b/Projects/Webserver/Webserver.h
@@ -43,7 +43,6 @@
                #include <avr/power.h>\r
 \r
                #include <LUFA/Version.h>\r
                #include <avr/power.h>\r
 \r
                #include <LUFA/Version.h>\r

-               #include <LUFA/Drivers/Misc/TerminalCodes.h>\r

                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/USB/Class/RNDIS.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/USB/Class/RNDIS.h>\r


@@ -53,15 +52,18 @@
                #include <timer.h>\r
                \r
                #include "Lib/WebserverApp.h"\r
                #include <timer.h>\r
                \r
                #include "Lib/WebserverApp.h"\r

+               #include "Lib/DHCPApp.h"\r

                \r
        /* Macros: */\r
                \r
        /* Macros: */\r

-               /** IP address that the webserver should use once connected to a RNDIS device. */\r
+               /** IP address that the webserver should use once connected to a RNDIS device (when DHCP is disabled). */\r

                #define DEVICE_IP_ADDRESS         (uint8_t[]){192, 168, 1, 10}\r
                \r
                #define DEVICE_IP_ADDRESS         (uint8_t[]){192, 168, 1, 10}\r
                \r

-               /** Netmask that the webserver should once connected to a RNDIS device. */\r
+               /** Netmask that the webserver should once connected to a RNDIS device (when DHCP is disabled). */\r

                #define DEVICE_NETMASK            (uint8_t[]){255, 255, 255, 0}\r
                \r
                #define DEVICE_NETMASK            (uint8_t[]){255, 255, 255, 0}\r
                \r

-               /** IP address of the default gateway the webserver should use when routing outside the local subnet. */\r
+               /** IP address of the default gateway the webserver should use when routing outside the local subnet\r
+                *  (when DHCP is disabled).\r
+                */\r

                #define DEVICE_GATEWAY            (uint8_t[]){192, 168, 1, 1}\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define DEVICE_GATEWAY            (uint8_t[]){192, 168, 1, 1}\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r


@@ -78,6 +80,9 @@
                \r
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
                #define LEDMASK_USB_BUSY          LEDS_LED2\r
                \r
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
                #define LEDMASK_USB_BUSY          LEDS_LED2\r

+       \r
+       /* External Variables: */\r
+               extern struct uip_eth_addr MACAddress;\r

                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r