add GPL v2+ SPDX header

[project/usbmode.git] / convert-modeswitch.pl

diff --git a/convert-modeswitch.pl b/convert-modeswitch.pl
old mode 100644 (file)
new mode 100755 (executable)
index f7ac9ff..b1530bd
--- a/convert-modeswitch.pl
+++ b/convert-modeswitch.pl
@@ -9,7 +9,7 @@ sub add_message {
        my $msg = shift;
        my $val = $messages{$msg};
 
-       $val or do {
+       defined($val) or do {
                $val = $msg_ctr++;
                $messages{$msg} = $val;
        };
@@ -46,9 +46,15 @@ sub add_mode {
        return $_[1];
 }
 
+sub add_modeval {
+        return unless ($_[1] && $_[1] =~ /^\d+$/);
+       $_[0]->{"ModeValue"} = $_[1];
+}
+
 my $hex_option = [ undef, \&add_hex ];
 my $msg_option = [ undef, \&add_message ];
 my $mode_option = [ "Mode", \&add_mode ];
+my $value_mode_option = [ "Mode", \&add_mode, \&add_modeval ];
 my %options = (
        TargetVendor => $hex_option,
        TargetProductList => [ "TargetProduct", sub { return [ map(hex,split(/,/, $_[0])) ]; } ],
@@ -59,7 +65,13 @@ my %options = (
        MessageContent3 => $msg_option,
        WaitBefore => [ ],
        DetachStorageOnly => [ ],
+       MBIM => $mode_option,
        HuaweiMode => $mode_option,
+       HuaweiNewMode => $mode_option,
+       QuantaMode => $mode_option,
+       BlackberryMode => $mode_option,
+       PantechMode => $value_mode_option,
+       OptionMode => $mode_option,
        SierraMode => $mode_option,
        SonyMode => $mode_option,
        QisdaMode => $mode_option,
@@ -68,6 +80,7 @@ my %options = (
        SequansMode => $mode_option,
        MobileActionMode => $mode_option,
        CiscoMode => $mode_option,
+       StandardEject => $mode_option,
        NoDriverLoading => [],
        MessageEndpoint => $hex_option,
        ReleaseDelay => [],
@@ -110,6 +123,7 @@ sub parse_file($) {
                        next;
                };
 
+               $opt->[2] and &{$opt->[2]}($dev, $val, $var);
                $opt->[1] and $val = &{$opt->[1]}($val, $var);
                $opt->[0] and $var = $opt->[0];
                $dev->{$var} = $val;
@@ -153,12 +167,13 @@ sub dev_opt {
                my @val = @$val;
                undef $val;
                foreach my $elem (@val) {
+                       my $json = json_val($elem, $type);
+                       next unless defined $json;
                        if (defined $val) {
-                               $val = "$val, "
+                               $val = "$val, $json"
                        } else {
-                               $val = "";
+                               $val = $json;
                        }
-                       $val .= json_val($elem, $type);
                }
                $val = "[ $val ]";
        } else {
@@ -203,11 +218,15 @@ foreach my $devid (sort keys %devices) {
                dev_opt($cur->{TargetClass}, "t_class", "int", \$sep);
                dev_opt($cur->{DetachStorageOnly}, "detach_storage", "bool", \$sep);
                dev_opt($cur->{Mode}, "mode", "string", \$sep);
+               dev_opt($cur->{ModeValue}, "modeval", "int", \$sep);
                dev_opt($cur->{NoDriverLoading}, "no_driver", "bool", \$sep);
                dev_opt($cur->{MessageEndpoint}, "msg_endpoint", "int", \$sep);
-               dev_opt($cur->{MessageContent}, "msg", "int", \$sep);
-               dev_opt($cur->{MessageContent2}, "msg2", "int", \$sep);
-               dev_opt($cur->{MessageContent3}, "msg3", "int", \$sep);
+               my $msg = [
+                       $cur->{MessageContent},
+                       $cur->{MessageContent2},
+                       $cur->{MessageContent3}
+               ];
+               dev_opt($msg, "msg", "array:int", \$sep);
                dev_opt($cur->{WaitBefore}, "wait", "int", \$sep);
                dev_opt($cur->{ReleaseDelay}, "release_delay", "int", \$sep);
                dev_opt($cur->{NeedResponse}, "response", "bool", \$sep);