Add FatFS library to the Webserver project, extend the HTTP server so that it now...

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

diff --git a/Projects/Webserver/Webserver.h b/Projects/Webserver/Webserver.h
index 13462a2..a9621e3 100644 (file)
--- a/Projects/Webserver/Webserver.h
+++ b/Projects/Webserver/Webserver.h
@@ -44,28 +44,14 @@
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r

+               #include <LUFA/Drivers/Board/Dataflash.h>\r
+               #include <LUFA/Drivers/Peripheral/SPI.h>\r

                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r

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

                \r
                \r

-               #include <uip.h>\r
-               #include <uip_arp.h>\r
-               #include <timer.h>\r
-               \r
-               #include "Lib/WebserverApp.h"\r
-               #include "Lib/DHCPApp.h"\r
+               #include "USBDeviceMode.h"\r
+               #include "USBHostMode.h"\r

                \r
        /* Macros: */\r
                \r
        /* Macros: */\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
-               /** 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
-               /** 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 LEDMASK_USB_NOTREADY      LEDS_LED1\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
 \r


@@ -80,19 +66,8 @@
                \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
+\r

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

-               void ProcessIncommingPacket(void);\r
-               void ManageConnections(void);\r
-       \r
-               void EVENT_USB_Host_HostError(const uint8_t ErrorCode);\r
-               void EVENT_USB_Host_DeviceAttached(void);\r
-               void EVENT_USB_Host_DeviceUnattached(void);\r
-               void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
-               void EVENT_USB_Host_DeviceEnumerationComplete(void);\r

                \r
 #endif\r
                \r
 #endif\r