unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / net / lwip_tcpip / v2_0 / src / api / api_lib.c

diff --git a/packages/net/lwip_tcpip/v2_0/src/api/api_lib.c b/packages/net/lwip_tcpip/v2_0/src/api/api_lib.c
index 93c0e453885638a87954db65ce25fc77c33f8864..1d7949ae87ea2fab80316152462e90e57278464b 100644 (file)
--- a/packages/net/lwip_tcpip/v2_0/src/api/api_lib.c
+++ b/packages/net/lwip_tcpip/v2_0/src/api/api_lib.c
@@ -165,7 +165,7 @@ netbuf_copy_partial(struct netbuf *buf, void *dataptr, u16_t len, u16_t offset)
       offset -= p->len;
     } else {    
       for(i = offset; i < p->len; ++i) {
-  ((char *)dataptr)[left] = ((char *)p->payload)[i];
+  ((u8_t *)dataptr)[left] = ((u8_t *)p->payload)[i];
   if (++left >= len) {
     return;
   }
@@ -280,9 +280,10 @@ netconn_delete(struct netconn *conn)
   if (conn->recvmbox != SYS_MBOX_NULL) {
     while (sys_arch_mbox_fetch(conn->recvmbox, &mem, 1) != SYS_ARCH_TIMEOUT) {
       if (conn->type == NETCONN_TCP) {
-  pbuf_free((struct pbuf *)mem);
+        if(mem != NULL)
+          pbuf_free((struct pbuf *)mem);
       } else {
-  netbuf_delete((struct netbuf *)mem);
+        netbuf_delete((struct netbuf *)mem);
       }
     }
     sys_mbox_free(conn->recvmbox);
@@ -327,17 +328,22 @@ netconn_peer(struct netconn *conn, struct ip_addr *addr,
   case NETCONN_UDPLITE:
   case NETCONN_UDPNOCHKSUM:
   case NETCONN_UDP:
+#if LWIP_UDP
     if (conn->pcb.udp == NULL ||
   ((conn->pcb.udp->flags & UDP_FLAGS_CONNECTED) == 0))
      return ERR_CONN;
     *addr = (conn->pcb.udp->remote_ip);
     *port = conn->pcb.udp->remote_port;
+#endif
     break;
+    
   case NETCONN_TCP:
+#if LWIP_TCP
     if (conn->pcb.tcp == NULL)
       return ERR_CONN;
     *addr = (conn->pcb.tcp->remote_ip);
     *port = conn->pcb.tcp->remote_port;
+#endif
     break;
   }
   return (conn->err = ERR_OK);
@@ -349,18 +355,25 @@ netconn_addr(struct netconn *conn, struct ip_addr **addr,
 {
   switch (conn->type) {
   case NETCONN_RAW:
+#if LWIP_RAW
     *addr = &(conn->pcb.raw->local_ip);
     *port = conn->pcb.raw->protocol;
+#endif
     break;
   case NETCONN_UDPLITE:
   case NETCONN_UDPNOCHKSUM:
   case NETCONN_UDP:
+#if LWIP_UDP
     *addr = &(conn->pcb.udp->local_ip);
     *port = conn->pcb.udp->local_port;
+#endif
     break;
+    
   case NETCONN_TCP:
+#if LWIP_TCP
     *addr = &(conn->pcb.tcp->local_ip);
     *port = conn->pcb.tcp->local_port;
+#endif
     break;
   }
   return (conn->err = ERR_OK);
@@ -672,7 +685,7 @@ netconn_write(struct netconn *conn, void *dataptr, u16_t size, u8_t copy)
     api_msg_post(msg);
     sys_mbox_fetch(conn->mbox, NULL);    
     if (conn->err == ERR_OK) {
-      dataptr = (void *)((char *)dataptr + len);
+      dataptr = (void *)((u8_t *)dataptr + len);
       size -= len;
     } else if (conn->err == ERR_MEM) {
       conn->err = ERR_OK;