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

[pub/USBasp.git] / Demos / Device / LowLevel / RNDISEthernet / Lib / Webserver.c

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c
index 1cc9078..7bd083d 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c
@@ -74,7 +74,7 @@ char PROGMEM HTTPPage[]   =
                "</html>";
 
 
                "</html>";
 
 

-/** Initialises the Webserver application, opening the appropriate HTTP port in the TCP handler and registering the application
+/** Initializes the Webserver application, opening the appropriate HTTP port in the TCP handler and registering the application

  *  callback routine for packets sent to the HTTP protocol port.
  */
 void Webserver_Init(void)
  *  callback routine for packets sent to the HTTP protocol port.
  */
 void Webserver_Init(void)


@@ -181,7 +181,7 @@ void Webserver_ApplicationCallback(TCP_ConnectionState_t* const ConnectionState,
                uint16_t Length;
 
                /* Determine the length of the loaded block */
                uint16_t Length;
 
                /* Determine the length of the loaded block */

-               Length = ((RemLength > HTTP_REPLY_BLOCK_SIZE) ? HTTP_REPLY_BLOCK_SIZE : RemLength);
+               Length = MIN(RemLength, HTTP_REPLY_BLOCK_SIZE);

 
                /* Copy the next buffer sized block of the page to the packet buffer */
                strncpy_P(BufferDataStr, &HTTPPage[PageBlock * HTTP_REPLY_BLOCK_SIZE], Length);
 
                /* Copy the next buffer sized block of the page to the packet buffer */
                strncpy_P(BufferDataStr, &HTTPPage[PageBlock * HTTP_REPLY_BLOCK_SIZE], Length);