forked from xuos/xiuos
				
			fix cortex-m3-emulator start shell failure and fix compile error when using gcc -with-newlib param
This commit is contained in:
		
							parent
							
								
									65220e5aa7
								
							
						
					
					
						commit
						089f9c8975
					
				| 
						 | 
					@ -29,6 +29,7 @@ extern "C" {
 | 
				
			||||||
#include <time.h>
 | 
					#include <time.h>
 | 
				
			||||||
#include <sys/time.h>
 | 
					#include <sys/time.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if !defined(_SYS_SCHED_H_) && !defined(_SYS__PTHREADTYPES_H_)
 | 
				
			||||||
typedef int   pid_t;
 | 
					typedef int   pid_t;
 | 
				
			||||||
typedef unsigned long int pthread_t; 
 | 
					typedef unsigned long int pthread_t; 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -58,7 +59,8 @@ typedef struct pthread_mutexattr {
 | 
				
			||||||
    int pshared;
 | 
					    int pshared;
 | 
				
			||||||
} pthread_mutexattr_t;
 | 
					} pthread_mutexattr_t;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef int pthread_mutex_t ;
 | 
					typedef int pthread_mutex_t;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef __cplusplus
 | 
					#ifdef __cplusplus
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,233 +0,0 @@
 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Automatically generated file; DO NOT EDIT.
 | 
					 | 
				
			||||||
# XiZi_IIoT Project Configuration
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_BOARD_CORTEX_M3_EVB=y
 | 
					 | 
				
			||||||
CONFIG_KERNEL_CONSOLE_DEVICE_NAME="uart0"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# cortex-m3-emulator feature
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_AUDIO is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_CAMERA is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_SDIO is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_DMA is not set 
 | 
					 | 
				
			||||||
CONFIG_BSP_USING_GPIO=y
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_I2C is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_I2S is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_LCD is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_RTC is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_SECURITY is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_SPI is not set
 | 
					 | 
				
			||||||
CONFIG_BSP_USING_UART=y
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_UART_HS is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_VIDEO is not set
 | 
					 | 
				
			||||||
# CONFIG_BSP_USING_WDT is not set
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# General Purpose UARTs
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
CONFIG___STACKSIZE__=4096
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Hardware feature
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_RESOURCES_SERIAL=y
 | 
					 | 
				
			||||||
# CONFIG_SERIAL_USING_DMA=y
 | 
					 | 
				
			||||||
CONFIG_SERIAL_RB_BUFSZ=64
 | 
					 | 
				
			||||||
CONFIG_FS_VFS=y
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_HWTIMER is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_I2C is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_LCD is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_SDIO is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_TOUCH is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_PIN=y
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_RTC is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_SPI is not set
 | 
					 | 
				
			||||||
#CONFIG_RESOURCES_SPI_SD is not set
 | 
					 | 
				
			||||||
#CONFIG_RESOURCES_SPI_SFUD is not set
 | 
					 | 
				
			||||||
# SFUD_USING_SFDP is not set
 | 
					 | 
				
			||||||
# SFUD_USING_FLASH_INFO_TABLE is not set
 | 
					 | 
				
			||||||
# SFUD_DEBUG_LOG is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_WDT is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_USB is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_USB_HOST is not set
 | 
					 | 
				
			||||||
# CONFIG_UDISK_MOUNTPOINT is not set
 | 
					 | 
				
			||||||
# CONFIG_USBH_MSTORAGE is not set
 | 
					 | 
				
			||||||
# CONFIG_RESOURCES_USB_DEVICE is not set
 | 
					 | 
				
			||||||
# CONFIG_USBD_THREAD_STACK_SZ is not set
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Kernel feature
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Kernel Device Object
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_KERNEL_DEVICE=y
 | 
					 | 
				
			||||||
CONFIG_KERNEL_CONSOLE=y
 | 
					 | 
				
			||||||
CONFIG_KERNEL_CONSOLEBUF_SIZE=128
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Task feature
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_SCHED_POLICY_RR_REMAINSLICE=y
 | 
					 | 
				
			||||||
# CONFIG_SCHED_POLICY_RR is not set
 | 
					 | 
				
			||||||
# CONFIG_SCHED_POLICY_FIFO is not set
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Memory Management
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_MEMBLOCK is not set
 | 
					 | 
				
			||||||
CONFIG_MEM_ALIGN_SIZE=4
 | 
					 | 
				
			||||||
CONFIG_MM_PAGE_SIZE=1024
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Using small memory allocator
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_KERNEL_SMALL_MEM_ALLOC=y
 | 
					 | 
				
			||||||
CONFIG_SMALL_NUMBER_32B=32
 | 
					 | 
				
			||||||
CONFIG_SMALL_NUMBER_64B=16
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Inter-Task communication
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_SEMAPHORE=y
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_MUTEX=y
 | 
					 | 
				
			||||||
CONFIG_KERNEL_EVENT=y
 | 
					 | 
				
			||||||
CONFIG_KERNEL_MESSAGEQUEUE=y
 | 
					 | 
				
			||||||
CONFIG_KTASK_PRIORITY_8=y
 | 
					 | 
				
			||||||
CONFIG_KTASK_PRIORITY_MAX=8
 | 
					 | 
				
			||||||
CONFIG_TICK_PER_SECOND=100
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_STACK_OVERFLOW_CHECK=y
 | 
					 | 
				
			||||||
CONFIG_KERNEL_BANNER=y
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_HOOK is not set
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_SOFTTIMER=y
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_IDLE_HOOK=y
 | 
					 | 
				
			||||||
# CONFIG_IDEL_HOOK_LIST_SIZE=4
 | 
					 | 
				
			||||||
CONFIG_IDLE_KTASK_STACKSIZE=512
 | 
					 | 
				
			||||||
CONFIG_ZOMBIE_KTASK_STACKSIZE=512
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_TASK_ISOLATION is not set
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Command shell
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_TOOL_SHELL=y
 | 
					 | 
				
			||||||
CONFIG_SHELL_TASK_PRIORITY=4
 | 
					 | 
				
			||||||
CONFIG_SHELL_TASK_STACK_SIZE=2048
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# User Control
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_SHELL_DEFAULT_USER="letter"
 | 
					 | 
				
			||||||
CONFIG_SHELL_DEFAULT_USER_PASSWORD=""
 | 
					 | 
				
			||||||
CONFIG_SHELL_LOCK_TIMEOUT=10000
 | 
					 | 
				
			||||||
CONFIG_SHELL_ENTER_CR_AND_LF=y
 | 
					 | 
				
			||||||
# CONFIG_SHELL_ENTER_CRLF is not set
 | 
					 | 
				
			||||||
CONFIG_SHELL_ENTER_CR=y
 | 
					 | 
				
			||||||
CONFIG_SHELL_ENTER_LF=y
 | 
					 | 
				
			||||||
CONFIG_SHELL_MAX_NUMBER=5
 | 
					 | 
				
			||||||
CONFIG_SHELL_PARAMETER_MAX_NUMBER=8
 | 
					 | 
				
			||||||
CONFIG_SHELL_HISTORY_MAX_NUMBER=5
 | 
					 | 
				
			||||||
CONFIG_SHELL_PRINT_BUFFER=128
 | 
					 | 
				
			||||||
CONFIG_SHELL_USING_CMD_EXPORT=y
 | 
					 | 
				
			||||||
# CONFIG_SHELL_HELP_LIST_USER is not set
 | 
					 | 
				
			||||||
CONFIG_SHELL_HELP_SHOW_PERMISSION=y
 | 
					 | 
				
			||||||
# CONFIG_SHELL_HELP_LIST_VAR is not set
 | 
					 | 
				
			||||||
# CONFIG_SHELL_HELP_LIST_KEY is not set
 | 
					 | 
				
			||||||
CONFIG_KERNEL_QUEUEMANAGE=y
 | 
					 | 
				
			||||||
CONFIG_KERNEL_WORKQUEUE=y
 | 
					 | 
				
			||||||
CONFIG_WORKQUEUE_KTASK_STACKSIZE=256
 | 
					 | 
				
			||||||
CONFIG_WORKQUEUE_KTASK_PRIORITY=2
 | 
					 | 
				
			||||||
CONFIG_QUEUE_MAX=2
 | 
					 | 
				
			||||||
CONFIG_KERNEL_WAITQUEUE=y
 | 
					 | 
				
			||||||
CONFIG_KERNEL_DATAQUEUE=y
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_CIRCULAR_AREA is not set
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_AVL_TREE is not set
 | 
					 | 
				
			||||||
CONFIG_NAME_MAX=32
 | 
					 | 
				
			||||||
CONFIG_ALIGN_SIZE=8
 | 
					 | 
				
			||||||
CONFIG_KERNEL_COMPONENTS_INIT=n
 | 
					 | 
				
			||||||
CONFIG_KERNEL_USER_MAIN=y
 | 
					 | 
				
			||||||
CONFIG_MAIN_KTASK_STACK_SIZE=2048
 | 
					 | 
				
			||||||
CONFIG_ENV_INIT_KTASK_STACK_SIZE=2048
 | 
					 | 
				
			||||||
CONFIG_MAIN_KTASK_PRIORITY=3
 | 
					 | 
				
			||||||
# CONFIG_USER_TEST is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_SEM is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_MUTEX is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_EVENT is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_MSG is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_AVLTREE is not set
 | 
					 | 
				
			||||||
# CONFIG_TEST_CRICULAR_AREA is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_MEM is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_TIMER is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_IWG is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_REALTIME is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_DBG is not set
 | 
					 | 
				
			||||||
# CONFIG_TOOL_TEST_SCHED is not set
 | 
					 | 
				
			||||||
# CONFIG_KERNEL_DEBUG is not set
 | 
					 | 
				
			||||||
#CONFIG_DEBUG_INIT_CONFIG=y
 | 
					 | 
				
			||||||
#CONFIG_DBG_INIT=1
 | 
					 | 
				
			||||||
#CONFIG_ARCH_SMP=y
 | 
					 | 
				
			||||||
#CONFIG_CPUS_NR=2
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# hash table config
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_ID_HTABLE_SIZE=4
 | 
					 | 
				
			||||||
CONFIG_ID_NUM_MAX=16
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# File system
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_FS_DFS=n
 | 
					 | 
				
			||||||
#CONFIG_DFS_USING_WORKDIR=y
 | 
					 | 
				
			||||||
#CONFIG_FS_DFS_DEVFS=y
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Fat filesystem 
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# IOT-Device File system
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Lwext4 filesystem 
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# APP Framework
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# connection
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# CONFIG_CONNECTION_AT is not set
 | 
					 | 
				
			||||||
# CONFIG_CONNECTION_MQTT is not set
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# medium communication 
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Intelligence
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Control
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Lib
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
CONFIG_LIB=y
 | 
					 | 
				
			||||||
CONFIG_LIB_POSIX=y
 | 
					 | 
				
			||||||
CONFIG_LIB_NEWLIB=y
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# CONFIG_LITTLEVGL2RTT_USING_DEMO=y
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Security
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
| 
						 | 
					@ -154,7 +154,7 @@ static inline int SerialDevIntRead(struct SerialHardwareDevice *serial_dev, stru
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        CriticalAreaUnLock(lock);
 | 
					        CriticalAreaUnLock(lock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        MdelayKTask(20);
 | 
					        //MdelayKTask(20);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        *read_data = get_char;
 | 
					        *read_data = get_char;
 | 
				
			||||||
        read_data++; 
 | 
					        read_data++; 
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue