FreeTCPIP - remove compiler warnings.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1094 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/Common/ethernet/FreeTCPIP/apps/httpd/httpd.c b/Demo/Common/ethernet/FreeTCPIP/apps/httpd/httpd.c
index d40bafe560378cd6fb15063777c8d0e37f1ed1a1..99564a93c4f92c62a3dc3e3b36a224ffcce5c173 100644 (file)
--- a/Demo/Common/ethernet/FreeTCPIP/apps/httpd/httpd.c
+++ b/Demo/Common/ethernet/FreeTCPIP/apps/httpd/httpd.c
@@ -96,6 +96,8 @@ static PT_THREAD( send_file ( struct httpd_state *s ) )
 {\r
        PSOCK_BEGIN( &s->sout );\r
 \r
+       ( void ) PT_YIELD_FLAG;\r
+       \r
        do\r
        {\r
                PSOCK_GENERATOR_SEND( &s->sout, generate_part_of_file, s );\r
@@ -110,7 +112,8 @@ static PT_THREAD( send_file ( struct httpd_state *s ) )
 static PT_THREAD( send_part_of_file ( struct httpd_state *s ) )\r
 {\r
        PSOCK_BEGIN( &s->sout );\r
-\r
+       ( void ) PT_YIELD_FLAG;\r
+       \r
        PSOCK_SEND( &s->sout, s->file.data, s->len );\r
 \r
        PSOCK_END( &s->sout );\r
@@ -131,7 +134,7 @@ static PT_THREAD( handle_script ( struct httpd_state *s ) )
        char    *ptr;\r
 \r
        PT_BEGIN( &s->scriptpt );\r
-\r
+       ( void ) PT_YIELD_FLAG;\r
        while( s->file.len > 0 )\r
        {\r
                /* Check if we should start executing a script. */\r
@@ -202,7 +205,7 @@ static PT_THREAD( send_headers ( struct httpd_state *s, const char *statushdr )
        char    *ptr;\r
 \r
        PSOCK_BEGIN( &s->sout );\r
-\r
+       ( void ) PT_YIELD_FLAG;\r
        PSOCK_SEND_STR( &s->sout, statushdr );\r
 \r
        ptr = strrchr( s->filename, ISO_period );\r
@@ -244,7 +247,7 @@ static PT_THREAD( handle_output ( struct httpd_state *s ) )
        char    *ptr;\r
 \r
        PT_BEGIN( &s->outputpt );\r
-\r
+       ( void ) PT_YIELD_FLAG;\r
        if( !httpd_fs_open(s->filename, &s->file) )\r
        {\r
                httpd_fs_open( http_404_html, &s->file );\r
@@ -275,7 +278,7 @@ static PT_THREAD( handle_output ( struct httpd_state *s ) )
 static PT_THREAD( handle_input ( struct httpd_state *s ) )\r
 {\r
        PSOCK_BEGIN( &s->sin );\r
-\r
+       ( void ) PT_YIELD_FLAG;\r
        PSOCK_READTO( &s->sin, ISO_space );\r
 \r
        if( strncmp(s->inputbuf, http_get, 4) != 0 )\r

diff --git a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h
index ed4523e486a82632c5ff227cf450ea4df12e678d..522a859af65ebfedd14c23392c41d14728087b11 100644 (file)
--- a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h
+++ b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_end.h
@@ -17,3 +17,7 @@
 #endif\r
 \r
 \r
+#ifdef __ICCRX__\r
+       ;\r
+       #pragma pack()\r
+#endif\r

diff --git a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h
index 2281682aa5c00b67ac3925df8fb7283688f51c7e..94bc0f522cf2521015767d4f94c9e0d08bb375cd 100644 (file)
--- a/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h
+++ b/Demo/Common/ethernet/FreeTCPIP/net/pack_struct_start.h
@@ -19,3 +19,6 @@
 #endif\r
 \r
 \r
+#ifdef __ICCRX__\r
+       #pragma pack(1)\r
+#endif\r

diff --git a/Demo/Common/ethernet/FreeTCPIP/net/uip.h b/Demo/Common/ethernet/FreeTCPIP/net/uip.h
index 709535c1ec1346b0ebdc4cb626a2275d757aa0fb..12e8242e38912566f0dd31967d851c9b14785ad0 100644 (file)
--- a/Demo/Common/ethernet/FreeTCPIP/net/uip.h
+++ b/Demo/Common/ethernet/FreeTCPIP/net/uip.h
@@ -160,7 +160,7 @@ struct uip_eth_addr
 \r
  uip_ipaddr(&addr, 192,168,1,2);\r
  uip_sethostaddr(&addr);\r
- \r
+\r
  \endcode\r
  * \param addr A pointer to an IP address of type uip_ipaddr_t;\r
  *\r
@@ -842,7 +842,7 @@ CCIF void   uip_send( const void *data, int len );
  \code\r
  uip_ipaddr_t addr;\r
  struct uip_udp_conn *c;\r
- \r
+\r
  uip_ipaddr(&addr, 192,168,2,1);\r
  c = uip_udp_new(&addr, HTONS(12345));\r
  if(c != NULL) {\r
@@ -929,7 +929,7 @@ CCIF void   uip_send( const void *data, int len );
  \code\r
  uip_ipaddr_t ipaddr;\r
  struct uip_conn *c;\r
- \r
+\r
  uip_ipaddr(&ipaddr, 192,168,1,2);\r
  c = uip_connect(&ipaddr, HTONS(80));\r
  \endcode\r
@@ -1017,7 +1017,7 @@ CCIF void uip_send( const void *data, int len );
  * \hideinitializer\r
  */\r
 #ifndef uip_ipaddr_copy\r
-#define uip_ipaddr_copy( dest, src )   ( *(dest) = *(src) )\r
+       #define uip_ipaddr_copy( dest, src )    ( ((unsigned long*)dest)[ 0 ] = ((unsigned long *)src)[ 0 ] )\r
 #endif\r
 \r
                        /**\r
@@ -1443,7 +1443,7 @@ struct uip_stats
                             layer. */\r
                uip_stats_t sent;               /**< Number of sent packets at the IP\r
                             layer. */\r
-               uip_stats_t forwarded;  /**< Number of forwarded packets at the IP \r
+               uip_stats_t forwarded;  /**< Number of forwarded packets at the IP\r
                             layer. */\r
                uip_stats_t drop;               /**< Number of dropped packets at the IP\r
                             layer. */\r
@@ -1635,7 +1635,6 @@ struct uip_tcpip_hdr
        u8_t                    urgp[2];\r
        u8_t                    optdata[4];\r
 }\r
-\r
 #include "net/pack_struct_end.h"\r
 \r
 /* The ICMP and IP headers. */\r

diff --git a/Demo/Common/ethernet/FreeTCPIP/psock.c b/Demo/Common/ethernet/FreeTCPIP/psock.c
index 6bd1f6affb94e1994281e8d672a2f5d981266571..1f224b6e11f68ff03cdbb27669bfc949df6bd960 100644 (file)
--- a/Demo/Common/ethernet/FreeTCPIP/psock.c
+++ b/Demo/Common/ethernet/FreeTCPIP/psock.c
@@ -119,7 +119,7 @@ buf_bufto(register struct psock_buf *buf, u8_t endmarker,
     ++buf->ptr;\r
     --*datalen;\r
     --buf->left;\r
-    \r
+\r
     if(c == endmarker) {\r
       return BUF_FOUND;\r
     }\r
@@ -133,12 +133,12 @@ buf_bufto(register struct psock_buf *buf, u8_t endmarker,
     c = **dataptr;\r
     --*datalen;\r
     ++*dataptr;\r
-    \r
+\r
     if(c == endmarker) {\r
       return BUF_FOUND | BUF_FULL;\r
     }\r
   }\r
-  \r
+\r
   return BUF_FULL;\r
 }\r
 /*---------------------------------------------------------------------------*/\r
@@ -178,7 +178,7 @@ PT_THREAD(psock_send(register struct psock *s, const char *buf,
                     unsigned int len))\r
 {\r
   PT_BEGIN(&s->psockpt);\r
-\r
+  ( void ) PT_YIELD_FLAG;\r
   /* If there is no data to send, we exit immediately. */\r
   if(len == 0) {\r
     PT_EXIT(&s->psockpt);\r
@@ -209,7 +209,7 @@ PT_THREAD(psock_send(register struct psock *s, const char *buf,
   }\r
 \r
   s->state = STATE_NONE;\r
-  \r
+\r
   PT_END(&s->psockpt);\r
 }\r
 /*---------------------------------------------------------------------------*/\r
@@ -217,7 +217,7 @@ PT_THREAD(psock_generator_send(register struct psock *s,
                               unsigned short (*generate)(void *), void *arg))\r
 {\r
   PT_BEGIN(&s->psockpt);\r
-\r
+  ( void ) PT_YIELD_FLAG;\r
   /* Ensure that there is a generator function to call. */\r
   if(generate == NULL) {\r
     PT_EXIT(&s->psockpt);\r
@@ -228,7 +228,7 @@ PT_THREAD(psock_generator_send(register struct psock *s,
   s->sendlen = generate(arg);\r
   s->sendptr = uip_appdata;\r
 \r
-  s->state = STATE_NONE;  \r
+  s->state = STATE_NONE;\r
   do {\r
     /* Call the generator function again if we are called to perform a\r
        retransmission. */\r
@@ -238,9 +238,9 @@ PT_THREAD(psock_generator_send(register struct psock *s,
     /* Wait until all data is sent and acknowledged. */\r
     PT_WAIT_UNTIL(&s->psockpt, data_acked(s) & send_data(s));\r
   } while(s->sendlen > 0);\r
-  \r
+\r
   s->state = STATE_NONE;\r
-  \r
+\r
   PT_END(&s->psockpt);\r
 }\r
 /*---------------------------------------------------------------------------*/\r
@@ -273,9 +273,9 @@ psock_newdata(struct psock *s)
 PT_THREAD(psock_readto(register struct psock *psock, unsigned char c))\r
 {\r
   PT_BEGIN(&psock->psockpt);\r
-\r
+  ( void ) PT_YIELD_FLAG;\r
   buf_setup(&psock->buf, (unsigned char*)psock->bufptr, psock->bufsize);\r
-  \r
+\r
   /* XXX: Should add buf_checkmarker() before do{} loop, if\r
      incoming data has been handled while waiting for a write. */\r
 \r
@@ -289,7 +289,7 @@ PT_THREAD(psock_readto(register struct psock *psock, unsigned char c))
   } while((buf_bufto(&psock->buf, c,\r
                     &psock->readptr,\r
                     &psock->readlen) & BUF_FOUND) == 0);\r
-  \r
+\r
   if(psock_datalen(psock) == 0) {\r
     psock->state = STATE_NONE;\r
     PT_RESTART(&psock->psockpt);\r
@@ -300,9 +300,9 @@ PT_THREAD(psock_readto(register struct psock *psock, unsigned char c))
 PT_THREAD(psock_readbuf(register struct psock *psock))\r
 {\r
   PT_BEGIN(&psock->psockpt);\r
-\r
+  ( void ) PT_YIELD_FLAG;\r
   buf_setup(&psock->buf, (unsigned char * ) psock->bufptr, psock->bufsize);\r
-  \r
+\r
   /* XXX: Should add buf_checkmarker() before do{} loop, if\r
      incoming data has been handled while waiting for a write. */\r
 \r

diff --git a/Demo/Common/ethernet/FreeTCPIP/uip_arp.c b/Demo/Common/ethernet/FreeTCPIP/uip_arp.c
index 5124c907e5fd78ea283413e34e7b761ed796d68b..4f4b06fe94a641696d706166c582fd93a4845824 100644 (file)
--- a/Demo/Common/ethernet/FreeTCPIP/uip_arp.c
+++ b/Demo/Common/ethernet/FreeTCPIP/uip_arp.c
@@ -105,7 +105,6 @@ struct arp_entry
 };\r
 \r
 static const struct uip_eth_addr       broadcast_ethaddr = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };\r
-static const u16_t                                     broadcast_ipaddr[2] = { 0xffff, 0xffff };\r
 \r
 static struct arp_entry                                arp_table[UIP_ARPTAB_SIZE];\r
 static uip_ipaddr_t                                    ipaddr;\r