diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-13 15:03:17 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-13 15:03:17 +0000 |
| commit | 13085a335125808f3b2f9adc495c6fe26053cebe (patch) | |
| tree | 0d11d457795b870116e3ace34a38b40a17b63baf /Projects | |
| parent | 64d00efd915b8c3842c4fe93605bf8bc73def030 (diff) | |
| download | lufa-13085a335125808f3b2f9adc495c6fe26053cebe.tar.gz lufa-13085a335125808f3b2f9adc495c6fe26053cebe.tar.bz2 lufa-13085a335125808f3b2f9adc495c6fe26053cebe.zip | |
AppConfigHeaders: Switch low level Device mode demos to use LUFAConfig.h configuration header files.
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/Webserver/Config/AppConfig.h | 5 | ||||
| -rw-r--r-- | Projects/Webserver/Lib/uIPManagement.h | 20 | ||||
| -rw-r--r-- | Projects/Webserver/Webserver.txt | 11 |
3 files changed, 15 insertions, 21 deletions
diff --git a/Projects/Webserver/Config/AppConfig.h b/Projects/Webserver/Config/AppConfig.h index e2a9cd4de..0f26a7a60 100644 --- a/Projects/Webserver/Config/AppConfig.h +++ b/Projects/Webserver/Config/AppConfig.h @@ -48,6 +48,11 @@ #define ENABLE_TELNET_SERVER #define MAX_URI_LENGTH 50 + #define DEVICE_IP_ADDRESS (uint8_t[]){ 10, 0, 0, 2} + #define DEVICE_NETMASK (uint8_t[]){255, 255, 255, 0} + #define DEVICE_GATEWAY (uint8_t[]){ 10, 0, 0, 1} + #define SERVER_MAC_ADDRESS (uint8_t[]){ 1, 0, 1, 0, 1, 0} + #define UIP_CONF_UDP (defined(ENABLE_DHCP_CLIENT) || defined(ENABLE_DHCP_SERVER)) #define UIP_CONF_BROADCAST 1 #define UIP_CONF_TCP 1 diff --git a/Projects/Webserver/Lib/uIPManagement.h b/Projects/Webserver/Lib/uIPManagement.h index 390d3c448..3e4e6a754 100644 --- a/Projects/Webserver/Lib/uIPManagement.h +++ b/Projects/Webserver/Lib/uIPManagement.h @@ -43,30 +43,14 @@ #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" - /* Macros: */ - /** IP address that the webserver should use once connected to a RNDIS device (when DHCP is disabled). */ - #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} - - /** 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[]){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; diff --git a/Projects/Webserver/Webserver.txt b/Projects/Webserver/Webserver.txt index 9b466d9d0..d75f874e1 100644 --- a/Projects/Webserver/Webserver.txt +++ b/Projects/Webserver/Webserver.txt @@ -97,17 +97,17 @@ * </tr> * <tr> * <td>DEVICE_IP_ADDRESS</td> - * <td>Lib/uIPManagement.h</td> + * <td>AppConfig.h</td> * <td>IP address that the webserver should use when connected to a RNDIS device (when ENABLE_DHCP_CLIENT is not defined).</td> * </tr> * <tr> * <td>DEVICE_NETMASK</td> - * <td>Lib/uIPManagement.h</td> + * <td>AppConfig.h</td> * <td>Netmask that the webserver should use when connected to a RNDIS device (when ENABLE_DHCP_CLIENT is not defined).</td> * </tr> * <tr> * <td>DEVICE_GATEWAY</td> - * <td>Lib/uIPManagement.h</td> + * <td>AppConfig.h</td> * <td>Default routing gateway that the webserver should use when connected to a RNDIS device (when ENABLE_DHCP_CLIENT * is not defined).</td> * </tr> @@ -116,6 +116,11 @@ * <td>AppConfig.h</td> * <td>Maximum length of a URI for the Webserver. This is the maximum file path, including subdirectories and separators.</td> * </tr> + * <tr> + * <td>SERVER_MAC_ADDRESS</td> + * <td>AppConfig.h</td> + * <td>MAC address of the server used when sending Ethernet packets onto the bus.</td> + * </tr> * </table> */ |