From 91261e25b90d6258073f620ae14c003dae9eb16e Mon Sep 17 00:00:00 2001 From: yangjie11 Date: Fri, 20 Nov 2020 13:38:11 +0800 Subject: [SConscript]rename group name --- components/libc/time/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/libc/time/SConscript') diff --git a/components/libc/time/SConscript b/components/libc/time/SConscript index 4ecd5d24bc..67d1824b9f 100644 --- a/components/libc/time/SConscript +++ b/components/libc/time/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('pthreads', src, +group = DefineGroup('Pthreads', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) Return('group') -- cgit v1.3.1 From ef62febf1f2461bdd72efcffde050905865a99c5 Mon Sep 17 00:00:00 2001 From: yangjie Date: Sat, 19 Dec 2020 16:49:11 +0800 Subject: [SConscript]update group name --- bsp/allwinner_tina/libcpu/SConscript | 2 +- bsp/amebaz/libraries/smartconfig/SConscript | 2 +- bsp/apollo2/board/SConscript | 2 +- bsp/asm9260t/platform/SConscript | 2 +- bsp/at32/Libraries/AT32_Std_Driver/SConscript | 2 +- bsp/at91sam9260/platform/SConscript | 2 +- bsp/at91sam9g45/platform/SConscript | 2 +- bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript | 2 +- bsp/dm365/drivers/SConscript | 2 +- bsp/fh8620/platform/common/SConscript | 2 +- bsp/fh8620/platform/fh8620/iot_cam/SConscript | 2 +- bsp/fh8620/platform/plat-v2/SConscript | 2 +- bsp/frdm-k64f/board/SConscript | 2 +- bsp/frdm-k64f/device/SConscript | 2 +- bsp/gkipc/armv6/SConscript | 2 +- bsp/gkipc/libraries/drv/7102C/gd/SConscript | 2 +- bsp/gkipc/libraries/drv/7102C/gd/src/SConscript | 2 +- bsp/gkipc/libraries/drv/7102C/gh/SConscript | 2 +- bsp/gkipc/libraries/drv/7102C/gh/src/SConscript | 2 +- bsp/gkipc/libraries/drv/710X/gd/SConscript | 2 +- bsp/gkipc/libraries/drv/710X/gd/src/SConscript | 2 +- bsp/gkipc/libraries/drv/710X/gh/SConscript | 2 +- bsp/gkipc/libraries/drv/710X/gh/src/SConscript | 2 +- bsp/gkipc/libraries/drv/710XS/gd/SConscript | 2 +- bsp/gkipc/libraries/drv/710XS/gd/src/SConscript | 2 +- bsp/gkipc/libraries/drv/710XS/gh/SConscript | 2 +- bsp/gkipc/libraries/drv/710XS/gh/src/SConscript | 2 +- bsp/gkipc/libraries/drv/gnu_c/SConscript | 2 +- bsp/gkipc/platform/SConscript | 2 +- bsp/imx6sx/cortex-a9/cpu/SConscript | 2 +- bsp/k210/driver/camera/SConscript | 2 +- bsp/nrf51822/Libraries/SConscript | 2 +- bsp/nrf52832/board/Sconscript | 2 +- bsp/nrf52832/startups/Sconscript | 2 +- bsp/nuvoton/libraries/m480/Device/SConscript | 2 +- bsp/nuvoton/libraries/m480/StdDriver/SConscript | 4 ++-- bsp/nuvoton/libraries/m480/rtt_port/SConscript | 2 +- bsp/nuvoton/numaker-iot-m487/board/SConscript | 2 +- bsp/nuvoton/numaker-pfm-m487/board/SConscript | 2 +- bsp/qemu-vexpress-a9/drivers/audio/SConscript | 2 +- bsp/qemu-vexpress-gemini/cpu/SConscript | 2 +- bsp/raspberry-pi/raspi2/cpu/SConscript | 2 +- bsp/raspberry-pi/raspi3-32/cpu/SConscript | 2 +- bsp/samd21/board/SConscript | 2 +- components/dfs/SConscript | 2 +- components/dfs/filesystems/devfs/SConscript | 2 +- components/dfs/filesystems/elmfat/SConscript | 2 +- components/dfs/filesystems/jffs2/SConscript | 2 +- components/dfs/filesystems/nfs/SConscript | 2 +- components/dfs/filesystems/ramfs/SConscript | 2 +- components/dfs/filesystems/romfs/SConscript | 2 +- components/dfs/filesystems/uffs/SConscript | 2 +- components/drivers/sensors/SConscript | 2 +- components/drivers/touch/SConscript | 2 +- components/finsh/SConscript | 2 +- components/libc/aio/SConscript | 2 +- components/libc/compilers/armlibc/SConscript | 2 +- components/libc/compilers/common/SConscript | 2 +- components/libc/compilers/dlib/SConscript | 2 +- components/libc/compilers/minilibc/SConscript | 2 +- components/libc/compilers/newlib/SConscript | 2 +- components/libc/getline/SConscript | 2 +- components/libc/libdl/SConscript | 2 +- components/libc/mmap/SConscript | 2 +- components/libc/pthreads/SConscript | 2 +- components/libc/signal/SConscript | 2 +- components/libc/termios/SConscript | 2 +- components/libc/time/SConscript | 2 +- components/net/lwip-1.4.1/SConscript | 2 +- components/net/lwip-2.0.2/SConscript | 2 +- components/net/lwip-2.1.2/SConscript | 2 +- components/net/lwip_dhcpd/SConscript | 2 +- components/net/lwip_nat/SConscript | 2 +- components/net/netdev/SConscript | 2 +- components/utilities/utest/SConscript | 2 +- examples/libc/SConscript | 2 +- libcpu/aarch64/common/SConscript | 2 +- libcpu/aarch64/cortex-a53/SConscript | 2 +- libcpu/aarch64/cortex-a72/SConscript | 2 +- libcpu/arc/common/SConscript | 2 +- libcpu/arc/em/SConscript | 2 +- libcpu/arm/AT91SAM7S/SConscript | 2 +- libcpu/arm/AT91SAM7X/SConscript | 2 +- libcpu/arm/am335x/SConscript | 2 +- libcpu/arm/arm926/SConscript | 2 +- libcpu/arm/armv6/SConscript | 2 +- libcpu/arm/common/SConscript | 2 +- libcpu/arm/cortex-a/SConscript | 2 +- libcpu/arm/cortex-m0/SConscript | 2 +- libcpu/arm/cortex-m23/SConscript | 2 +- libcpu/arm/cortex-m3/SConscript | 2 +- libcpu/arm/cortex-m33/SConscript | 2 +- libcpu/arm/cortex-m4/SConscript | 2 +- libcpu/arm/cortex-m7/SConscript | 2 +- libcpu/arm/cortex-r4/SConscript | 2 +- libcpu/arm/dm36x/SConscript | 2 +- libcpu/arm/lpc214x/SConscript | 2 +- libcpu/arm/lpc24xx/SConscript | 2 +- libcpu/arm/realview-a8-vmm/SConscript | 2 +- libcpu/arm/s3c24x0/SConscript | 2 +- libcpu/arm/s3c44b0/SConscript | 2 +- libcpu/arm/sep4020/SConscript | 2 +- libcpu/arm/zynq7000/SConscript | 2 +- libcpu/avr32/uc3/SConscript | 2 +- libcpu/blackfin/bf53x/SConscript | 2 +- libcpu/c-sky/ck802/SConscript | 2 +- libcpu/c-sky/common/SConscript | 2 +- libcpu/ia32/SConscript | 2 +- libcpu/m16c/m16c62p/SConscript | 2 +- libcpu/mips/common/SConscript | 2 +- libcpu/mips/gs232/SConscript | 2 +- libcpu/mips/gs264/SConscript | 2 +- libcpu/mips/pic32/SConscript | 2 +- libcpu/nios/nios_ii/SConscript | 2 +- libcpu/ppc/common/SConscript | 2 +- libcpu/ppc/ppc405/SConscript | 2 +- libcpu/risc-v/bumblebee/SConscript | 2 +- libcpu/risc-v/common/SConscript | 2 +- libcpu/risc-v/e310/SConscript | 2 +- libcpu/risc-v/k210/SConscript | 2 +- libcpu/risc-v/nuclei/SConscript | 2 +- libcpu/risc-v/rv32m1/SConscript | 2 +- libcpu/risc-v/t-head/e906/SConscript | 2 +- libcpu/rx/SConscript | 2 +- libcpu/sim/posix/SConscript | 2 +- libcpu/sim/win32/SConscript | 2 +- libcpu/sparc-v8/bm3803/SConscript | 2 +- libcpu/sparc-v8/common/SConscript | 2 +- libcpu/ti-dsp/c28x/SConscript | 2 +- libcpu/unicore32/sep6200/SConscript | 2 +- libcpu/v850/70f34/SConscript | 2 +- libcpu/xilinx/microblaze/SConscript | 2 +- 132 files changed, 133 insertions(+), 133 deletions(-) (limited to 'components/libc/time/SConscript') diff --git a/bsp/allwinner_tina/libcpu/SConscript b/bsp/allwinner_tina/libcpu/SConscript index d41ab0ba74..aa13c2b179 100644 --- a/bsp/allwinner_tina/libcpu/SConscript +++ b/bsp/allwinner_tina/libcpu/SConscript @@ -8,6 +8,6 @@ CPPPATH = [cwd] if rtconfig.PLATFORM == 'gcc': src += Glob('*_gcc.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/amebaz/libraries/smartconfig/SConscript b/bsp/amebaz/libraries/smartconfig/SConscript index 4ae07e3815..31c98a046b 100644 --- a/bsp/amebaz/libraries/smartconfig/SConscript +++ b/bsp/amebaz/libraries/smartconfig/SConscript @@ -12,7 +12,7 @@ if rtconfig.CROSS_TOOL == 'gcc': elif rtconfig.CROSS_TOOL == 'iar': libs += ['libsmartconfig_armcm4_iar'] -group = DefineGroup('smartconfig', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath) +group = DefineGroup('Libraries', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath) Return('group') diff --git a/bsp/apollo2/board/SConscript b/bsp/apollo2/board/SConscript index 2f2dc9eb48..ce5e82d5dd 100644 --- a/bsp/apollo2/board/SConscript +++ b/bsp/apollo2/board/SConscript @@ -9,6 +9,6 @@ CPPPATH = [cwd] #remove other no use files #SrcRemove(src, '*.c') -group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') \ No newline at end of file diff --git a/bsp/asm9260t/platform/SConscript b/bsp/asm9260t/platform/SConscript index 5df4a5fc63..e0706a5017 100644 --- a/bsp/asm9260t/platform/SConscript +++ b/bsp/asm9260t/platform/SConscript @@ -8,5 +8,5 @@ CPPPATH = [cwd] # The set of source files associated with this SConscript file. src = Glob('*.c') -group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/at32/Libraries/AT32_Std_Driver/SConscript b/bsp/at32/Libraries/AT32_Std_Driver/SConscript index fd6b012d0a..1b7c7c1369 100644 --- a/bsp/at32/Libraries/AT32_Std_Driver/SConscript +++ b/bsp/at32/Libraries/AT32_Std_Driver/SConscript @@ -41,6 +41,6 @@ path = [ CPPDEFINES = ['USE_STDPERIPH_DRIVER'] -group = DefineGroup('AT32_Lib', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/at91sam9260/platform/SConscript b/bsp/at91sam9260/platform/SConscript index 1f5de6e772..65b33d7eef 100644 --- a/bsp/at91sam9260/platform/SConscript +++ b/bsp/at91sam9260/platform/SConscript @@ -21,6 +21,6 @@ if rtconfig.PLATFORM == 'cl': if rtconfig.PLATFORM == 'mingw': src = Glob('*.c') -group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Platform', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/at91sam9g45/platform/SConscript b/bsp/at91sam9g45/platform/SConscript index 1f5de6e772..65b33d7eef 100644 --- a/bsp/at91sam9g45/platform/SConscript +++ b/bsp/at91sam9g45/platform/SConscript @@ -21,6 +21,6 @@ if rtconfig.PLATFORM == 'cl': if rtconfig.PLATFORM == 'mingw': src = Glob('*.c') -group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Platform', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript b/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript index e7852f8abb..19d9931942 100644 --- a/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript +++ b/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript @@ -25,6 +25,6 @@ CPPPATH = [ cwd + '/DRIVERS/USART', ] -group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/dm365/drivers/SConscript b/bsp/dm365/drivers/SConscript index 287720aa96..a36d186e94 100644 --- a/bsp/dm365/drivers/SConscript +++ b/bsp/dm365/drivers/SConscript @@ -26,6 +26,6 @@ if GetDepend('RT_USING_SPI_CONTROL'): if GetDepend('RT_USING_EMAC'): src += ['davinci_emac.c'] -group = DefineGroup('Startup', src, depend = [''], CPPPATH = path) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/fh8620/platform/common/SConscript b/bsp/fh8620/platform/common/SConscript index 9679d6df56..b5bcf86f6d 100644 --- a/bsp/fh8620/platform/common/SConscript +++ b/bsp/fh8620/platform/common/SConscript @@ -3,6 +3,6 @@ from building import * cwd = GetCurrentDir() src = Glob('*.c') -group = DefineGroup('Platform', src, depend = ['']) +group = DefineGroup('Drivers', src, depend = ['']) Return('group') diff --git a/bsp/fh8620/platform/fh8620/iot_cam/SConscript b/bsp/fh8620/platform/fh8620/iot_cam/SConscript index 7f5236ef88..527e7976e3 100644 --- a/bsp/fh8620/platform/fh8620/iot_cam/SConscript +++ b/bsp/fh8620/platform/fh8620/iot_cam/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') path = [cwd, cwd + '/..'] -group = DefineGroup('Platform', src, depend = ['CONFIG_BOARD_IOTCAM', 'CONFIG_CHIP_FH8620'], CPPPATH = path) +group = DefineGroup('Drivers', src, depend = ['CONFIG_BOARD_IOTCAM', 'CONFIG_CHIP_FH8620'], CPPPATH = path) Return('group') diff --git a/bsp/fh8620/platform/plat-v2/SConscript b/bsp/fh8620/platform/plat-v2/SConscript index 40240950c0..7fad1e2a7e 100644 --- a/bsp/fh8620/platform/plat-v2/SConscript +++ b/bsp/fh8620/platform/plat-v2/SConscript @@ -8,6 +8,6 @@ src = Glob('*.c') path = [cwd, cwd + '/..'] -group = DefineGroup('Platform', src, depend = ['CONFIG_PLAT_V2'], CPPPATH = path) +group = DefineGroup('Drivers', src, depend = ['CONFIG_PLAT_V2'], CPPPATH = path) Return('group') diff --git a/bsp/frdm-k64f/board/SConscript b/bsp/frdm-k64f/board/SConscript index d92267623c..5db2d042e6 100644 --- a/bsp/frdm-k64f/board/SConscript +++ b/bsp/frdm-k64f/board/SConscript @@ -18,6 +18,6 @@ if GetDepend('RT_USING_LWIP'): CPPPATH = [cwd] -group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/frdm-k64f/device/SConscript b/bsp/frdm-k64f/device/SConscript index 9fa79aed4a..d91ae0576f 100644 --- a/bsp/frdm-k64f/device/SConscript +++ b/bsp/frdm-k64f/device/SConscript @@ -21,7 +21,7 @@ elif rtconfig.CROSS_TOOL == 'keil': CPPDEFINES = ['CPU_MK64FN1M0VLL12'] -group = DefineGroup('Device', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES) #CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/gkipc/armv6/SConscript b/bsp/gkipc/armv6/SConscript index d0a05be403..04f6bb5a4f 100644 --- a/bsp/gkipc/armv6/SConscript +++ b/bsp/gkipc/armv6/SConscript @@ -5,6 +5,6 @@ src = Glob('*.c') src += Glob('*.s') path = [cwd, cwd + '../../../include', cwd + '/../libraries/inc', cwd + '/../drivers'] -group = DefineGroup('armv6', src, depend = [''], CPPPATH = path) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/gkipc/libraries/drv/7102C/gd/SConscript b/bsp/gkipc/libraries/drv/7102C/gd/SConscript index 70fd17741b..35c70dc595 100644 --- a/bsp/gkipc/libraries/drv/7102C/gd/SConscript +++ b/bsp/gkipc/libraries/drv/7102C/gd/SConscript @@ -7,7 +7,7 @@ path = [cwd + '/inc'] libcwd = str(Dir('#')) libinspath = libcwd + '/libraries/lib' -group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) list = os.listdir(cwd) for d in list: diff --git a/bsp/gkipc/libraries/drv/7102C/gd/src/SConscript b/bsp/gkipc/libraries/drv/7102C/gd/src/SConscript index e1f3a4ae03..1b6bf54f09 100644 --- a/bsp/gkipc/libraries/drv/7102C/gd/src/SConscript +++ b/bsp/gkipc/libraries/drv/7102C/gd/src/SConscript @@ -39,6 +39,6 @@ src += ['wdog/gd_wdog.c'] path = [cwd, cwd + '/../inc'] -group = DefineGroup('gd', src, depend = [''], CPPPATH = path) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) Return('group') \ No newline at end of file diff --git a/bsp/gkipc/libraries/drv/7102C/gh/SConscript b/bsp/gkipc/libraries/drv/7102C/gh/SConscript index a765cdd5a1..c8786e9e35 100644 --- a/bsp/gkipc/libraries/drv/7102C/gh/SConscript +++ b/bsp/gkipc/libraries/drv/7102C/gh/SConscript @@ -9,7 +9,7 @@ libinspath = libcwd + '/libraries/lib' CPPDEFINES = ['-DDEBUG'] -group = DefineGroup('gh', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES, LIBINSPATH = libinspath) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES, LIBINSPATH = libinspath) list = os.listdir(cwd) for d in list: diff --git a/bsp/gkipc/libraries/drv/7102C/gh/src/SConscript b/bsp/gkipc/libraries/drv/7102C/gh/src/SConscript index 47f86eb9c6..d680a24896 100644 --- a/bsp/gkipc/libraries/drv/7102C/gh/src/SConscript +++ b/bsp/gkipc/libraries/drv/7102C/gh/src/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') path = [cwd + '/../inc'] -group = DefineGroup('gh', src, depend = [''], CPPPATH = path) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/gkipc/libraries/drv/710X/gd/SConscript b/bsp/gkipc/libraries/drv/710X/gd/SConscript index 70fd17741b..35c70dc595 100644 --- a/bsp/gkipc/libraries/drv/710X/gd/SConscript +++ b/bsp/gkipc/libraries/drv/710X/gd/SConscript @@ -7,7 +7,7 @@ path = [cwd + '/inc'] libcwd = str(Dir('#')) libinspath = libcwd + '/libraries/lib' -group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) list = os.listdir(cwd) for d in list: diff --git a/bsp/gkipc/libraries/drv/710X/gd/src/SConscript b/bsp/gkipc/libraries/drv/710X/gd/src/SConscript index 887201dc04..122ae14245 100644 --- a/bsp/gkipc/libraries/drv/710X/gd/src/SConscript +++ b/bsp/gkipc/libraries/drv/710X/gd/src/SConscript @@ -40,6 +40,6 @@ src += ['wdog/gd_wdog.c'] path = [cwd, cwd + '/../inc', cwd + '/..'] -group = DefineGroup('gd', src, depend = [''], CPPPATH = path) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) Return('group') \ No newline at end of file diff --git a/bsp/gkipc/libraries/drv/710X/gh/SConscript b/bsp/gkipc/libraries/drv/710X/gh/SConscript index e05ccbc4d0..35c70dc595 100644 --- a/bsp/gkipc/libraries/drv/710X/gh/SConscript +++ b/bsp/gkipc/libraries/drv/710X/gh/SConscript @@ -7,7 +7,7 @@ path = [cwd + '/inc'] libcwd = str(Dir('#')) libinspath = libcwd + '/libraries/lib' -group = DefineGroup('gh', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) list = os.listdir(cwd) for d in list: diff --git a/bsp/gkipc/libraries/drv/710X/gh/src/SConscript b/bsp/gkipc/libraries/drv/710X/gh/src/SConscript index 745ab34c86..5b01077a5c 100644 --- a/bsp/gkipc/libraries/drv/710X/gh/src/SConscript +++ b/bsp/gkipc/libraries/drv/710X/gh/src/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') path = [cwd + '/..', cwd + '/../inc', cwd + '/../../inc'] -group = DefineGroup('gh', src, depend = [''], CPPPATH = path) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/gkipc/libraries/drv/710XS/gd/SConscript b/bsp/gkipc/libraries/drv/710XS/gd/SConscript index 70fd17741b..35c70dc595 100644 --- a/bsp/gkipc/libraries/drv/710XS/gd/SConscript +++ b/bsp/gkipc/libraries/drv/710XS/gd/SConscript @@ -7,7 +7,7 @@ path = [cwd + '/inc'] libcwd = str(Dir('#')) libinspath = libcwd + '/libraries/lib' -group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) list = os.listdir(cwd) for d in list: diff --git a/bsp/gkipc/libraries/drv/710XS/gd/src/SConscript b/bsp/gkipc/libraries/drv/710XS/gd/src/SConscript index ac7155aa86..2d377de096 100644 --- a/bsp/gkipc/libraries/drv/710XS/gd/src/SConscript +++ b/bsp/gkipc/libraries/drv/710XS/gd/src/SConscript @@ -40,6 +40,6 @@ src += ['wdog/gd_wdog.c'] path = [cwd, cwd + '/../inc', cwd + '/..'] -group = DefineGroup('gd', src, depend = [''], CPPPATH = path) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) Return('group') \ No newline at end of file diff --git a/bsp/gkipc/libraries/drv/710XS/gh/SConscript b/bsp/gkipc/libraries/drv/710XS/gh/SConscript index e05ccbc4d0..35c70dc595 100644 --- a/bsp/gkipc/libraries/drv/710XS/gh/SConscript +++ b/bsp/gkipc/libraries/drv/710XS/gh/SConscript @@ -7,7 +7,7 @@ path = [cwd + '/inc'] libcwd = str(Dir('#')) libinspath = libcwd + '/libraries/lib' -group = DefineGroup('gh', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) list = os.listdir(cwd) for d in list: diff --git a/bsp/gkipc/libraries/drv/710XS/gh/src/SConscript b/bsp/gkipc/libraries/drv/710XS/gh/src/SConscript index 745ab34c86..5b01077a5c 100644 --- a/bsp/gkipc/libraries/drv/710XS/gh/src/SConscript +++ b/bsp/gkipc/libraries/drv/710XS/gh/src/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') path = [cwd + '/..', cwd + '/../inc', cwd + '/../../inc'] -group = DefineGroup('gh', src, depend = [''], CPPPATH = path) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/gkipc/libraries/drv/gnu_c/SConscript b/bsp/gkipc/libraries/drv/gnu_c/SConscript index 3f500d3d4c..28ed3cc028 100644 --- a/bsp/gkipc/libraries/drv/gnu_c/SConscript +++ b/bsp/gkipc/libraries/drv/gnu_c/SConscript @@ -8,6 +8,6 @@ path = [cwd] libcwd = str(Dir('#')) libinspath = libcwd + '/libraries/lib' -group = DefineGroup('gnu_c', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath) Return('group') diff --git a/bsp/gkipc/platform/SConscript b/bsp/gkipc/platform/SConscript index ff0e7d4169..2f71b73c25 100644 --- a/bsp/gkipc/platform/SConscript +++ b/bsp/gkipc/platform/SConscript @@ -18,6 +18,6 @@ elif GetDepend('BOARD_GK7102S_HZD_JXH42'): elif GetDepend('BOARD_GK7102C_JH'): CPPDEFINES += ['-DGK7102C_JH'] -group = DefineGroup('platform', src, depend = [''], CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/imx6sx/cortex-a9/cpu/SConscript b/bsp/imx6sx/cortex-a9/cpu/SConscript index 61057c04cc..b45f95cc1a 100644 --- a/bsp/imx6sx/cortex-a9/cpu/SConscript +++ b/bsp/imx6sx/cortex-a9/cpu/SConscript @@ -12,6 +12,6 @@ elif rtconfig.PLATFORM == 'gcc': elif rtconfig.PLATFORM == 'armcc': src += Glob('*_rvds.S') -group = DefineGroup('AM335x', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/k210/driver/camera/SConscript b/bsp/k210/driver/camera/SConscript index cc83372570..1a80075428 100644 --- a/bsp/k210/driver/camera/SConscript +++ b/bsp/k210/driver/camera/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('camera', src, depend = ['BSP_USING_CAMERA'], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = ['BSP_USING_CAMERA'], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/nrf51822/Libraries/SConscript b/bsp/nrf51822/Libraries/SConscript index 688d7e4ddc..1fd979844b 100644 --- a/bsp/nrf51822/Libraries/SConscript +++ b/bsp/nrf51822/Libraries/SConscript @@ -22,6 +22,6 @@ path = [cwd + '/CMSIS/Include', cwd + '/nrf51822/Include'] CPPDEFINES = ['USE_STDPERIPH_DRIVER', 'NRF51'] -group = DefineGroup('Startup Code', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/nrf52832/board/Sconscript b/bsp/nrf52832/board/Sconscript index aa1e87d860..eb2a45b9ca 100644 --- a/bsp/nrf52832/board/Sconscript +++ b/bsp/nrf52832/board/Sconscript @@ -9,6 +9,6 @@ CPPPATH = [cwd] #remove other no use files #SrcRemove(src, '*.c') -group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') \ No newline at end of file diff --git a/bsp/nrf52832/startups/Sconscript b/bsp/nrf52832/startups/Sconscript index 91c4983ebe..f28b14aae1 100644 --- a/bsp/nrf52832/startups/Sconscript +++ b/bsp/nrf52832/startups/Sconscript @@ -11,6 +11,6 @@ CPPPATH = [cwd] #remove other no use files #SrcRemove(src, '*.c') -group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') \ No newline at end of file diff --git a/bsp/nuvoton/libraries/m480/Device/SConscript b/bsp/nuvoton/libraries/m480/Device/SConscript index 26e69fb824..f86894377b 100644 --- a/bsp/nuvoton/libraries/m480/Device/SConscript +++ b/bsp/nuvoton/libraries/m480/Device/SConscript @@ -20,6 +20,6 @@ elif rtconfig.CROSS_TOOL == 'iar': path = [cwd + '/Nuvoton/M480/Include',] -group = DefineGroup('m480_device', src, depend = [''], CPPPATH = path) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/nuvoton/libraries/m480/StdDriver/SConscript b/bsp/nuvoton/libraries/m480/StdDriver/SConscript index 6a932cff58..57025d2246 100644 --- a/bsp/nuvoton/libraries/m480/StdDriver/SConscript +++ b/bsp/nuvoton/libraries/m480/StdDriver/SConscript @@ -20,9 +20,9 @@ if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): libs += ['libstddriver_iar'] if not libs: - group = DefineGroup('m480_stddriver', src, depend = [''], CPPPATH = cpppath) + group = DefineGroup('Libraries', src, depend = [''], CPPPATH = cpppath) else: src = [] - group = DefineGroup('m480_stddriver', src, depend = [''], CPPPATH = cpppath, LIBS = libs, LIBPATH = libpath) + group = DefineGroup('Libraries', src, depend = [''], CPPPATH = cpppath, LIBS = libs, LIBPATH = libpath) Return('group') diff --git a/bsp/nuvoton/libraries/m480/rtt_port/SConscript b/bsp/nuvoton/libraries/m480/rtt_port/SConscript index a155044a30..77bd290714 100644 --- a/bsp/nuvoton/libraries/m480/rtt_port/SConscript +++ b/bsp/nuvoton/libraries/m480/rtt_port/SConscript @@ -30,6 +30,6 @@ elif GetDepend('BOARD_USING_HSOTG') and ( GetDepend('BSP_USING_USBD') or GetDepe print '[Hint] You already select BOARD_USING_HSOTG. Please de-select BSP_USING_USBD and BSP_USING_USBH options.' sys.exit(1) else: - group = DefineGroup('m480_rttport', src, depend = [''], CPPPATH = CPPPATH) + group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/nuvoton/numaker-iot-m487/board/SConscript b/bsp/nuvoton/numaker-iot-m487/board/SConscript index 6ed8f178ba..1cea397523 100644 --- a/bsp/nuvoton/numaker-iot-m487/board/SConscript +++ b/bsp/nuvoton/numaker-iot-m487/board/SConscript @@ -15,6 +15,6 @@ NuPinConfig/nutool_pincfg.c src += Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd, cwd + '/NuClockConfig', cwd + '/NuPinConfig'] -group = DefineGroup('board', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/nuvoton/numaker-pfm-m487/board/SConscript b/bsp/nuvoton/numaker-pfm-m487/board/SConscript index 6ed8f178ba..1cea397523 100644 --- a/bsp/nuvoton/numaker-pfm-m487/board/SConscript +++ b/bsp/nuvoton/numaker-pfm-m487/board/SConscript @@ -15,6 +15,6 @@ NuPinConfig/nutool_pincfg.c src += Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd, cwd + '/NuClockConfig', cwd + '/NuPinConfig'] -group = DefineGroup('board', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/qemu-vexpress-a9/drivers/audio/SConscript b/bsp/qemu-vexpress-a9/drivers/audio/SConscript index 2118631608..9fc2acc604 100644 --- a/bsp/qemu-vexpress-a9/drivers/audio/SConscript +++ b/bsp/qemu-vexpress-a9/drivers/audio/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.S') CPPPATH = [cwd] -group = DefineGroup('drv_audio', src, depend = ['BSP_DRV_AUDIO'], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = ['BSP_DRV_AUDIO'], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/qemu-vexpress-gemini/cpu/SConscript b/bsp/qemu-vexpress-gemini/cpu/SConscript index 61057c04cc..b45f95cc1a 100644 --- a/bsp/qemu-vexpress-gemini/cpu/SConscript +++ b/bsp/qemu-vexpress-gemini/cpu/SConscript @@ -12,6 +12,6 @@ elif rtconfig.PLATFORM == 'gcc': elif rtconfig.PLATFORM == 'armcc': src += Glob('*_rvds.S') -group = DefineGroup('AM335x', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/raspberry-pi/raspi2/cpu/SConscript b/bsp/raspberry-pi/raspi2/cpu/SConscript index 2a8b3869a4..fbfee70b01 100644 --- a/bsp/raspberry-pi/raspi2/cpu/SConscript +++ b/bsp/raspberry-pi/raspi2/cpu/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/raspberry-pi/raspi3-32/cpu/SConscript b/bsp/raspberry-pi/raspi3-32/cpu/SConscript index 2a8b3869a4..fbfee70b01 100644 --- a/bsp/raspberry-pi/raspi3-32/cpu/SConscript +++ b/bsp/raspberry-pi/raspi3-32/cpu/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/samd21/board/SConscript b/bsp/samd21/board/SConscript index ea79ebb925..5001f5d8bb 100644 --- a/bsp/samd21/board/SConscript +++ b/bsp/samd21/board/SConscript @@ -15,6 +15,6 @@ if rtconfig.DEVICE_SERIES == 'SAMD20': elif rtconfig.DEVICE_SERIES == 'SAMD21': path += [cwd + '/../asflib_config', cwd + '/../asflib_config/clock_samd21_r21_da_ha1'] -group = DefineGroup('Board', src, depend = [''], CPPPATH = path) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/components/dfs/SConscript b/components/dfs/SConscript index edfd4e42b5..3ccaeb1080 100644 --- a/components/dfs/SConscript +++ b/components/dfs/SConscript @@ -13,7 +13,7 @@ CPPPATH = [cwd + "/include"] if GetDepend('RT_USING_POSIX'): src += ['src/poll.c', 'src/select.c'] -group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH) +group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH) if GetDepend('RT_USING_DFS'): # search in the file system implementation diff --git a/components/dfs/filesystems/devfs/SConscript b/components/dfs/filesystems/devfs/SConscript index a2c0d843f0..898b04a234 100644 --- a/components/dfs/filesystems/devfs/SConscript +++ b/components/dfs/filesystems/devfs/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_DEVFS'], CPPPATH = CPPPATH) +group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_DEVFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/elmfat/SConscript b/components/dfs/filesystems/elmfat/SConscript index 173c0a9d65..8b7ec02d43 100644 --- a/components/dfs/filesystems/elmfat/SConscript +++ b/components/dfs/filesystems/elmfat/SConscript @@ -21,6 +21,6 @@ if GetDepend('RT_DFS_ELM_USE_LFN'): else: src += ['option/ccsbcs.c'] -group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ELMFAT'], CPPPATH = CPPPATH) +group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ELMFAT'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/jffs2/SConscript b/components/dfs/filesystems/jffs2/SConscript index 85d3a4d8d2..47854393e3 100644 --- a/components/dfs/filesystems/jffs2/SConscript +++ b/components/dfs/filesystems/jffs2/SConscript @@ -45,6 +45,6 @@ src/write.c CPPPATH = [cwd, cwd + '/include', cwd + '/src', cwd + '/cyg', cwd + '/kernel', cwd + '/cyg/compress'] -group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_JFFS2'], CPPPATH = CPPPATH) +group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_JFFS2'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/nfs/SConscript b/components/dfs/filesystems/nfs/SConscript index b340d36de2..f830dfc754 100644 --- a/components/dfs/filesystems/nfs/SConscript +++ b/components/dfs/filesystems/nfs/SConscript @@ -8,6 +8,6 @@ CPPPATH = [cwd] SrcRemove(src, ['rpc/auth_none.c']) -group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NFS'], CPPPATH = CPPPATH) +group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/ramfs/SConscript b/components/dfs/filesystems/ramfs/SConscript index 12977adf53..1304f59629 100644 --- a/components/dfs/filesystems/ramfs/SConscript +++ b/components/dfs/filesystems/ramfs/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_MEMHEAP', 'RT_USING_DFS_RAMFS'], CPPPATH = CPPPATH) +group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_MEMHEAP', 'RT_USING_DFS_RAMFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/romfs/SConscript b/components/dfs/filesystems/romfs/SConscript index d31941eb8a..bfd633ce91 100644 --- a/components/dfs/filesystems/romfs/SConscript +++ b/components/dfs/filesystems/romfs/SConscript @@ -10,6 +10,6 @@ if GetDepend('DFS_ROMFS_ROOT'): # A new ROMFS root has been defined, we should remove the romfs.c SrcRemove(src, ['romfs.c']) -group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH) +group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/uffs/SConscript b/components/dfs/filesystems/uffs/SConscript index 1ccd4a6869..53f7713fc2 100644 --- a/components/dfs/filesystems/uffs/SConscript +++ b/components/dfs/filesystems/uffs/SConscript @@ -33,6 +33,6 @@ src = src + uffs CPPPATH = [cwd, cwd + '/src/inc'] -group = DefineGroup('FileSystem', src , depend = ['RT_USING_DFS', 'RT_USING_DFS_UFFS'], CPPPATH = CPPPATH) +group = DefineGroup('Filesystem', src , depend = ['RT_USING_DFS', 'RT_USING_DFS_UFFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/drivers/sensors/SConscript b/components/drivers/sensors/SConscript index 51c4b50eef..b56ae5ce6e 100644 --- a/components/drivers/sensors/SConscript +++ b/components/drivers/sensors/SConscript @@ -7,7 +7,7 @@ src = ['sensor.c'] CPPPATH = [cwd, cwd + '/../include'] if GetDepend('RT_USING_SENSOR_CMD'): - src += ['sensor_cmd.c']; + src += ['sensor_cmd.c'] group = DefineGroup('Sensors', src, depend = ['RT_USING_SENSOR', 'RT_USING_DEVICE'], CPPPATH = CPPPATH) diff --git a/components/drivers/touch/SConscript b/components/drivers/touch/SConscript index f370b2aba6..6c2a126c9c 100644 --- a/components/drivers/touch/SConscript +++ b/components/drivers/touch/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = ['touch.c'] CPPPATH = [cwd, cwd + '/../include'] -group = DefineGroup('Touch', src, depend = ['RT_USING_TOUCH', 'RT_USING_DEVICE'], CPPPATH = CPPPATH) +group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_TOUCH', 'RT_USING_DEVICE'], CPPPATH = CPPPATH) Return('group') diff --git a/components/finsh/SConscript b/components/finsh/SConscript index 706165a47e..be04c56616 100644 --- a/components/finsh/SConscript +++ b/components/finsh/SConscript @@ -34,6 +34,6 @@ if not GetDepend('FINSH_USING_MSH_ONLY'): CPPPATH = [cwd] -group = DefineGroup('FinSH', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) +group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/aio/SConscript b/components/libc/aio/SConscript index 175767100a..f10462e9c4 100644 --- a/components/libc/aio/SConscript +++ b/components/libc/aio/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('aio', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH) +group = DefineGroup('libc', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript index 5f8f65a563..52f7a6d93a 100644 --- a/components/libc/compilers/armlibc/SConscript +++ b/components/libc/compilers/armlibc/SConscript @@ -15,7 +15,7 @@ if GetDepend('RT_USING_MODULE') == False: SrcRemove(src, ['libc_syms.c']) if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': - group = DefineGroup('LIBC', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index f661a1ee0d..2407301405 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -17,6 +17,6 @@ if GetDepend('RT_USING_POSIX') == False: SrcRemove(src, ['unistd.c']) if not GetDepend('RT_USING_MINILIBC') and (GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME')): - group = DefineGroup('LIBC', src, depend = [''], CPPPATH = CPPPATH) + group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript index 456b762496..75a5812fab 100644 --- a/components/libc/compilers/dlib/SConscript +++ b/components/libc/compilers/dlib/SConscript @@ -20,7 +20,7 @@ if rtconfig.PLATFORM == 'iar': if LooseVersion(IARVersion()) < LooseVersion("8.20.1"): CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT'] - group = DefineGroup('dlib', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/minilibc/SConscript b/components/libc/compilers/minilibc/SConscript index cdaf9ec32b..dec657028f 100644 --- a/components/libc/compilers/minilibc/SConscript +++ b/components/libc/compilers/minilibc/SConscript @@ -9,7 +9,7 @@ CPPPATH = [cwd] CPPDEFINES = ['RT_USING_MINILIBC'] if rtconfig.PLATFORM == 'gcc' and rtconfig.ARCH != 'sim' and not GetDepend('RT_USING_LIBC') and GetDepend('RT_USING_MINILIBC'): - group = DefineGroup('LIBC', src, depend = [''], + group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript index 11de59bec4..d0868bbdea 100644 --- a/components/libc/compilers/newlib/SConscript +++ b/components/libc/compilers/newlib/SConscript @@ -15,7 +15,7 @@ CPPDEFINES = ['RT_USING_NEWLIB'] LIBS = ['c', 'm'] if rtconfig.PLATFORM == 'gcc': - group = DefineGroup('NewLIB', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS) Return('group') diff --git a/components/libc/getline/SConscript b/components/libc/getline/SConscript index 6c9a2a164c..fa4c8618c1 100644 --- a/components/libc/getline/SConscript +++ b/components/libc/getline/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('LIBC', src, +group = DefineGroup('libc', src, depend = ['RT_USING_LIBC', 'RT_USING_POSIX','RT_USING_POSIX_GETLINE'], CPPPATH = CPPPATH) diff --git a/components/libc/libdl/SConscript b/components/libc/libdl/SConscript index 28265521f6..93636e4b7a 100644 --- a/components/libc/libdl/SConscript +++ b/components/libc/libdl/SConscript @@ -7,7 +7,7 @@ group = [] CPPPATH = [cwd] if rtconfig.PLATFORM == 'gcc': - group = DefineGroup('LIBC', src, + group = DefineGroup('libc', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH) diff --git a/components/libc/mmap/SConscript b/components/libc/mmap/SConscript index 53036ad436..1a36a15710 100644 --- a/components/libc/mmap/SConscript +++ b/components/libc/mmap/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('LIBC', src, +group = DefineGroup('libc', src, depend = ['RT_USING_DFS', 'RT_USING_POSIX_MMAP'], CPPPATH = CPPPATH) diff --git a/components/libc/pthreads/SConscript b/components/libc/pthreads/SConscript index dff99aa01d..767b406d4c 100644 --- a/components/libc/pthreads/SConscript +++ b/components/libc/pthreads/SConscript @@ -16,7 +16,7 @@ try: except : pass -group = DefineGroup('Pthreads', src, +group = DefineGroup('libc', src, depend = ['RT_USING_PTHREADS', 'RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/signal/SConscript b/components/libc/signal/SConscript index f32a1221ea..f07ff58f6e 100644 --- a/components/libc/signal/SConscript +++ b/components/libc/signal/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('LIBC', src, +group = DefineGroup('libc', src, depend = ['RT_USING_SIGNALS', 'RT_USING_PTHREADS', 'RT_USING_LIBC'], CPPPATH = CPPPATH) diff --git a/components/libc/termios/SConscript b/components/libc/termios/SConscript index 4bd0a42eb8..381eb5ad8b 100644 --- a/components/libc/termios/SConscript +++ b/components/libc/termios/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('LIBC', src, +group = DefineGroup('libc', src, depend = ['RT_USING_LIBC', 'RT_USING_POSIX', 'RT_USING_POSIX_TERMIOS'], CPPPATH = CPPPATH) diff --git a/components/libc/time/SConscript b/components/libc/time/SConscript index 67d1824b9f..f7e6f7e8e9 100644 --- a/components/libc/time/SConscript +++ b/components/libc/time/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Pthreads', src, +group = DefineGroup('libc', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/net/lwip-1.4.1/SConscript b/components/net/lwip-1.4.1/SConscript index 8e3a4cb9d4..848e2d8255 100644 --- a/components/net/lwip-1.4.1/SConscript +++ b/components/net/lwip-1.4.1/SConscript @@ -82,6 +82,6 @@ if GetDepend(['RT_LWIP_PPP']): if GetDepend(['RT_LWIP_USING_PING']): src += Glob('src/apps/ping/ping.c') -group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP141'], CPPPATH = path) +group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP141'], CPPPATH = path) Return('group') diff --git a/components/net/lwip-2.0.2/SConscript b/components/net/lwip-2.0.2/SConscript index 910ce63539..df04b42324 100644 --- a/components/net/lwip-2.0.2/SConscript +++ b/components/net/lwip-2.0.2/SConscript @@ -84,6 +84,6 @@ if GetDepend(['RT_USING_LWIP_IPV6']): if GetDepend(['RT_LWIP_USING_PING']): src += Glob('src/apps/ping/ping.c') -group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP202'], CPPPATH = path) +group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP202'], CPPPATH = path) Return('group') diff --git a/components/net/lwip-2.1.2/SConscript b/components/net/lwip-2.1.2/SConscript index 20afc37534..04f59167d5 100644 --- a/components/net/lwip-2.1.2/SConscript +++ b/components/net/lwip-2.1.2/SConscript @@ -260,6 +260,6 @@ if GetDepend(['RT_USING_LWIP_IPV6']): if GetDepend(['RT_LWIP_USING_PING']): src += lwipping_SRCS -group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP212'], CPPPATH = path) +group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP212'], CPPPATH = path) Return('group') diff --git a/components/net/lwip_dhcpd/SConscript b/components/net/lwip_dhcpd/SConscript index d4ef6da41c..16c673036a 100644 --- a/components/net/lwip_dhcpd/SConscript +++ b/components/net/lwip_dhcpd/SConscript @@ -9,6 +9,6 @@ else: CPPPATH = [cwd] -group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_DHCPD'], CPPPATH = CPPPATH) +group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_DHCPD'], CPPPATH = CPPPATH) Return('group') diff --git a/components/net/lwip_nat/SConscript b/components/net/lwip_nat/SConscript index ce684f677a..d8b95b1ce3 100644 --- a/components/net/lwip_nat/SConscript +++ b/components/net/lwip_nat/SConscript @@ -5,6 +5,6 @@ src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_NAT'], CPPPATH = CPPPATH) +group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_NAT'], CPPPATH = CPPPATH) Return('group') diff --git a/components/net/netdev/SConscript b/components/net/netdev/SConscript index 0db486b2de..ec1d2b2905 100644 --- a/components/net/netdev/SConscript +++ b/components/net/netdev/SConscript @@ -8,6 +8,6 @@ src = Glob('src/*.c') CPPPATH = [cwd + '/include'] -group = DefineGroup('NetDev', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH) +group = DefineGroup('SAL', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH) Return('group') diff --git a/components/utilities/utest/SConscript b/components/utilities/utest/SConscript index ea7efcfbc9..5d408ccbd0 100644 --- a/components/utilities/utest/SConscript +++ b/components/utilities/utest/SConscript @@ -3,6 +3,6 @@ from building import * cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('Utest', src, depend = ['RT_USING_UTEST'], CPPPATH = CPPPATH) +group = DefineGroup('UTest', src, depend = ['RT_USING_UTEST'], CPPPATH = CPPPATH) Return('group') diff --git a/examples/libc/SConscript b/examples/libc/SConscript index 547dd215b1..01a74356e7 100644 --- a/examples/libc/SConscript +++ b/examples/libc/SConscript @@ -1,6 +1,6 @@ from building import * src = Glob('*.c') -group = DefineGroup('LIBCTest', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS']) +group = DefineGroup('UTest', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS']) Return('group') diff --git a/libcpu/aarch64/common/SConscript b/libcpu/aarch64/common/SConscript index 59378636fa..c51148525b 100644 --- a/libcpu/aarch64/common/SConscript +++ b/libcpu/aarch64/common/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*.S') CPPPATH = [cwd] -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) # build for sub-directory list = os.listdir(cwd) diff --git a/libcpu/aarch64/cortex-a53/SConscript b/libcpu/aarch64/cortex-a53/SConscript index 5f509fbf5b..0b74223c6f 100644 --- a/libcpu/aarch64/cortex-a53/SConscript +++ b/libcpu/aarch64/cortex-a53/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*.S') CPPPATH = [cwd] -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/aarch64/cortex-a72/SConscript b/libcpu/aarch64/cortex-a72/SConscript index 5f509fbf5b..0b74223c6f 100644 --- a/libcpu/aarch64/cortex-a72/SConscript +++ b/libcpu/aarch64/cortex-a72/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*.S') CPPPATH = [cwd] -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arc/common/SConscript b/libcpu/arc/common/SConscript index 19604861f2..80c21d87eb 100644 --- a/libcpu/arc/common/SConscript +++ b/libcpu/arc/common/SConscript @@ -5,6 +5,6 @@ src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('LIBARCH', src, depend = [], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arc/em/SConscript b/libcpu/arc/em/SConscript index 215749bea4..a52aa9b1e4 100644 --- a/libcpu/arc/em/SConscript +++ b/libcpu/arc/em/SConscript @@ -10,6 +10,6 @@ CPPPATH = [cwd] src += Glob('*.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/AT91SAM7S/SConscript b/libcpu/arm/AT91SAM7S/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/AT91SAM7S/SConscript +++ b/libcpu/arm/AT91SAM7S/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/AT91SAM7X/SConscript b/libcpu/arm/AT91SAM7X/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/AT91SAM7X/SConscript +++ b/libcpu/arm/AT91SAM7X/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/am335x/SConscript b/libcpu/arm/am335x/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/am335x/SConscript +++ b/libcpu/arm/am335x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/arm926/SConscript b/libcpu/arm/arm926/SConscript index 9bd0ddaf0a..2275af97d9 100644 --- a/libcpu/arm/arm926/SConscript +++ b/libcpu/arm/arm926/SConscript @@ -20,6 +20,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/arm/armv6/SConscript b/libcpu/arm/armv6/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/armv6/SConscript +++ b/libcpu/arm/armv6/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/common/SConscript b/libcpu/arm/common/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/common/SConscript +++ b/libcpu/arm/common/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-a/SConscript b/libcpu/arm/cortex-a/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/cortex-a/SConscript +++ b/libcpu/arm/cortex-a/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m0/SConscript b/libcpu/arm/cortex-m0/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/cortex-m0/SConscript +++ b/libcpu/arm/cortex-m0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m23/SConscript b/libcpu/arm/cortex-m23/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/cortex-m23/SConscript +++ b/libcpu/arm/cortex-m23/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m3/SConscript b/libcpu/arm/cortex-m3/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/cortex-m3/SConscript +++ b/libcpu/arm/cortex-m3/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m33/SConscript b/libcpu/arm/cortex-m33/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/cortex-m33/SConscript +++ b/libcpu/arm/cortex-m33/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m4/SConscript b/libcpu/arm/cortex-m4/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/cortex-m4/SConscript +++ b/libcpu/arm/cortex-m4/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m7/SConscript b/libcpu/arm/cortex-m7/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/cortex-m7/SConscript +++ b/libcpu/arm/cortex-m7/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-r4/SConscript b/libcpu/arm/cortex-r4/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/cortex-r4/SConscript +++ b/libcpu/arm/cortex-r4/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/dm36x/SConscript b/libcpu/arm/dm36x/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/dm36x/SConscript +++ b/libcpu/arm/dm36x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/lpc214x/SConscript b/libcpu/arm/lpc214x/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/lpc214x/SConscript +++ b/libcpu/arm/lpc214x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/lpc24xx/SConscript b/libcpu/arm/lpc24xx/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/lpc24xx/SConscript +++ b/libcpu/arm/lpc24xx/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/realview-a8-vmm/SConscript b/libcpu/arm/realview-a8-vmm/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/realview-a8-vmm/SConscript +++ b/libcpu/arm/realview-a8-vmm/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/s3c24x0/SConscript b/libcpu/arm/s3c24x0/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/s3c24x0/SConscript +++ b/libcpu/arm/s3c24x0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/s3c44b0/SConscript b/libcpu/arm/s3c44b0/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/s3c44b0/SConscript +++ b/libcpu/arm/s3c44b0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/sep4020/SConscript b/libcpu/arm/sep4020/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/sep4020/SConscript +++ b/libcpu/arm/sep4020/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/zynq7000/SConscript b/libcpu/arm/zynq7000/SConscript index 990f753abd..28af7ba651 100644 --- a/libcpu/arm/zynq7000/SConscript +++ b/libcpu/arm/zynq7000/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/avr32/uc3/SConscript b/libcpu/avr32/uc3/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/avr32/uc3/SConscript +++ b/libcpu/avr32/uc3/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/blackfin/bf53x/SConscript b/libcpu/blackfin/bf53x/SConscript index 5908a24142..85882caf6f 100644 --- a/libcpu/blackfin/bf53x/SConscript +++ b/libcpu/blackfin/bf53x/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_vdsp.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/c-sky/ck802/SConscript b/libcpu/c-sky/ck802/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/c-sky/ck802/SConscript +++ b/libcpu/c-sky/ck802/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/c-sky/common/SConscript b/libcpu/c-sky/common/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/c-sky/common/SConscript +++ b/libcpu/c-sky/common/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/ia32/SConscript b/libcpu/ia32/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/ia32/SConscript +++ b/libcpu/ia32/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/m16c/m16c62p/SConscript b/libcpu/m16c/m16c62p/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/m16c/m16c62p/SConscript +++ b/libcpu/m16c/m16c62p/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/mips/common/SConscript b/libcpu/mips/common/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/mips/common/SConscript +++ b/libcpu/mips/common/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/mips/gs232/SConscript b/libcpu/mips/gs232/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/mips/gs232/SConscript +++ b/libcpu/mips/gs232/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/mips/gs264/SConscript b/libcpu/mips/gs264/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/mips/gs264/SConscript +++ b/libcpu/mips/gs264/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/mips/pic32/SConscript b/libcpu/mips/pic32/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/mips/pic32/SConscript +++ b/libcpu/mips/pic32/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/nios/nios_ii/SConscript b/libcpu/nios/nios_ii/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/nios/nios_ii/SConscript +++ b/libcpu/nios/nios_ii/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/ppc/common/SConscript b/libcpu/ppc/common/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/ppc/common/SConscript +++ b/libcpu/ppc/common/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/ppc/ppc405/SConscript b/libcpu/ppc/ppc405/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/ppc/ppc405/SConscript +++ b/libcpu/ppc/ppc405/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/bumblebee/SConscript b/libcpu/risc-v/bumblebee/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/risc-v/bumblebee/SConscript +++ b/libcpu/risc-v/bumblebee/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/common/SConscript b/libcpu/risc-v/common/SConscript index 08a1215daf..92133bfb47 100644 --- a/libcpu/risc-v/common/SConscript +++ b/libcpu/risc-v/common/SConscript @@ -7,6 +7,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/e310/SConscript b/libcpu/risc-v/e310/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/risc-v/e310/SConscript +++ b/libcpu/risc-v/e310/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/k210/SConscript b/libcpu/risc-v/k210/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/risc-v/k210/SConscript +++ b/libcpu/risc-v/k210/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/nuclei/SConscript b/libcpu/risc-v/nuclei/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/risc-v/nuclei/SConscript +++ b/libcpu/risc-v/nuclei/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/rv32m1/SConscript b/libcpu/risc-v/rv32m1/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/risc-v/rv32m1/SConscript +++ b/libcpu/risc-v/rv32m1/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/t-head/e906/SConscript b/libcpu/risc-v/t-head/e906/SConscript index 08a1215daf..92133bfb47 100644 --- a/libcpu/risc-v/t-head/e906/SConscript +++ b/libcpu/risc-v/t-head/e906/SConscript @@ -7,6 +7,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/rx/SConscript b/libcpu/rx/SConscript index 57ad8ba965..b7cb2f445a 100644 --- a/libcpu/rx/SConscript +++ b/libcpu/rx/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_iar.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/sim/posix/SConscript b/libcpu/sim/posix/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/sim/posix/SConscript +++ b/libcpu/sim/posix/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/sim/win32/SConscript b/libcpu/sim/win32/SConscript index 4488a0dbb5..530b5d1d78 100644 --- a/libcpu/sim/win32/SConscript +++ b/libcpu/sim/win32/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/sparc-v8/bm3803/SConscript b/libcpu/sparc-v8/bm3803/SConscript index 62648f9eeb..03ce583dc1 100644 --- a/libcpu/sparc-v8/bm3803/SConscript +++ b/libcpu/sparc-v8/bm3803/SConscript @@ -12,6 +12,6 @@ if rtconfig.PLATFORM == 'gcc': src += Glob('*_init.S') src += Glob('*_gcc.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/sparc-v8/common/SConscript b/libcpu/sparc-v8/common/SConscript index 62648f9eeb..03ce583dc1 100644 --- a/libcpu/sparc-v8/common/SConscript +++ b/libcpu/sparc-v8/common/SConscript @@ -12,6 +12,6 @@ if rtconfig.PLATFORM == 'gcc': src += Glob('*_init.S') src += Glob('*_gcc.S') -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/ti-dsp/c28x/SConscript b/libcpu/ti-dsp/c28x/SConscript index 2265bf3bee..760a715267 100644 --- a/libcpu/ti-dsp/c28x/SConscript +++ b/libcpu/ti-dsp/c28x/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*.s') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/unicore32/sep6200/SConscript b/libcpu/unicore32/sep6200/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/unicore32/sep6200/SConscript +++ b/libcpu/unicore32/sep6200/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/v850/70f34/SConscript b/libcpu/v850/70f34/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/v850/70f34/SConscript +++ b/libcpu/v850/70f34/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/xilinx/microblaze/SConscript b/libcpu/xilinx/microblaze/SConscript index da76d51366..20f325b692 100644 --- a/libcpu/xilinx/microblaze/SConscript +++ b/libcpu/xilinx/microblaze/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') -- cgit v1.3.1 From 291fe36139788cf31bd5c6cdb2ac3919dfa0b0cb Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Fri, 12 Feb 2021 01:30:41 +0800 Subject: [pthread][libc] move 'clock_time' to libc --- components/libc/compilers/common/sys/time.h | 33 +++++ components/libc/compilers/common/time.c | 163 +++++++++++++++++++++++- components/libc/pthreads/posix_sleep.c | 30 +++++ components/libc/pthreads/pthread.c | 33 +++++ components/libc/time/SConscript | 12 -- components/libc/time/clock_time.c | 188 ---------------------------- components/libc/time/clock_time.h | 52 -------- components/libc/time/posix_sleep.c | 30 ----- 8 files changed, 258 insertions(+), 283 deletions(-) create mode 100644 components/libc/pthreads/posix_sleep.c delete mode 100644 components/libc/time/SConscript delete mode 100644 components/libc/time/clock_time.c delete mode 100644 components/libc/time/clock_time.h delete mode 100644 components/libc/time/posix_sleep.c (limited to 'components/libc/time/SConscript') diff --git a/components/libc/compilers/common/sys/time.h b/components/libc/compilers/common/sys/time.h index 599b8b5262..34ca9427b9 100644 --- a/components/libc/compilers/common/sys/time.h +++ b/components/libc/compilers/common/sys/time.h @@ -10,6 +10,7 @@ #ifndef _SYS_TIME_H_ #define _SYS_TIME_H_ +#include #include #ifdef __cplusplus @@ -53,6 +54,38 @@ time_t timegm(struct tm * const t); int gettimeofday(struct timeval *tv, struct timezone *tz); int settimeofday(const struct timeval *tv, const struct timezone *tz); +#ifdef RT_USING_PTHREADS +/* posix clock and timer */ +#define MILLISECOND_PER_SECOND 1000UL +#define MICROSECOND_PER_SECOND 1000000UL +#define NANOSECOND_PER_SECOND 1000000000UL + +#define MILLISECOND_PER_TICK (MILLISECOND_PER_SECOND / RT_TICK_PER_SECOND) +#define MICROSECOND_PER_TICK (MICROSECOND_PER_SECOND / RT_TICK_PER_SECOND) +#define NANOSECOND_PER_TICK (NANOSECOND_PER_SECOND / RT_TICK_PER_SECOND) + +#ifndef CLOCK_REALTIME +#define CLOCK_REALTIME 1 +#endif + +#define CLOCK_CPUTIME_ID 2 + +#ifndef CLOCK_PROCESS_CPUTIME_ID +#define CLOCK_PROCESS_CPUTIME_ID CLOCK_CPUTIME_ID +#endif +#ifndef CLOCK_THREAD_CPUTIME_ID +#define CLOCK_THREAD_CPUTIME_ID CLOCK_CPUTIME_ID +#endif + +#ifndef CLOCK_MONOTONIC +#define CLOCK_MONOTONIC 4 +#endif + +int clock_getres (clockid_t clockid, struct timespec *res); +int clock_gettime (clockid_t clockid, struct timespec *tp); +int clock_settime (clockid_t clockid, const struct timespec *tp); +#endif /*RT_USING_PTHREADS*/ + #ifdef __cplusplus } #endif diff --git a/components/libc/compilers/common/time.c b/components/libc/compilers/common/time.c index a980f742fb..d7048acc4a 100644 --- a/components/libc/compilers/common/time.c +++ b/components/libc/compilers/common/time.c @@ -14,6 +14,9 @@ * 2021-02-11 Meco Man fix bug #3183 - align days[] and months[] to 4 bytes * add difftime() * 2021-02-12 Meco Man add errno + * 2012-12-08 Bernard fix the issue of _timevalue.tv_usec initialization, + * which found by Rob + * 2021-02-12 Meco Man move all of the functions located in to this file */ #include @@ -26,7 +29,7 @@ #define SPD 24*60*60 /* days per month -- nonleap! */ -const short __spm[13] = +static const short __spm[13] = { 0, (31), @@ -97,12 +100,14 @@ struct tm *gmtime_r(const time_t *timep, struct tm *r) r->tm_isdst = 0; return r; } +RTM_EXPORT(gmtime_r); struct tm* gmtime(const time_t* t) { static struct tm tmp; return gmtime_r(t, &tmp); } +RTM_EXPORT(gmtime); /*TODO: timezone */ struct tm* localtime_r(const time_t* t, struct tm* r) @@ -114,18 +119,21 @@ struct tm* localtime_r(const time_t* t, struct tm* r) local_tz = *t + utc_plus * 3600; return gmtime_r(&local_tz, r); } +RTM_EXPORT(localtime_r); struct tm* localtime(const time_t* t) { static struct tm tmp; return localtime_r(t, &tmp); } +RTM_EXPORT(localtime); /* TODO: timezone */ time_t mktime(struct tm * const t) { return timegm(t); } +RTM_EXPORT(mktime); char* asctime_r(const struct tm *t, char *buf) { @@ -147,28 +155,33 @@ char* asctime_r(const struct tm *t, char *buf) buf[24] = '\n'; return buf; } +RTM_EXPORT(asctime_r); char* asctime(const struct tm *timeptr) { static char buf[25]; return asctime_r(timeptr, buf); } +RTM_EXPORT(asctime); char *ctime_r (const time_t * tim_p, char * result) { struct tm tm; return asctime_r (localtime_r (tim_p, &tm), result); } +RTM_EXPORT(ctime_r); char* ctime(const time_t *tim_p) { return asctime (localtime (tim_p)); } +RTM_EXPORT(ctime); double difftime (time_t tim1, time_t tim2) { return (double)(tim1 - tim2); } +RTM_EXPORT(difftime); /** * Returns the current time. @@ -216,11 +229,13 @@ RT_WEAK time_t time(time_t *t) return time_now; } +RTM_EXPORT(time); RT_WEAK clock_t clock(void) { return rt_tick_get(); } +RTM_EXPORT(clock); int stime(const time_t *t) { @@ -246,6 +261,7 @@ int stime(const time_t *t) return -1; #endif /* RT_USING_RTC */ } +RTM_EXPORT(stime); time_t timegm(struct tm * const t) { @@ -320,6 +336,7 @@ time_t timegm(struct tm * const t) i = 60; return ((day + t->tm_hour) * i + t->tm_min) * i + t->tm_sec; } +RTM_EXPORT(timegm); /* TODO: timezone */ int gettimeofday(struct timeval *tv, struct timezone *tz) @@ -338,6 +355,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz) return -1; } } +RTM_EXPORT(gettimeofday); /* TODO: timezone */ int settimeofday(const struct timeval *tv, const struct timezone *tz) @@ -352,3 +370,146 @@ int settimeofday(const struct timeval *tv, const struct timezone *tz) return -1; } } +RTM_EXPORT(settimeofday); + +#ifdef RT_USING_PTHREADS +static struct timeval _timevalue; +static int clock_time_system_init() +{ + time_t time; + rt_tick_t tick; + rt_device_t device; + + time = 0; + device = rt_device_find("rtc"); + if (device != RT_NULL) + { + /* get realtime seconds */ + rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time); + } + + /* get tick */ + tick = rt_tick_get(); + + _timevalue.tv_usec = (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK; + _timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1; + + return 0; +} +INIT_COMPONENT_EXPORT(clock_time_system_init); + +int clock_getres(clockid_t clockid, struct timespec *res) +{ + int ret = 0; + + if (res == RT_NULL) + { + rt_set_errno(EINVAL); + return -1; + } + + switch (clockid) + { + case CLOCK_REALTIME: + res->tv_sec = 0; + res->tv_nsec = NANOSECOND_PER_SECOND/RT_TICK_PER_SECOND; + break; + +#ifdef RT_USING_CPUTIME + case CLOCK_CPUTIME_ID: + res->tv_sec = 0; + res->tv_nsec = clock_cpu_getres(); + break; +#endif + + default: + ret = -1; + rt_set_errno(EINVAL); + break; + } + + return ret; +} +RTM_EXPORT(clock_getres); + +int clock_gettime(clockid_t clockid, struct timespec *tp) +{ + int ret = 0; + + if (tp == RT_NULL) + { + rt_set_errno(EINVAL); + return -1; + } + + switch (clockid) + { + case CLOCK_REALTIME: + { + /* get tick */ + int tick = rt_tick_get(); + + tp->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND; + tp->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK) * 1000; + } + break; + +#ifdef RT_USING_CPUTIME + case CLOCK_CPUTIME_ID: + { + float unit = 0; + long long cpu_tick; + + unit = clock_cpu_getres(); + cpu_tick = clock_cpu_gettime(); + + tp->tv_sec = ((int)(cpu_tick * unit)) / NANOSECOND_PER_SECOND; + tp->tv_nsec = ((int)(cpu_tick * unit)) % NANOSECOND_PER_SECOND; + } + break; +#endif + default: + rt_set_errno(EINVAL); + ret = -1; + } + + return ret; +} +RTM_EXPORT(clock_gettime); + +int clock_settime(clockid_t clockid, const struct timespec *tp) +{ + int second; + rt_tick_t tick; + rt_device_t device; + + if ((clockid != CLOCK_REALTIME) || (tp == RT_NULL)) + { + rt_set_errno(EINVAL); + + return -1; + } + + /* get second */ + second = tp->tv_sec; + /* get tick */ + tick = rt_tick_get(); + + /* update timevalue */ + _timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK; + _timevalue.tv_sec = second - tick/RT_TICK_PER_SECOND - 1; + + /* update for RTC device */ + device = rt_device_find("rtc"); + if (device != RT_NULL) + { + /* set realtime seconds */ + rt_device_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &second); + } + else + return -1; + + return 0; +} +RTM_EXPORT(clock_settime); +#endif /*RT_USING_PTHREADS*/ diff --git a/components/libc/pthreads/posix_sleep.c b/components/libc/pthreads/posix_sleep.c new file mode 100644 index 0000000000..e50bda7d4a --- /dev/null +++ b/components/libc/pthreads/posix_sleep.c @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2006-2018, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2020-12-16 Meco Man add usleep + */ +#include +#include +#include + +unsigned int sleep(unsigned int seconds) +{ + rt_tick_t delta_tick; + + delta_tick = rt_tick_get(); + rt_thread_delay(seconds * RT_TICK_PER_SECOND); + delta_tick = rt_tick_get() - delta_tick; + + return seconds - delta_tick/RT_TICK_PER_SECOND; +} + +int usleep(useconds_t usec) +{ + rt_thread_mdelay(usec / 1000u); + rt_hw_us_delay(usec % 1000u); + return 0; +} diff --git a/components/libc/pthreads/pthread.c b/components/libc/pthreads/pthread.c index 19a511b45b..cec76a9691 100644 --- a/components/libc/pthreads/pthread.c +++ b/components/libc/pthreads/pthread.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "pthread_internal.h" RT_DEFINE_SPINLOCK(pth_lock); @@ -688,3 +689,35 @@ int pthread_cancel(pthread_t thread) } RTM_EXPORT(pthread_cancel); +int clock_time_to_tick(const struct timespec *time) +{ + int tick; + int nsecond, second; + struct timespec tp; + + RT_ASSERT(time != RT_NULL); + + tick = RT_WAITING_FOREVER; + if (time != NULL) + { + /* get current tp */ + clock_gettime(CLOCK_REALTIME, &tp); + + if ((time->tv_nsec - tp.tv_nsec) < 0) + { + nsecond = NANOSECOND_PER_SECOND - (tp.tv_nsec - time->tv_nsec); + second = time->tv_sec - tp.tv_sec - 1; + } + else + { + nsecond = time->tv_nsec - tp.tv_nsec; + second = time->tv_sec - tp.tv_sec; + } + + tick = second * RT_TICK_PER_SECOND + nsecond * RT_TICK_PER_SECOND / NANOSECOND_PER_SECOND; + if (tick < 0) tick = 0; + } + + return tick; +} +RTM_EXPORT(clock_time_to_tick); diff --git a/components/libc/time/SConscript b/components/libc/time/SConscript deleted file mode 100644 index f7e6f7e8e9..0000000000 --- a/components/libc/time/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -# RT-Thread building script for component - -from building import * - -cwd = GetCurrentDir() -src = Glob('*.c') + Glob('*.cpp') -CPPPATH = [cwd] - -group = DefineGroup('libc', src, - depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) - -Return('group') diff --git a/components/libc/time/clock_time.c b/components/libc/time/clock_time.c deleted file mode 100644 index 83b3b916ca..0000000000 --- a/components/libc/time/clock_time.c +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2012-12-08 Bernard fix the issue of _timevalue.tv_usec initialization, - * which found by Rob - */ - -#include -#include - -#include "clock_time.h" - -static struct timeval _timevalue; -int clock_time_system_init() -{ - time_t time; - rt_tick_t tick; - rt_device_t device; - - time = 0; - device = rt_device_find("rtc"); - if (device != RT_NULL) - { - /* get realtime seconds */ - rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time); - } - - /* get tick */ - tick = rt_tick_get(); - - _timevalue.tv_usec = (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK; - _timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1; - - return 0; -} -INIT_COMPONENT_EXPORT(clock_time_system_init); - -int clock_time_to_tick(const struct timespec *time) -{ - int tick; - int nsecond, second; - struct timespec tp; - - RT_ASSERT(time != RT_NULL); - - tick = RT_WAITING_FOREVER; - if (time != NULL) - { - /* get current tp */ - clock_gettime(CLOCK_REALTIME, &tp); - - if ((time->tv_nsec - tp.tv_nsec) < 0) - { - nsecond = NANOSECOND_PER_SECOND - (tp.tv_nsec - time->tv_nsec); - second = time->tv_sec - tp.tv_sec - 1; - } - else - { - nsecond = time->tv_nsec - tp.tv_nsec; - second = time->tv_sec - tp.tv_sec; - } - - tick = second * RT_TICK_PER_SECOND + nsecond * RT_TICK_PER_SECOND / NANOSECOND_PER_SECOND; - if (tick < 0) tick = 0; - } - - return tick; -} -RTM_EXPORT(clock_time_to_tick); - -int clock_getres(clockid_t clockid, struct timespec *res) -{ - int ret = 0; - - if (res == RT_NULL) - { - rt_set_errno(EINVAL); - return -1; - } - - switch (clockid) - { - case CLOCK_REALTIME: - res->tv_sec = 0; - res->tv_nsec = NANOSECOND_PER_SECOND/RT_TICK_PER_SECOND; - break; - -#ifdef RT_USING_CPUTIME - case CLOCK_CPUTIME_ID: - res->tv_sec = 0; - res->tv_nsec = clock_cpu_getres(); - break; -#endif - - default: - ret = -1; - rt_set_errno(EINVAL); - break; - } - - return ret; -} -RTM_EXPORT(clock_getres); - -int clock_gettime(clockid_t clockid, struct timespec *tp) -{ - int ret = 0; - - if (tp == RT_NULL) - { - rt_set_errno(EINVAL); - return -1; - } - - switch (clockid) - { - case CLOCK_REALTIME: - { - /* get tick */ - int tick = rt_tick_get(); - - tp->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND; - tp->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK) * 1000; - } - break; - -#ifdef RT_USING_CPUTIME - case CLOCK_CPUTIME_ID: - { - float unit = 0; - long long cpu_tick; - - unit = clock_cpu_getres(); - cpu_tick = clock_cpu_gettime(); - - tp->tv_sec = ((int)(cpu_tick * unit)) / NANOSECOND_PER_SECOND; - tp->tv_nsec = ((int)(cpu_tick * unit)) % NANOSECOND_PER_SECOND; - } - break; -#endif - default: - rt_set_errno(EINVAL); - ret = -1; - } - - return ret; -} -RTM_EXPORT(clock_gettime); - -int clock_settime(clockid_t clockid, const struct timespec *tp) -{ - int second; - rt_tick_t tick; - rt_device_t device; - - if ((clockid != CLOCK_REALTIME) || (tp == RT_NULL)) - { - rt_set_errno(EINVAL); - - return -1; - } - - /* get second */ - second = tp->tv_sec; - /* get tick */ - tick = rt_tick_get(); - - /* update timevalue */ - _timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK; - _timevalue.tv_sec = second - tick/RT_TICK_PER_SECOND - 1; - - /* update for RTC device */ - device = rt_device_find("rtc"); - if (device != RT_NULL) - { - /* set realtime seconds */ - rt_device_control(device, RT_DEVICE_CTRL_RTC_SET_TIME, &second); - } - else - return -1; - - return 0; -} -RTM_EXPORT(clock_settime); diff --git a/components/libc/time/clock_time.h b/components/libc/time/clock_time.h deleted file mode 100644 index 16b2306f4b..0000000000 --- a/components/libc/time/clock_time.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2017-12-31 Bernard the first version - */ - -#ifndef CLOCK_TIME_H__ -#define CLOCK_TIME_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -/* posix clock and timer */ -#define MILLISECOND_PER_SECOND 1000UL -#define MICROSECOND_PER_SECOND 1000000UL -#define NANOSECOND_PER_SECOND 1000000000UL - -#define MILLISECOND_PER_TICK (MILLISECOND_PER_SECOND / RT_TICK_PER_SECOND) -#define MICROSECOND_PER_TICK (MICROSECOND_PER_SECOND / RT_TICK_PER_SECOND) -#define NANOSECOND_PER_TICK (NANOSECOND_PER_SECOND / RT_TICK_PER_SECOND) - -#ifndef CLOCK_REALTIME -#define CLOCK_REALTIME 1 -#endif - -#define CLOCK_CPUTIME_ID 2 - -#ifndef CLOCK_PROCESS_CPUTIME_ID -#define CLOCK_PROCESS_CPUTIME_ID CLOCK_CPUTIME_ID -#endif -#ifndef CLOCK_THREAD_CPUTIME_ID -#define CLOCK_THREAD_CPUTIME_ID CLOCK_CPUTIME_ID -#endif - -#ifndef CLOCK_MONOTONIC -#define CLOCK_MONOTONIC 4 -#endif - -int clock_getres (clockid_t clockid, struct timespec *res); -int clock_gettime (clockid_t clockid, struct timespec *tp); -int clock_settime (clockid_t clockid, const struct timespec *tp); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/components/libc/time/posix_sleep.c b/components/libc/time/posix_sleep.c deleted file mode 100644 index e50bda7d4a..0000000000 --- a/components/libc/time/posix_sleep.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2020-12-16 Meco Man add usleep - */ -#include -#include -#include - -unsigned int sleep(unsigned int seconds) -{ - rt_tick_t delta_tick; - - delta_tick = rt_tick_get(); - rt_thread_delay(seconds * RT_TICK_PER_SECOND); - delta_tick = rt_tick_get() - delta_tick; - - return seconds - delta_tick/RT_TICK_PER_SECOND; -} - -int usleep(useconds_t usec) -{ - rt_thread_mdelay(usec / 1000u); - rt_hw_us_delay(usec % 1000u); - return 0; -} -- cgit v1.3.1