Commit graph

46 commits

Author SHA1 Message Date
Alan Carvalho de Assis
cc8a6c8b85 cmake: Use NUTTX(_DIR/_BINARY_DIR) instead of CMAKE(_SOURCE_DIR/BINARY_DIR)
This companion change updates the nuttx-apps CMake build to use
NuttX’s NUTTX_DIR and NUTTX_BINARY_DIR instead of CMAKE_SOURCE_DIR
and CMAKE_BINARY_DIR, which incorrectly refer to the outermost project
when NuttX is embedded via add_subdirectory(). Since apps/ is itself
included from NuttX’s top-level CMakeLists.txt, these variables were
effectively being used as references to NuttX’s root and inherited
the same bug fixed in the matching NuttX change for #19697. All
self-referencing uses are replaced while intentionally preserving
standalone projects and unrelated custom variables or hardcoded paths.
The change affects only the CMake build system, preserves normal
standalone behavior, and was tested with sim:nsh both standalone and
embedded, with apps such as hello and ostest successfully built and
available in NSH.

Fixes #19697.

Assisted-by: Claude:claude-sonnet-5
Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com>
2026-08-09 10:43:01 -03:00
Matteo Golin
5b0cae9ab0 !apps: Simplify NuttX initialization
BREAKING: In an effort to simplify board initialization logic for NuttX,
NSH will no longer support architecture initialization. This will happen
during boot via the BOARD_LATE_INITIALIZE option. The boardctl command
BOARDIOC_INIT is also no longer available from user-space.

Quick fix:
Any application relying on BOARDIOC_INIT should now enable
BOARD_LATE_INITIALIZE to have initialization performed by the kernel in
advance of the application running. If control over initialization is
still necessary, BOARDIOC_FINALINIT should be implemented and used.
Boards relying on NSH for initialization should also enable
BOARD_LATE_INITIALIZE instead.

Signed-off-by: Matteo Golin <matteo.golin@gmail.com>
2026-05-06 13:27:05 +08:00
yangsong8
60f5a68c96 adb: adb tcp server configuration depends on NET_TCPBACKLOG
For TCP-based adb, if the current CPU contains TCP protocol stack,
then NET_TCPBACKLOG needs to be enabled.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
2025-12-11 19:16:23 +08:00
yangsong8
953fa21fef adb: adb shell depends on SCHED_CHILD_STATUS
Without this configuration, when executing exit in adb shell,
adb will not be able to exit because it cannot receive the
close packet.

Signed-off-by: yangsong8 <yangsong8@xiaomi.com>
2025-12-11 19:16:23 +08:00
raiden00pl
3764ab041a cmake: remove empty strings from FetchContent
remove empty strings from FetchContent to eliminate cmake build warnings like this:

CMake Warning (dev) at /usr/share/cmake/Modules/FetchContent.cmake:1564 (cmake_parse_arguments):
  The BUILD_COMMAND keyword was followed by an empty string or no value at
  all.  Policy CMP0174 is not set, so cmake_parse_arguments() will unset the
  ARG_BUILD_COMMAND variable rather than setting it to an empty string.

Signed-off-by: raiden00pl <raiden00@railab.me>
2025-03-30 14:20:21 +08:00
Alin Jerpelea
66e8296230 system: migrate to SPDX identifier
Most tools used for compliance and SBOM generation use SPDX identifiers
This change brings us a step closer to an easy SBOM generation.

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
2024-12-30 18:02:50 +08:00
wangjianyu3
38b54f6fc5 system/adb: Waiting for enumeration to complete before opening endpoint
Env

  esp32s3-devkit:adb

Error

  adbd [3:100]

  NuttShell (NSH)
  nsh> adb_uv_usb_setup (154): failed to open usb device -1 2

Test
  + adb_log("Waiting for %s ..", ep);

  adbd [3:100]

  NuttShell (NSH)
  nsh> adbd_main (161): Waiting for /dev/adb0/ep0 ..

  nsh> ps
    PID GROUP PRI POLICY   TYPE    NPX STATE    EVENT     SIGMASK            STACK COMMAND
      0     0   0 FIFO     Kthread   - Ready              0000000000000000 0003008 Idle_Task
      1     0 224 RR       Kthread   - Waiting  Semaphore 0000000000000000 0008080 hpwork 0x3fc8bc00 0x3fc8bc24
      2     2 100 RR       Task      - Running            0000000000000000 0003992 nsh_main
      3     3 100 RR       Task      - Waiting  Semaphore 0000000000000000 0008112 adbd
  nsh>

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
2024-11-23 01:44:19 +08:00
wangjianyu3
70e7ad85ed system/adb: Fix log format error
The "%pV" format depends on libc extension

Log

  adbd_main (***): 0x3fc9175cV

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
2024-11-22 09:01:38 +08:00
getian
d874dc21d1 system/adb: Implement ADB function through qemu pipe (1/3)
Signed-off-by: getian <getian@xiaomi.com>
2024-10-12 10:43:11 +08:00
dongjiuzhu1
6116558842 system/adb: using inotify to check usb hotplug event
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
2024-10-12 10:43:11 +08:00
dongjiuzhu1
7ab6704920 system/adb: add timer to check usb hotplug event
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
2024-10-12 10:43:11 +08:00
Xiang Xiao
c30583dda4 system/adbd: Fix typo error(CONFIG_ADB_SERVER->CONFIG_SYSTEM_ADBD)
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2024-10-07 21:25:42 +08:00
makejian
ddf9a7a2de system/adb: fix build warning
adb_banner.c:60:47: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'uint32_t' {aka 'long unsigned int'} [-Werror=format=]

Signed-off-by: makejian <makejian@xiaomi.com>
2024-09-29 22:33:32 +02:00
likun17
4253d031f0 adb: add LIBC_PRINT_EXTENSION dependency.
Signed-off-by: likun17 <likun17@xiaomi.com>
2024-09-23 23:13:55 +08:00
likun17
ac11e3cba9 Adapt the new header file path of va_format.
Signed-off-by: likun17 <likun17@xiaomi.com>
2024-09-23 14:54:06 +08:00
wangjianyu3
b5f8520d36 system/adb: Set threashold of syslog device to "1" for polling
Boards may set default(CONFIG_RAMLOG_POLLTHRESHOLD) to a very large value, causes logcat "can not" get poll notify.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
2024-09-15 02:26:55 +08:00
xuxin19
2e133feb09 cmake:support system apps CMake build
Signed-off-by: xuxin19 <xuxin19@xiaomi.com>
2024-06-30 21:40:25 +08:00
Xiang Xiao
ca310eb295 Fix Error: logcat_service.c:69:11: error: variable 'ret' set but not used
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2024-05-21 08:54:56 +08:00
Xiang Xiao
af1071ba5f Revert "system/adb: Ignore warnings for using variables"
This reverts commit d372099242
since the mainline already fix this problem
2024-05-16 10:48:45 -03:00
Xiang Xiao
b00041a9b0 system/adb: Always download the last microADB from github
to get the update automatically

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2024-05-16 10:48:45 -03:00
yinshengkai
d372099242 system/adb: Ignore warnings for using variables
Will cause compilation warning if NDEBUG is defined
We can't modify the code of the external library, so let's ignore it

microADB/hal/hal_uv_client_usb.c:90:13: warning: unused variable 'ret' [-Wunused-variable]
   90 |         int ret = uv_read_start((uv_stream_t*)&client->pipe,

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
2024-05-11 01:19:42 +08:00
Xiang Xiao
e4e43a1ca0 adb: Don't declare variables in the middle of function
and unify the prefix from ADB to ADBD

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2024-01-15 19:29:57 +08:00
Xiang Xiao
db0e0b9bfe adbd/logcat: Change alog_ prefix to logcat_
to unify the prefix usage in the code base

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2024-01-15 19:29:57 +08:00
Xiang Xiao
8f58d34e06 system/adb: Download the latest package
to fix error: microADB/hal/hal_uv.c:32:38: error:
a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2023-09-13 21:08:23 +08:00
zhangyuan21
7dcb0c79c3 adb: add adb log level
Signed-off-by: zhangyuan21 <zhangyuan21@xiaomi.com>
2023-08-10 00:50:50 +08:00
zhangyuan21
987cb1ebd9 adb: support adb boardctl when not composite device
Signed-off-by: zhangyuan21 <zhangyuan21@xiaomi.com>
2023-08-08 00:11:54 -07:00
Xiang Xiao
fe1d701b71 system/adb: Replace adb special reset cause with boardctl.h's value
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2023-04-23 10:44:43 -07:00
Xiang Xiao
df55bf5cea system/adb: Update to 305007e0e574e7cc2b8d706b0f5d8cc76675fc51
which contain the fix: https://github.com/spiriou/microADB/pull/34

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2023-02-11 22:00:05 +02:00
ligd
8994bab34c adb: add depends on LIBUV
Signed-off-by: ligd <liguiding1@xiaomi.com>
2023-01-25 23:20:28 +02:00
Huang Qi
2e2630e838 Don't download tarballs if a local git repo found
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
2022-08-28 17:20:47 +08:00
Xiang Xiao
61007bcdb6 system/adb: Update to microADB to the latest version
and enable the port forwarding feature

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2022-03-15 09:16:27 +02:00
Xiang Xiao
02a095bb76 system/adb: Download the last version of microADB
commit aa9c64896c7d47478656928d4dcf9b1a5e346da7
Author: Xiang Xiao <xiaoxiang@xiaomi.com>
Date:   Sat Jan 22 16:41:23 2022 +0800

    remove NuttX special code

    since the new libuv porting for NuttX doesn't need the special process

    Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2022-03-04 09:00:30 +02:00
Xiang Xiao
29374c96c3 system/adb: Replace NuttX special shell service with microADB builtin one
since the new libuv porting support uv_proccess_t now

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2022-03-04 09:00:30 +02:00
Huang Qi
a79195a048 system/adb: Remove unsed macro __NUTTX__
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
2022-02-28 18:05:00 +08:00
Xiang Xiao
b1276ea1b4 system/adb: Change the default value of ADBD_PAYLOAD_SIZE to 1024
improve the speed of "adb push" and "adb pull"

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2022-02-17 05:26:27 +01:00
Xiang Xiao
9534c640e8 system/adb: Fix error: 'fd' may be used uninitialized in this function
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2022-02-03 22:27:01 +01:00
Xiang Xiao
53cd8cda1f system/adb: Support reset to bootloader and recovery mode
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2022-01-29 12:44:41 +01:00
Xiang Xiao
8506078624 system/adb: Replace printf with syslog since adb is a service
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2022-01-24 23:32:15 +08:00
Xiang Xiao
d4d2f13f89 Rename CONFIG_LIB_BOARDCTL to CONFIG_BOARDCTL
since boardctl isn't a libc feature

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2021-08-06 11:04:35 +02:00
Alin Jerpelea
01532a45d6 system: fix relative path CI error
error: Path relative to repository other than nuttx must begin with the root directory
Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
2021-06-16 09:03:06 -05:00
Simon Piriou
e4db4df673 system: adb: fix shell service
Fix wrong dup2 return value check after:
fs: file_dup2 shouldn't hold the file list lock
1e5bfa623aa93b918566e8dc0e2f9c1a1037f45e

Fix issue in adb shell introduced in:
nsh: Pass the correct command lines to nsh_consolemain
6aca60133c
2021-05-08 22:51:25 -07:00
Xiang Xiao
6aca60133c nsh: Pass the correct command lines to nsh_consolemain
Change-Id: Ic6617cecb6949054e6bdce8757523e7a60d83eb0
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2021-01-13 16:40:18 +08:00
Masayuki Ishikawa
9f542c42e5 system: adb: Fix compile issues in adb_main.c
Summary:
- This commit fixes compile issues for the following condition
- CONFIG_ADBD_BOARD_INIT=n && CONFIG_BOARDCTL_RESET=y

Impact:
- adb only

Testing:
- Tested with stm32f4discovery:adb (not pushed yet)

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
2020-12-17 00:32:54 -06:00
Simon Piriou
d37a1d2f1b system/adb: fix shell issue and add reboot feature 2020-12-08 10:13:34 -06:00
Simon Piriou
a8a70f219d libuv/adb: add gitignore files 2020-11-08 12:10:11 -08:00
Simon Piriou
c1c488e835 system: add Android Debug Bridge daemon 2020-11-08 13:11:48 -03:00