Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/Projects/Webserver/Lib/uIPManagement.h b/Projects/Webserver/Lib/uIPManagement.h
index 7409eab..8fe656d 100644 (file)
--- a/Projects/Webserver/Lib/uIPManagement.h
+++ b/Projects/Webserver/Lib/uIPManagement.h
@@ -45,12 +45,13 @@
                #include <timer.h>
 
                #include "Lib/DHCPClientApp.h"
                #include <timer.h>
 
                #include "Lib/DHCPClientApp.h"

+               #include "Lib/DHCPServerApp.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). */
                #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}
+               #define DEVICE_IP_ADDRESS         (uint8_t[]){10, 0, 0, 2}

 
                /** Netmask that the webserver should once connected to a RNDIS device (when DHCP is disabled). */
                #define DEVICE_NETMASK            (uint8_t[]){255, 255, 255, 0}
 
                /** Netmask that the webserver should once connected to a RNDIS device (when DHCP is disabled). */
                #define DEVICE_NETMASK            (uint8_t[]){255, 255, 255, 0}


@@ -58,13 +59,17 @@
                /** IP address of the default gateway the webserver should use when routing outside the local subnet
                 *  (when DHCP is disabled).
                 */
                /** 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}
+               #define DEVICE_GATEWAY            (uint8_t[]){10, 0, 0, 1}
+               
+               /** Ethernet MAC address of the virtual webserver. When in device RNDIS mode, the virtual webserver requires
+                *  a unique MAC address that it can use when sending packets to the RNDIS adapter, which contains a seperate
+                *  MAC address as set in the RNDIS class driver configuration structure.
+                */
+               #define SERVER_MAC_ADDRESS        (uint8_t[]){1, 0, 1, 0, 1, 0}

 
        /* 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);