libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/RT-Thread/rt-thread

This commit is contained in:
Bernard Xiong 2015-09-25 09:25:26 +08:00
parent 5b77fa2d11 b4e3fb2007
commit 20b8293a84
4 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
components/dfs/filesystems/lwip/netinet/tcp.h Normal file
View File

@ -0,0 +1,30 @@
/*
* File : tcp.h
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2015, RT-Thread Development Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Change Logs:
* Date Author Notes
* 2015-02-17 Bernard First version
*/
#ifndef TCP_H__
#define TCP_H__
#include <lwip/sockets.h>
#endif

30
components/dfs/filesystems/lwip/netinet/udp.h Normal file
View File

@ -0,0 +1,30 @@
/*
* File : udp.h
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2015, RT-Thread Development Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Change Logs:
* Date Author Notes
* 2015-02-17 Bernard First version
*/
#ifndef UDP_H__
#define UDP_H__
#include <lwip/sockets.h>
#endif

8
components/dfs/filesystems/lwip/sys/socket.h
View File

@ -31,6 +31,14 @@ extern "C" {
#include <lwip/sockets.h> #include <lwip/sockets.h>
typedef uint16_t sa_family_t;
struct sockaddr_storage
{
sa_family_t ss_family; /* Address family */
char ss_data[14]; /* 14-bytes of address data */
};
int accept(int s, struct sockaddr *addr, socklen_t *addrlen); int accept(int s, struct sockaddr *addr, socklen_t *addrlen);
int bind(int s, const struct sockaddr *name, socklen_t namelen); int bind(int s, const struct sockaddr *name, socklen_t namelen);
int shutdown(int s, int how); int shutdown(int s, int how);

3
src/mem.c
View File

@ -304,6 +304,7 @@ void *rt_malloc(rt_size_t size)
/* create mem2 struct */ /* create mem2 struct */
mem2 = (struct heap_mem *)&heap_ptr[ptr2]; mem2 = (struct heap_mem *)&heap_ptr[ptr2];
mem2->magic = HEAP_MAGIC;
mem2->used = 0; mem2->used = 0;
mem2->next = mem->next; mem2->next = mem->next;
mem2->prev = ptr; mem2->prev = ptr;
@ -540,7 +541,7 @@ void rt_free(void *rmem)
RT_ASSERT(mem->magic == HEAP_MAGIC); RT_ASSERT(mem->magic == HEAP_MAGIC);
/* ... and is now unused. */ /* ... and is now unused. */
mem->used = 0; mem->used = 0;
mem->magic = 0; mem->magic = HEAP_MAGIC;
if (mem < lfree) if (mem < lfree)
{ {