diff options
| author | guo <[email protected]> | 2022-12-16 18:38:28 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-12-16 18:38:28 +0800 |
| commit | 68ca9f07a60ad5cbe52b37b52299327b6246e7f7 (patch) | |
| tree | b990c35d5b20e515adb604b85b2b10dae0cf034b /components/drivers | |
| parent | 3ea5166376dbc05722d793c3183c15b3a01e7f3a (diff) | |
[rt-smart] 弱化 RT_USING_LWP，使用 RT_USING_SMART 作为宏配置 (#6740)
* [dfs] sync cromfs
* [rt-smart]Weaken RT_USING_LWP, use RT_USING_SMART as macro configuration
* [format] fix some format issue.
Diffstat (limited to 'components/drivers')
| -rwxr-xr-x | components/drivers/Kconfig | 6 | ||||
| -rw-r--r-- | components/drivers/tty/SConscript | 2 | ||||
| -rw-r--r-- | components/drivers/tty/include/tty.h | 2 | ||||
| -rw-r--r-- | components/drivers/virtio/virtio.h | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index da0211683f..735347bcbc 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -51,7 +51,7 @@ menuconfig RT_USING_SERIAL config RT_USING_TTY bool "Using TTY SYSTEM" - depends on RT_USING_LWP + depends on RT_USING_SMART default y if RT_USING_TTY @@ -567,8 +567,8 @@ endif config RT_USING_DEV_BUS bool "Using Device Bus device drivers" - default y if RT_USING_LWP - default n if !RT_USING_LWP + default y if RT_USING_SMART + default n if !RT_USING_SMART menuconfig RT_USING_WIFI bool "Using Wi-Fi framework" diff --git a/components/drivers/tty/SConscript b/components/drivers/tty/SConscript index 3c561f4e46..d972879b70 100644 --- a/components/drivers/tty/SConscript +++ b/components/drivers/tty/SConscript @@ -5,6 +5,6 @@ src = Glob('*.c') cwd = GetCurrentDir() CPPPATH = [cwd + "/include"] -group = DefineGroup('tty', src, depend = ['RT_USING_LWP', 'RT_USING_TTY'], CPPPATH = CPPPATH) +group = DefineGroup('tty', src, depend = ['RT_USING_SMART', 'RT_USING_TTY'], CPPPATH = CPPPATH) Return('group') diff --git a/components/drivers/tty/include/tty.h b/components/drivers/tty/include/tty.h index 2040cc45f3..6a966262a9 100644 --- a/components/drivers/tty/include/tty.h +++ b/components/drivers/tty/include/tty.h @@ -12,7 +12,7 @@ #include <rthw.h> #include <rtthread.h> #include <tty_ldisc.h> -#ifdef RT_USING_LWP +#ifdef RT_USING_SMART #include <lwp.h> #endif #if defined(RT_USING_POSIX_TERMIOS) diff --git a/components/drivers/virtio/virtio.h b/components/drivers/virtio/virtio.h index 297975601b..545c74549d 100644 --- a/components/drivers/virtio/virtio.h +++ b/components/drivers/virtio/virtio.h @@ -15,7 +15,7 @@ #include <rthw.h> #include <rtdef.h> -#ifdef RT_USING_LWP +#ifdef RT_USING_SMART #include <mmu.h> #include <ioremap.h> #endif @@ -47,14 +47,14 @@ #define VIRTIO_F_VERSION_1 32 #define VIRTIO_F_RING_PACKED 34 -#ifdef RT_USING_LWP +#ifdef RT_USING_SMART extern rt_mmu_info mmu_info; #define VIRTIO_VA2PA(vaddr) ((rt_ubase_t)rt_hw_mmu_v2p(&mmu_info, vaddr)) #define VIRTIO_PA2VA(paddr) ((rt_ubase_t)rt_ioremap((void *)paddr, ARCH_PAGE_SIZE)) #else #define VIRTIO_VA2PA(vaddr) ((rt_ubase_t)vaddr) #define VIRTIO_PA2VA(paddr) ((rt_ubase_t)paddr) -#endif /* RT_USING_LWP */ +#endif /* RT_USING_SMART */ #define VIRTIO_PAGE_SHIFT 12 #define VIRTIO_PAGE_SIZE (1 << VIRTIO_PAGE_SHIFT) #define VIRTIO_PAGE_ALIGN(addr) (RT_ALIGN(addr, VIRTIO_PAGE_SIZE)) |