Merge branch 'Branch_S530' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S530

This commit is contained in:
xiaojiazhu 2023-08-11 18:10:51 +08:00
commit 80ecdc40da
3 changed files with 4 additions and 3 deletions

View File

@ -9,4 +9,5 @@ ulimit -c unlimited
# cat /proc/{cardv_pid}/maps for debug purpose # cat /proc/{cardv_pid}/maps for debug purpose
# sleep 0.2 # sleep 0.2
# cat /proc/$(ps | grep 'cardv' | awk 'NR==1{print $1}')/maps # cat /proc/$(ps | grep 'cardv' | awk 'NR==1{print $1}')/maps
#cat /proc/$(ps | grep 'sf_app' | awk 'NR==1{print $1}')/maps

View File

@ -56,7 +56,7 @@ interface wlan0
# Examples: # Examples:
opt dns 192.168.1.1 opt dns 192.168.1.1
option subnet 255.255.255.0 option subnet 255.255.255.0
opt router 192.168.1.1 #opt router 192.168.1.1
#opt wins 192.168.10.10 #opt wins 192.168.10.10
#option dns 129.219.13.81 # appened to above DNS servers for a total of 3 #option dns 129.219.13.81 # appened to above DNS servers for a total of 3
option domain local option domain local

View File

@ -249,8 +249,8 @@ static SINT32 hal_ttyusb_read(SINT32 fd, SF_CHAR *recvBuf, SINT32 waitTime)
SINT32 s32ret = 0; SINT32 s32ret = 0;
fd_set read_fds; fd_set read_fds;
struct timeval TimeoutVal; struct timeval TimeoutVal;
if(waitTime > 0) //if(waitTime > 0)
sf_sleep_ms(waitTime); // sf_sleep_ms(waitTime);
//while(waitTime--) //while(waitTime--)
{ {