Possible fix for #3 (reset USB device before doing anything)

Samsung-Loki · Jun 29, 2023 · 0ae7cef · 0ae7cef
1 parent 9483c9c
commit 0ae7cef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/TheAirBlow.Thor.Library/Platform/Linux.cs b/TheAirBlow.Thor.Library/Platform/Linux.cs
@@ -150,6 +150,11 @@ public void Initialize(string? id, byte[]? direct = null) {
         if ((_deviceFd = Interop.Open(path, Interop.O_RDWR)) < 0)
             Interop.HandleError("Failed to open the device for RW");
 
+        // Reset USB device
+        var zeroRef = 0u;
+        if (Interop.IoCtl(_deviceFd.Value, Interop.USBDEVFS_RESET, ref zeroRef) < 0)
+            Interop.HandleError("Failed to reset USB device");
+
         // Detach kernel driver if present
         var driver = new Interop.GetDriver {
             Interface = (int)_interface
@@ -293,6 +298,7 @@ private static uint _IOW(uint type, uint nr, uint size)
         public static uint USBDEVFS_GETDRIVER = _IOW('U', 8, (uint)sizeof(GetDriver));
         public static uint USBDEVFS_DISCONNECT = _IO('U', 22);
         public static uint USBDEVFS_CONNECT = _IO('U', 23);
+        public static uint USBDEVFS_RESET = _IO('U', 20);
 
         public struct BulkTransfer {
             public uint Endpoint;

diff --git a/TheAirBlow.Thor.Library/TheAirBlow.Thor.Library.csproj b/TheAirBlow.Thor.Library/TheAirBlow.Thor.Library.csproj
@@ -5,7 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/TheAirBlow.Thor.Shell/Program.cs b/TheAirBlow.Thor.Shell/Program.cs
@@ -13,7 +13,7 @@
     .MinimumLevel.Information()
     .WriteTo.Console()
     .CreateLogger();
-AnsiConsole.MarkupLine("[green]Welcome to Thor Shell v1.0.2![/]");
+AnsiConsole.MarkupLine("[green]Welcome to Thor Shell v1.0.3![/]");
 if (!USB.TryGetHandler(out var handler)) {
     AnsiConsole.MarkupLine("[red]A USB handler wasn't written for your platform![/]");
     AnsiConsole.MarkupLine($"[red]Currently supported platforms: {USB.GetSupported()}.[/]");

diff --git a/TheAirBlow.Thor.Shell/TheAirBlow.Thor.Shell.csproj b/TheAirBlow.Thor.Shell/TheAirBlow.Thor.Shell.csproj
@@ -7,7 +7,7 @@
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <RootNamespace>ThorRewrite.Shell</RootNamespace>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
     </PropertyGroup>
 
     <ItemGroup>