Hi Svyatoslav,
Thank you for your patch.
On mer., nov. 15, 2023 at 17:38, Svyatoslav Ryhel clamor95@gmail.com wrote:
From: Ion Agorria ion@agorria.com
This commit implements "fastboot getvar all" listing by iterating the existing dispatchers that don't require parameters (as we pass NULL), uses fastboot multiresponse.
Signed-off-by: Ion Agorria ion@agorria.com Signed-off-by: Svyatoslav Ryhel clamor95@gmail.com Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com
doc/android/fastboot-protocol.rst | 3 ++ drivers/fastboot/fb_command.c | 3 ++ drivers/fastboot/fb_getvar.c | 75 +++++++++++++++++++++++++------ include/fastboot-internal.h | 7 +++ 4 files changed, 75 insertions(+), 13 deletions(-)
diff --git a/doc/android/fastboot-protocol.rst b/doc/android/fastboot-protocol.rst index e8cbd7f24e..8bd6d7168f 100644 --- a/doc/android/fastboot-protocol.rst +++ b/doc/android/fastboot-protocol.rst @@ -173,6 +173,9 @@ The various currently defined names are:: bootloader requiring a signature before it will install or boot images.
- all Provides all info from commands above as
they were called one by oneNames starting with a lowercase character are reserved by this specification. OEM-specific names should not start with lowercase characters. diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index ab72d8c781..6f621df074 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -156,6 +156,9 @@ int fastboot_handle_command(char *cmd_string, char *response) void fastboot_multiresponse(int cmd, char *response) { switch (cmd) {
- case FASTBOOT_COMMAND_GETVAR:
fastboot_getvar_all(response);break;diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 8cb8ffa2c6..0307fdfece 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -29,53 +29,67 @@ static void getvar_is_userspace(char *var_parameter, char *response);
static const struct { const char *variable;
- bool list; void (*dispatch)(char *var_parameter, char *response);
} getvar_dispatch[] = { { .variable = "version",
.dispatch = getvar_version
.dispatch = getvar_version,.list = true,
.dispatch = getvar_version_bootloader
.dispatch = getvar_version_bootloader,.list = true
.dispatch = getvar_downloadsize
.dispatch = getvar_downloadsize,.list = true
.dispatch = getvar_downloadsize
.dispatch = getvar_downloadsize,.list = true
.dispatch = getvar_serialno
.dispatch = getvar_serialno,.list = true
.dispatch = getvar_version_baseband
.dispatch = getvar_version_baseband,.list = true
.dispatch = getvar_product
.dispatch = getvar_product,.list = true
.dispatch = getvar_platform
.dispatch = getvar_platform,.list = true
.dispatch = getvar_current_slot
.dispatch = getvar_current_slot,.list = true#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "has-slot",
.dispatch = getvar_has_slot
.dispatch = getvar_has_slot,.list = false#endif #if IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC) }, { .variable = "partition-type",
.dispatch = getvar_partition_type
.dispatch = getvar_partition_type,.list = false#endif #if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "partition-size",
.dispatch = getvar_partition_size
.dispatch = getvar_partition_size,.list = false#endif }, { .variable = "is-userspace",
.dispatch = getvar_is_userspace
.dispatch = getvar_is_userspace,.list = true};
@@ -237,6 +251,38 @@ static void getvar_is_userspace(char *var_parameter, char *response) fastboot_okay("no", response); }
+static int current_all_dispatch; +void fastboot_getvar_all(char *response) +{
- /*
* Find a dispatch getvar that can be listed and send* it as INFO until we reach the end.*/- while (current_all_dispatch < ARRAY_SIZE(getvar_dispatch)) {
if (!getvar_dispatch[current_all_dispatch].list) {current_all_dispatch++;continue;}char envstr[FASTBOOT_RESPONSE_LEN] = { 0 };getvar_dispatch[current_all_dispatch].dispatch(NULL, envstr);
As requested in [1], please resolve the checkpatch errors. They are reported as WARNING:
WARNING: Missing a blank line after declarations
And the doc states [2] that WARNINGs need a careful review.
Since a respin is needed (because we need to add a stub in [3/5]) could you please also reorder this to avoid any warnings?
If not, I can do it while applying this to the u-boot-dfu custodian tree.
Thanks! Mattijs
[1] https://lore.kernel.org/all/87pm0cn0i4.fsf@baylibre.com/ [2] https://docs.u-boot.org/en/latest/develop/checkpatch.html?highlight=checkpat...
char *envstr_start = envstr;if (!strncmp("OKAY", envstr, 4) || !strncmp("FAIL", envstr, 4))envstr_start += 4;fastboot_response("INFO", response, "%s: %s",getvar_dispatch[current_all_dispatch].variable,envstr_start);current_all_dispatch++;return;- }
- fastboot_response("OKAY", response, NULL);
- current_all_dispatch = 0;
+}
/**
- fastboot_getvar() - Writes variable indicated by cmd_parameter to response.
@@ -254,6 +300,9 @@ void fastboot_getvar(char *cmd_parameter, char *response) { if (!cmd_parameter) { fastboot_fail("missing var", response);
- } else if (!strncmp("all", cmd_parameter, 3) && strlen(cmd_parameter) == 3) {
current_all_dispatch = 0;fastboot_response(FASTBOOT_MULTIRESPONSE_START, response, NULL);#define FASTBOOT_ENV_PREFIX "fastboot." int i; diff --git a/include/fastboot-internal.h b/include/fastboot-internal.h index bf2f2b3c89..610d4f9141 100644 --- a/include/fastboot-internal.h +++ b/include/fastboot-internal.h @@ -18,6 +18,13 @@ extern u32 fastboot_buf_size; */ extern void (*fastboot_progress_callback)(const char *msg);
+/**
- fastboot_getvar_all() - Writes current variable being listed from "all" to response.
- @response: Pointer to fastboot response buffer
- */
+void fastboot_getvar_all(char *response);
/**
- fastboot_getvar() - Writes variable indicated by cmd_parameter to response.
-- 2.40.1