Fix improper argument passing to SoapySDRDevice_make

Author: BatchDrake

analyzer/device/impl/soapysdr.c

@@ -286,6 +286,8 @@ soapysdr_discovery_populate(suscan_device_properties_t *prop, const SoapySDRKwar
       SU_TRY(suscan_device_properties_set_trait(prop, "device", val));
     } else if (strcmp(key, "serial") == 0) {
       SU_TRY(suscan_device_properties_set_trait(prop, "serial", val));
+    } else if (strcmp(key, "device_id") == 0) {
+      SU_TRY(suscan_device_properties_set_trait(prop, "device_id", val));
     } else if (strcmp(key, "label") == 0) {
       SU_TRY(suscan_device_properties_set_label(prop, val));
     }

analyzer/source/impl/soapysdr.c

@@ -40,8 +40,14 @@ strmap_to_SoapySDRKwargs(const strmap_t *map)
 
   it = strmap_begin(map);
   while (!strmap_iterator_end(&it)) {
-    if (it.value != NULL)
-      SU_TRYZ_FAIL(SoapySDRKwargs_set(args, it.name, it.value));
+    if (it.value != NULL) {
+      /* Okay, this was embarrassing */
+      if (strcmp(it.name, "device") == 0) {
+        SU_TRYZ_FAIL(SoapySDRKwargs_set(args, "driver", it.value));
+      } else {
+        SU_TRYZ_FAIL(SoapySDRKwargs_set(args, it.name, it.value));
+      }
+    }
 
     strmap_iterator_advance(&it);
   }