specify product id

Sensing-Dev · Feb 10, 2024 · e6ca119 · e6ca119
1 parent c262d85
commit e6ca119
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 39 deletions.
diff --git a/generate_and_apply_WinUSB.ps1 b/generate_and_apply_WinUSB.ps1
@@ -8,6 +8,9 @@
 .PARAMETER VenderId
     The vender ID provided by the user.
 
+.PARAMETER ProductId
+    The product ID provided by the user.
+
 .EXAMPLE
     .\generate_and_apply_WinUSB.ps1 <vendor id>
     Prompts the user for a vender ID and displays the entered vender ID.
@@ -19,11 +22,13 @@
 
 param (
     [Parameter(Mandatory=$true)]
-    [string]$VenderId
+    [string]$VenderId,
+    [string]$ProductId
 )
 
 # Vender ID of the target USB device
 Write-Host "You entered vender ID: $VenderId"
+Write-Host "You entered product ID: $ProductId"
 
 # Working Directory
 $installPath = "$env:TEMP"
@@ -71,7 +76,7 @@ if ($Url.EndsWith("zip")) {
     throw "Target archive does not exit."
 }
 
-# Generate WinUSB Installer
+# Generate and apply WinUSB Installer
 if (Test-Path $tempExtractionPath) {    
 
     # Run Winusb installer
@@ -83,7 +88,7 @@ if (Test-Path $tempExtractionPath) {
     New-item -Path "$TempDir" -ItemType Directory
     $winUSBOptions = @{
         FilePath               = "${tempExtractionPath}/${installerName}-${version}/winusb_installer.exe"
-        ArgumentList           = "$VenderId"
+        ArgumentList           = "$VenderId $ProductId"
         WorkingDirectory       = "$TempDir"
         Wait                   = $true
         Verb                   = "RunAs"  # This attempts to run the process as an administrator
@@ -96,31 +101,6 @@ if (Test-Path $tempExtractionPath) {
     throw "Failed to execute WinUSB Installer Generator."
 }
 
-# Run Driver installer
-Write-Verbose "Start Driver installer"
-
-$infPath = "$TempDir/target_device.inf"
-if (-not (Test-Path -Path $infPath -PathType Leaf) ){
-    Write-Error "$infPath does not exist."
-}
-else{
-    $pnputilOptions = @{
-        FilePath = "PNPUtil"
-        ArgumentList           = "-i -a ./target_device.inf"
-        WorkingDirectory       = "$TempDir"
-        Wait                   = $true
-        Verb                   = "RunAs"  # This attempts to run the process as an administrator
-    }
-    try {
-        # Start Pnputil process 
-        Start-Process @pnputilOptions 
-        Write-Host "Sucessfully installed winUSB driver"
-    }
-    catch {
-        Write-Error "An error occurred while running pnputil: $_"
-    }
-}
-
 # delete temp files
 
 Start-Process powershell -Verb RunAs -ArgumentList "-NoProfile -ExecutionPolicy Bypass -Command `"Remove-Item -Path '$tempExtractionPath' -Recurse -Force -Confirm:`$false`""

diff --git a/src/winusb_installer.c b/src/winusb_installer.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include<stdbool.h>
+#include <stdbool.h>
 #include <libwdi.h>
 
 #include <stdio.h>
@@ -17,23 +17,33 @@ int main(int argc, char* argv[]){
 
     bool find_target_device = false;
     int vendor_id = 0;
+    int product_id = 0;
 
-    if (argc != 2){
-        usage("missing argument for parameter");
+    if (argc != 3){
+        printf( "missing argument for parameter" ); 
+        return 1;
     }
 
     vendor_id = (int)strtol(argv[1], NULL, 16);
-    printf("Targeted vernder id is %s\n", argv[1]); 
+    product_id = (int)strtol(argv[2], NULL, 16);
+    printf("Targeted vernder id is %s and product id is %s\n", argv[1], argv[2]); 
 
     // list all
+    // https://github.com/pbatard/libwdi/wiki/Usage#struct-wdi_options_create_list
     struct wdi_options_create_list option = {TRUE, TRUE, TRUE};
 
     if (wdi_create_list(&list, &option) == WDI_SUCCESS) {
         for (device = list; device != NULL; device = device->next) {
-            printf("Installing driver for USB device: \"%s\" (%04X:%04X)",
-                device->desc, device->vid, device->pid);
-            if (device->vid == vendor_id){
-                printf(" <-- these are the target\n");
+            if (device->vid == vendor_id && device->pid == product_id){
+                printf("Installing driver on USB device: \"%s\" (%04X:%04X)",
+                    device->desc, device->vid, device->pid );
+                    if (device->is_composite){
+                        printf("COMPOSITE %u\n", device->mi);
+                    }else{
+                        printf("\n");
+                    }
+
+            // if (device->vid == vendor_id && device->pid == product_id){
 
                 struct wdi_options_prepare_driver driver_option ={
                     WDI_WINUSB, 
@@ -46,15 +56,14 @@ int main(int argc, char* argv[]){
                     printf("********************************************************\n");
                     wdi_install_driver(device, ".", "target_device.inf", NULL);
                 }
-                return 0;
             }else{
-                printf("\n");
+                // printf("\n");
             }
         }
 
         wdi_destroy_list(list);
     }else{
-        printf("Faile\n");
+        printf("Failed\n");
     }
     return 0;
 }