sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system/adb: Replace adb special reset cause with boardctl.h's value

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-04-01 19:35:42 +08:00 committed by Brennan Ashton
parent c50ff7ff61
commit fe1d701b71
2 changed files with 4 additions and 15 deletions

13
system/adb/Kconfig

@ -50,21 +50,10 @@ config ADBD_TOKEN_SIZE
endif # ADBD_AUTHENTICATION
if BOARDCTL_RESET
config ADBD_RESET_RECOVERY
int "Reset argument for recovery"
default 1
config ADBD_RESET_BOOTLOADER
int "Reset argument for bootloader"
default 2
endif # BOARDCTL_RESET
if !BOARDCTL_UNIQUEID
config ADBD_DEVICE_ID
string "Default adb device id"
depends on !BOARDCTL_UNIQUEID
default ""
endif # BOARDCTL_UNIQUEID
config ADBD_PRODUCT_NAME
string "Default adb product name"

6
system/adb/adb_main.c

@ -56,15 +56,15 @@ void adb_reboot_impl(const char *target)
#ifdef CONFIG_BOARDCTL_RESET
if (strcmp(target, "recovery") == 0)
{
boardctl(BOARDIOC_RESET, CONFIG_ADBD_RESET_RECOVERY);
boardctl(BOARDIOC_RESET, BOARDIOC_SOFTRESETCAUSE_ENTER_RECOVERY);
}
else if (strcmp(target, "bootloader") == 0)
{
boardctl(BOARDIOC_RESET, CONFIG_ADBD_RESET_BOOTLOADER);
boardctl(BOARDIOC_RESET, BOARDIOC_SOFTRESETCAUSE_ENTER_BOOTLOADER);
}
else
{
boardctl(BOARDIOC_RESET, 0);
boardctl(BOARDIOC_RESET, BOARDIOC_SOFTRESETCAUSE_USER_REBOOT);
}
#else
adb_log("reboot not implemented\n");