OpenXX/xiuos
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed pull conflict and socket ping test bug

Browse Source
This commit is contained in:
wlyu
2021-12-22 16:09:34 +08:00
parent ebb1321b7c f98689fc30
commit aa43d46953
9 changed files with 68 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ubiquitous/XiUOS/resources/ethernet/LwIP/arch/lwipopts.h
+10 -4
View File
@@ -207,16 +207,18 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums
---------------------------------
*/
#define DEFAULT_RAW_RECVMBOX_SIZE 10
#define DEFAULT_UDP_RECVMBOX_SIZE 10
#define DEFAULT_TCP_RECVMBOX_SIZE 10
#define DEFAULT_ACCEPTMBOX_SIZE 10
#define DEFAULT_THREAD_PRIO 25
#define DEFAULT_THREAD_STACKSIZE 1024
#define TCPIP_THREAD_NAME "lwip"
#define TCPIP_THREAD_STACKSIZE 2048
#define TCPIP_THREAD_NAME "tcp"
#define TCPIP_THREAD_STACKSIZE 4096
#define TCPIP_MBOX_SIZE 8
#define TCPIP_THREAD_PRIO 3
#define TCPIP_THREAD_PRIO 25
//#define IPERF_SERVER_THREAD_NAME "iperf_server"
//#define IPERF_SERVER_THREAD_STACKSIZE 1024
@@ -234,8 +236,12 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums
#define LWIP_IPV4 1
#define LWIP_RAW 1
#define FSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE
#define MEMP_LIB_MALLOC 1
#define MEMP_MEM_MALLOC 1
#define lw_print KPrintf
#endif /* __LWIPOPTS_H__ */
Ubiquitous/XiUOS/resources/ethernet/LwIP/arch/sys_arch.c
+2 -1
View File
@@ -269,12 +269,13 @@ sys_thread_t sys_thread_new(const char *name, lwip_thread_fn function, void *arg
arg,
(uint32)stacksize,
(uint8)prio);
if (handle >= 0)
{
StartupKTask(handle);
lw_print("lw: [%s] create %s handle %x\n", __func__, name, handle);
return handle;
}
lw_print("lw: [%s] create %s failed\n", __func__, name);
return -ERROR;
}
Ubiquitous/XiUOS/resources/ethernet/LwIP/include/lwip/opt.h
+9 -9
View File
@@ -1754,7 +1754,7 @@
* sys_thread_new() when the thread is created.
*/
#if !defined TCPIP_THREAD_STACKSIZE || defined __DOXYGEN__
#define TCPIP_THREAD_STACKSIZE 0
#define TCPIP_THREAD_STACKSIZE 4096
#endif
/**
@@ -1763,7 +1763,7 @@
* sys_thread_new() when the thread is created.
*/
#if !defined TCPIP_THREAD_PRIO || defined __DOXYGEN__
#define TCPIP_THREAD_PRIO 1
#define TCPIP_THREAD_PRIO 25
#endif
/**
@@ -1772,7 +1772,7 @@
* sys_mbox_new() when tcpip_init is called.
*/
#if !defined TCPIP_MBOX_SIZE || defined __DOXYGEN__
#define TCPIP_MBOX_SIZE 0
#define TCPIP_MBOX_SIZE 10
#endif
/**
@@ -1821,7 +1821,7 @@
* sys_thread_new() when the thread is created.
*/
#if !defined DEFAULT_THREAD_STACKSIZE || defined __DOXYGEN__
#define DEFAULT_THREAD_STACKSIZE 0
#define DEFAULT_THREAD_STACKSIZE 4096
#endif
/**
@@ -1830,7 +1830,7 @@
* sys_thread_new() when the thread is created.
*/
#if !defined DEFAULT_THREAD_PRIO || defined __DOXYGEN__
#define DEFAULT_THREAD_PRIO 1
#define DEFAULT_THREAD_PRIO 25
#endif
/**
@@ -1839,7 +1839,7 @@
* to sys_mbox_new() when the recvmbox is created.
*/
#if !defined DEFAULT_RAW_RECVMBOX_SIZE || defined __DOXYGEN__
#define DEFAULT_RAW_RECVMBOX_SIZE 0
#define DEFAULT_RAW_RECVMBOX_SIZE 10
#endif
/**
@@ -1848,7 +1848,7 @@
* to sys_mbox_new() when the recvmbox is created.
*/
#if !defined DEFAULT_UDP_RECVMBOX_SIZE || defined __DOXYGEN__
#define DEFAULT_UDP_RECVMBOX_SIZE 0
#define DEFAULT_UDP_RECVMBOX_SIZE 10
#endif
/**
@@ -1857,7 +1857,7 @@
* to sys_mbox_new() when the recvmbox is created.
*/
#if !defined DEFAULT_TCP_RECVMBOX_SIZE || defined __DOXYGEN__
#define DEFAULT_TCP_RECVMBOX_SIZE 0
#define DEFAULT_TCP_RECVMBOX_SIZE 10
#endif
/**
@@ -1866,7 +1866,7 @@
* sys_mbox_new() when the acceptmbox is created.
*/
#if !defined DEFAULT_ACCEPTMBOX_SIZE || defined __DOXYGEN__
#define DEFAULT_ACCEPTMBOX_SIZE 0
#define DEFAULT_ACCEPTMBOX_SIZE 10
#endif
/**
* @}
Ubiquitous/XiUOS/resources/ethernet/LwIP/include/lwip/sys.h
+13 -13
View File
@@ -130,7 +130,7 @@ typedef void (*lwip_thread_fn)(void *arg);
* If the mutex has been created, ERR_OK should be returned. Returning any
* other error will provide a hint what went wrong, but except for assertions,
* no real error handling is implemented.
*
*
* @param mutex pointer to the mutex to create
* @return ERR_OK if successful, another err_t otherwise
*/
@@ -205,13 +205,13 @@ void sys_sem_signal(sys_sem_t *sem);
* "timeout" argument is non-zero, the thread should only be blocked for the
* specified time (measured in milliseconds). If the "timeout" argument is zero,
* the thread should be blocked until the semaphore is signalled.
*
*
* The return value is SYS_ARCH_TIMEOUT if the semaphore wasn't signaled within
* the specified time or any other value if it was signaled (with or without
* waiting).
* Notice that lwIP implements a function with a similar name,
* sys_sem_wait(), that uses the sys_arch_sem_wait() function.
*
*
* @param sem the semaphore to wait for
* @param timeout timeout in milliseconds to wait (0 = wait forever)
* @return SYS_ARCH_TIMEOUT on timeout, any other value on success
@@ -277,7 +277,7 @@ void sys_msleep(u32_t ms); /* only has a (close to) 1 ms resolution. */
* If the mailbox has been created, ERR_OK should be returned. Returning any
* other error will provide a hint what went wrong, but except for assertions,
* no real error handling is implemented.
*
*
* @param mbox pointer to the mbox to create
* @param size (minimum) number of messages in this mbox
* @return ERR_OK if successful, another err_t otherwise
@@ -287,7 +287,7 @@ err_t sys_mbox_new(sys_mbox_t *mbox, int size);
* @ingroup sys_mbox
* Post a message to an mbox - may not fail
* -> blocks if full, only to be used from tasks NOT from ISR!
*
*
* @param mbox mbox to posts the message
* @param msg message to post (ATTENTION: can be NULL)
*/
@@ -297,7 +297,7 @@ void sys_mbox_post(sys_mbox_t *mbox, void *msg);
* Try to post a message to an mbox - may fail if full.
* Can be used from ISR (if the sys arch layer allows this).
* Returns ERR_MEM if it is full, else, ERR_OK if the "msg" is posted.
*
*
* @param mbox mbox to posts the message
* @param msg message to post (ATTENTION: can be NULL)
*/
@@ -307,7 +307,7 @@ err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg);
* Try to post a message to an mbox - may fail if full.
* To be be used from ISR.
* Returns ERR_MEM if it is full, else, ERR_OK if the "msg" is posted.
*
*
* @param mbox mbox to posts the message
* @param msg message to post (ATTENTION: can be NULL)
*/
@@ -324,10 +324,10 @@ err_t sys_mbox_trypost_fromisr(sys_mbox_t *mbox, void *msg);
* The return values are the same as for the sys_arch_sem_wait() function:
* SYS_ARCH_TIMEOUT if there was a timeout, any other value if a messages
* is received.
*
*
* Note that a function with a similar name, sys_mbox_fetch(), is
* implemented by lwIP.
*
* implemented by lwIP.
*
* @param mbox mbox to get a message from
* @param msg pointer where the message is stored
* @param timeout maximum time (in milliseconds) to wait for a message (0 = wait forever)
@@ -346,7 +346,7 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout);
* example, a naive implementation could be:
* \#define sys_arch_mbox_tryfetch(mbox,msg) sys_arch_mbox_fetch(mbox,msg,1)
* although this would introduce unnecessary delays.
*
*
* @param mbox mbox to get a message from
* @param msg pointer where the message is stored
* @return 0 (milliseconds) if a message has been received
@@ -363,7 +363,7 @@ u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg);
* Deallocates a mailbox. If there are messages still present in the
* mailbox when the mailbox is deallocated, it is an indication of a
* programming error in lwIP and the developer should be notified.
*
*
* @param mbox mbox to delete
*/
void sys_mbox_free(sys_mbox_t *mbox);
@@ -411,7 +411,7 @@ void sys_mbox_set_invalid(sys_mbox_t *mbox);
* the "stacksize" parameter. The id of the new thread is returned. Both the id
* and the priority are system dependent.
* ATTENTION: although this function returns a value, it MUST NOT FAIL (ports have to assert this!)
*
*
* @param name human-readable name for the thread (used for debugging purposes)
* @param thread thread-function
* @param arg parameter passed to 'thread'