#define __uqmi_command(_name, _optname, _arg, _option) { #_optname, _arg##_argument, NULL, CMD_OPT(__UQMI_COMMAND_##_name) }
static const struct option uqmi_getopt[] = {
__uqmi_commands,
+ { "single", no_argument, NULL, 's' },
{ "device", required_argument, NULL, 'd' },
- { "keep-client-id", required_argument, NULL, 'K' },
+ { "keep-client-id", required_argument, NULL, 'k' },
+ { "release-client-id", required_argument, NULL, 'r' },
{ NULL, 0, NULL, 0 }
};
#undef __uqmi_command
{
fprintf(stderr, "Usage: %s <options|actions>\n"
"Options:\n"
+ " --single, -s: Print output as a single line (for scripts)\n"
" --device=NAME, -d NAME: Set device name to NAME (required)\n"
" --keep-client-id <name>: Keep Client ID for service <name>\n"
- " (implies --keep-client-id)\n"
+ " --release-client-id <name>: Release Client ID after exiting\n"
"\n"
"Services: dms, nas, pds, wds, wms\n"
"\n"
"Actions:\n"
" --get-versions: Get service versions\n"
" --set-client-id <name>,<id>: Set Client ID for service <name> to <id>\n"
+ " (implies --keep-client-id)\n"
" --get-client-id <name>: Connect and get Client ID for service <name>\n"
" (implies --keep-client-id)\n"
wds_helptext
qmi_service_get_client_id(qmi, svc);
}
+static void release_client_id(struct qmi_dev *qmi, const char *optarg)
+{
+ QmiService svc = qmi_service_get_by_name(optarg);
+ if (svc < 0) {
+ fprintf(stderr, "Invalid service %s\n", optarg);
+ exit(1);
+ }
+ qmi_service_release_client_id(qmi, svc);
+}
+
static void handle_exit_signal(int signal)
{
cancel_all_requests = true;
int main(int argc, char **argv)
{
static struct qmi_dev dev;
- int ch;
+ int ch, ret;
uloop_init();
signal(SIGINT, handle_exit_signal);
signal(SIGTERM, handle_exit_signal);
- while ((ch = getopt_long(argc, argv, "d:k:", uqmi_getopt, NULL)) != -1) {
+ while ((ch = getopt_long(argc, argv, "d:k:s", uqmi_getopt, NULL)) != -1) {
int cmd_opt = CMD_OPT(ch);
if (ch < 0 && cmd_opt >= 0 && cmd_opt < __UQMI_COMMAND_LAST) {
}
switch(ch) {
+ case 'r':
+ release_client_id(&dev, optarg);
+ break;
case 'k':
keep_client_id(&dev, optarg);
break;
case 'd':
device = optarg;
break;
+ case 's':
+ single_line = true;
+ break;
default:
return usage(argv[0]);
}
return 2;
}
- uqmi_run_commands(&dev);
+ ret = uqmi_run_commands(&dev) ? 0 : -1;
qmi_device_close(&dev);
- return 0;
+ return ret;
}