diff --git a/host/utilities/bladeRF-cli/src/cmd/open.c b/host/utilities/bladeRF-cli/src/cmd/open.c index acf0b0ed..9a278ff0 100644 --- a/host/utilities/bladeRF-cli/src/cmd/open.c +++ b/host/utilities/bladeRF-cli/src/cmd/open.c @@ -35,6 +35,7 @@ int cmd_open(struct cli_state *state, int argc, char **argv) int i; int status; int ret; + bool update_required; if (state->dev) { bladerf_close(state->dev); @@ -68,9 +69,18 @@ int cmd_open(struct cli_state *state, int argc, char **argv) } status = bladerf_open(&state->dev, dev_ident); + + update_required = (status == BLADERF_ERR_UPDATE_FPGA) || + (status == BLADERF_ERR_UPDATE_FW); + if (status) { - state->last_lib_error = status; - ret = CLI_RET_LIBBLADERF; + if (update_required) { + /* LibbladeRF will print a warning. No need to show an error. */ + status = 0; + } else { + state->last_lib_error = status; + ret = CLI_RET_LIBBLADERF; + } } else { ret = 0; putchar('\n'); diff --git a/host/utilities/bladeRF-cli/src/main.c b/host/utilities/bladeRF-cli/src/main.c index cf02310f..702dc1f1 100644 --- a/host/utilities/bladeRF-cli/src/main.c +++ b/host/utilities/bladeRF-cli/src/main.c @@ -301,6 +301,8 @@ static int open_device(struct rc_config *rc, struct cli_state *state, int status if (!status) { status = bladerf_open(&state->dev, rc->device); if (status) { + bool update_required = (status == BLADERF_ERR_UPDATE_FPGA) || + (status == BLADERF_ERR_UPDATE_FW); /* Just warn if no device is attached; don't error out */ if (!rc->device && status == BLADERF_ERR_NODEV) { @@ -311,6 +313,10 @@ static int open_device(struct rc_config *rc, struct cli_state *state, int status fprintf(stderr, "and that the current user has permission to access it.\n"); fprintf(stderr, "\n"); status = 0; + } else if (update_required) { + /* Allow users to enter the console so they can perform + * an update. */ + status = 0; } else { fprintf(stderr, "Failed to open device (%s): %s\n", rc->device ? rc->device : "first available",