Add GPLv3+ disclaimers. UsbConnect and TinFoil classes refactoring (trying to make clear code + reduce verbose output).

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Report a defect
+title: ''
+labels: ''
+assignees: developersu
+
+---
+
+**Describe the bug (mandatory)**
+A clear and concise description of what the bug is.
+
+**Information about environment (mandatory):**
+ - OS: [e.g. Windows 7 x64]
+ - Java version [run 'java -version']
+
+**Steps to reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots and/or information from application log**
+If applicable, add screenshots to help explain your problem.
+
+**Did you see this issue in previous versions?**
+Yes / No / Don't know
+
+**Additional context**
+Add any other context about the problem here

JNI sources/linux/smashlib.c

@@ -1,18 +1,22 @@
-/* NS-USBloader - native libraries for 'special purposes'
- * Copyright (C) 2020  Dmitry Isaenko
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+    --
+    Native libraries for 'special purposes'
 */
 
 #include <stdlib.h>

README.md

@@ -23,7 +23,7 @@ Sometimes I add new posts about this project [on my home page](https://developer
 
 #### License
 
-[GNU General Public License v3](https://github.com/developersu/ns-usbloader/blob/master/LICENSE)
+[GNU General Public License version 3]((https://github.com/developersu/ns-usbloader/blob/master/LICENSE)), or (at your option) any later version.
 
 #### Used libraries & resources
 * [OpenJFX](https://wiki.openjdk.java.net/display/OpenJFX/Main)

pom.xml

@@ -8,7 +8,7 @@
     <name>NS-USBloader</name>
 
     <artifactId>ns-usbloader</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
 
     <url>https://github.com/developersu/ns-usbloader/</url>
     <description>

src/main/java/nsusbloader/AppPreferences.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader;
 
 import java.util.Locale;

src/main/java/nsusbloader/COM/Helpers/NSSplitReader.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.Helpers;
 
 import java.io.*;

src/main/java/nsusbloader/COM/NET/NETCommunications.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.NET;
 
 import javafx.concurrent.Task;

src/main/java/nsusbloader/COM/NET/NETPacket.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.NET;
 
 import nsusbloader.NSLMain;

src/main/java/nsusbloader/COM/USB/GoldLeaf.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB;
 
 import javafx.application.Platform;

src/main/java/nsusbloader/COM/USB/GoldLeaf_05.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;

src/main/java/nsusbloader/COM/USB/GoldLeaf_07.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB;
 
 import javafx.application.Platform;

src/main/java/nsusbloader/COM/USB/PFS/NCAFile.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB.PFS;
 
 import java.nio.ByteBuffer;

src/main/java/nsusbloader/COM/USB/PFS/PFSProvider.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB.PFS;
 
 import nsusbloader.ModelControllers.LogPrinter;

src/main/java/nsusbloader/COM/USB/TinFoil.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
@@ -22,12 +40,19 @@ import java.util.LinkedHashMap;
 class TinFoil extends TransferModule {
     // "TUL0".getBytes(StandardCharsets.US_ASCII)
     private static final byte[] TUL0  = new byte[]{(byte) 0x54, (byte) 0x55, (byte) 0x4c, (byte) 0x30};
+    private static final byte[] MAGIC = new byte[]{(byte) 0x54, (byte) 0x55, (byte) 0x43, (byte) 0x30};  // aka 'TUC0' ASCII
+
+    private static final byte CMD_EXIT = 0x00;
+    private static final byte CMD_FILE_RANGE_DEFAULT = 0x01;
+    private static final byte CMD_FILE_RANGE_ALTERNATIVE = 0x02;
+    /*  byte[] magic = new byte[4];
+        ByteBuffer bb = StandardCharsets.UTF_8.encode("TUC0").rewind().get(magic); // Let's rephrase this 'string' */
 
     TinFoil(DeviceHandle handler, LinkedHashMap<String, File> nspMap, Task<Void> task, LogPrinter logPrinter){
         super(handler, nspMap, task, logPrinter);
-        logPrinter.print("============= TinFoil =============", EMsgType.INFO);
+        logPrinter.print("============= Tinfoil =============", EMsgType.INFO);
 
-        if (!sendListOfNSP())
+        if (! sendListOfFiles())
             return;
 
         if (proceedCommands())                              // REPORT SUCCESS
@@ -36,259 +61,238 @@ class TinFoil extends TransferModule {
     /**
      * Send what NSP will be transferred
      * */
-    private boolean sendListOfNSP(){
-        //Collect file names
-        StringBuilder nspListNamesBuilder = new StringBuilder();    // Add every title to one stringBuilder
-        for(String nspFileName: nspMap.keySet()) {
-            nspListNamesBuilder.append(nspFileName);   // And here we come with java string default encoding (UTF-16)
-            nspListNamesBuilder.append('\n');
-        }
+    private boolean sendListOfFiles(){
+        final String fileNamesListToSend = getFileNamesToSend();
 
-        byte[] nspListNames = nspListNamesBuilder.toString().getBytes(StandardCharsets.UTF_8);
-        ByteBuffer byteBuffer = ByteBuffer.allocate(Integer.BYTES).order(ByteOrder.LITTLE_ENDIAN);         // integer = 4 bytes; BTW Java is stored in big-endian format
-        byteBuffer.putInt(nspListNames.length);                                                             // This way we obtain length in int converted to byte array in correct Big-endian order. Trust me.
-        byte[] nspListSize = byteBuffer.array();
+        byte[] nspListNames = getFileNamesToSendAsBytes(fileNamesListToSend);
+        byte[] nspListNamesSize = getFileNamesLengthToSendAsBytes(nspListNames);
+        byte[] padding = new byte[8];
 
-        logPrinter.print("TF Send list of files:", EMsgType.INFO);
-        // Proceed "TUL0"
         if (writeUsb(TUL0)) {
-            logPrinter.print("  handshake   [1/4]", EMsgType.FAIL);
+            logPrinter.print("TF Send list of files: handshake   [1/4]", EMsgType.FAIL);
             return false;
         }
-        logPrinter.print("  handshake   [1/4]", EMsgType.PASS);
 
-        // Sending NSP list
-        if (writeUsb(nspListSize)) {                                           // size of the list we're going to transfer goes...
-            logPrinter.print("  list length [2/4]", EMsgType.FAIL);
+        if (writeUsb(nspListNamesSize)) {                                 // size of the list we can transfer
+            logPrinter.print("TF Send list of files: list length [2/4]", EMsgType.FAIL);
             return false;
         }
-        logPrinter.print("  list length [2/4]", EMsgType.PASS);
 
-        if (writeUsb(new byte[8])) {                                           // 8 zero bytes goes...
-            logPrinter.print("  padding     [3/4]", EMsgType.FAIL);
+        if (writeUsb(padding)) {
+            logPrinter.print("TF Send list of files: padding     [3/4]", EMsgType.FAIL);
             return false;
         }
-        logPrinter.print("  padding     [3/4]", EMsgType.PASS);
 
-        if (writeUsb(nspListNames)) {                                           // list of the names goes...
-            logPrinter.print("  list itself [4/4]", EMsgType.FAIL);
+        if (writeUsb(nspListNames)) {
+            logPrinter.print("TF Send list of files: list itself [4/4]", EMsgType.FAIL);
             return false;
         }
-        logPrinter.print("  list itself [4/4]", EMsgType.PASS);
+        logPrinter.print("TF Send list of files complete.", EMsgType.PASS);
 
         return true;
     }
+
+    private String getFileNamesToSend(){
+        StringBuilder fileNamesListBuilder = new StringBuilder();
+        for(String nspFileName: nspMap.keySet()) {
+            fileNamesListBuilder.append(nspFileName);   // And here we come with java string default encoding (UTF-16)
+            fileNamesListBuilder.append('\n');
+        }
+        return fileNamesListBuilder.toString();
+    }
+
+    private byte[] getFileNamesToSendAsBytes(String fileNamesListToSend){
+        return fileNamesListToSend.getBytes(StandardCharsets.UTF_8);
+    }
+
+    private byte[] getFileNamesLengthToSendAsBytes(byte[] fileNamesListToSendAsBytes){
+        ByteBuffer byteBuffer = ByteBuffer.allocate(Integer.BYTES).order(ByteOrder.LITTLE_ENDIAN);         // integer = 4 bytes; BTW Java is stored in big-endian format
+        byteBuffer.putInt(fileNamesListToSendAsBytes.length);                                                             // This way we obtain length in int converted to byte array in correct Big-endian order. Trust me.
+        return byteBuffer.array();
+    }
     /**
      * After we sent commands to NS, this chain starts
      * */
     private boolean proceedCommands(){
         logPrinter.print("TF Awaiting for NS commands.", EMsgType.INFO);
+        try{
+            byte[] deviceReply;
+            byte command;
 
-        /*  byte[] magic = new byte[4];
-            ByteBuffer bb = StandardCharsets.UTF_8.encode("TUC0").rewind().get(magic); // Let's rephrase this 'string'
-        */
-        final byte[] magic = new byte[]{(byte) 0x54, (byte) 0x55, (byte) 0x43, (byte) 0x30};  // eq. 'TUC0' @ UTF-8 (actually ASCII lol, u know what I mean)
-
-        byte[] receivedArray;
-
-        while (true){   // Check if user interrupted process.
-
-            receivedArray = readUsb();
-
-            if (receivedArray == null)      // catches error
-                return false;
-
-            if (!Arrays.equals(Arrays.copyOfRange(receivedArray, 0,4), magic))      // Bytes from 0 to 3 should contain 'magic' TUC0, so must be verified like this
+            while (true){
+                deviceReply = readUsb();
+                if (! isReplyValid(deviceReply))
                     continue;
+                command = getCommandFromReply(deviceReply);
 
-            // 8th to 12th(explicits) bytes in returned data stands for command ID as unsigned integer (Little-endian). Actually, we have to compare arrays here, but in real world it can't be greater then 0/1/2, thus:
-            // BTW also protocol specifies 4th byte to be 0x00 kinda indicating that that this command is valid. But, as you may see, never happens other situation when it's not = 0.
-            if (receivedArray[8] == 0x00){                           //0x00 - exit
-                logPrinter.print("TF Received 'EXIT' command. Terminating.", EMsgType.PASS);
-                return true;                     // All interaction with USB device should be ended (expected);
-            }
-            else if ((receivedArray[8] == 0x01) || (receivedArray[8] == 0x02)){           //0x01 - file range; 0x02 unknown bug on backend side (dirty hack).
-                logPrinter.print("TF Received 'FILE RANGE' command [0x0"+receivedArray[8]+"].", EMsgType.PASS);
-                /*// We can get in this pocket a length of file name (+32). Why +32? I dunno man.. Do we need this? Definitely not. This app can live without it.
-                long receivedSize = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 12,20)).order(ByteOrder.LITTLE_ENDIAN).getLong();
-                logsArea.appendText("[V] Received FILE_RANGE command. Size: "+Long.toUnsignedString(receivedSize)+"\n");            // this shit returns string that will be chosen next '+32'. And, BTW, can't be greater then 512
-                */
-                if (! fileRangeCmd())
+                switch (command){
+                    case CMD_EXIT:
+                        logPrinter.print("TF Transfer complete.", EMsgType.PASS);
+                        return true;
+                    case CMD_FILE_RANGE_DEFAULT:
+                    case CMD_FILE_RANGE_ALTERNATIVE:
+                        //logPrinter.print("TF Received 'FILE RANGE' command [0x0"+command+"].", EMsgType.PASS);
+                        if (fileRangeCmd())
                             return false;      // catches exception
                 }
             }
         }
+        catch (Exception e){
+            logPrinter.print(e.getMessage(), EMsgType.INFO);
+            return false;
+        }
+    }
+
+    private boolean isReplyValid(byte[] reply){
+        return Arrays.equals(Arrays.copyOfRange(reply, 0,4), MAGIC);
+    }
+
+    private byte getCommandFromReply(byte[] reply){
+        return reply[8];
+    }
     /**
      * This is what returns requested file (files)
      * Executes multiple times
-     * @return 'true' if everything is ok
-     *          'false' is error/exception occurs
+     * @return 'false' if everything is ok
+     *          'true' is error/exception occurs
      * */
     private boolean fileRangeCmd(){
-        byte[] receivedArray;
-        // Here we take information of what other side wants
-        if ((receivedArray = readUsb()) == null)
-            return false;
+        try {
+            byte[] receivedArray = readUsb();
 
-        // range_offset of the requested file. In the beginning it will be 0x10.
-        long receivedRangeSize = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 0,8)).order(ByteOrder.LITTLE_ENDIAN).getLong();          // Note - it could be unsigned long. Unfortunately, this app won't support files greater then 8796093022208 Gb
-        byte[] receivedRangeSizeRAW = Arrays.copyOfRange(receivedArray, 0,8);                                                               // used (only) when we use sendResponse().
-        long receivedRangeOffset = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 8,16)).order(ByteOrder.LITTLE_ENDIAN).getLong();      // Note - it could be unsigned long. Unfortunately, this app won't support files greater then 8796093022208 Gb
-            /* Below, it's REAL NSP file name length that we sent before among others (WITHOUT +32 byes). It can't be greater then... see what is written in the beginning of this code.
-            We don't need this since in next pocket we'll get name itself UTF-8 encoded. Could be used to double-checks or something like that.
-            long receivedNspNameLen = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 16,24)).order(ByteOrder.LITTLE_ENDIAN).getLong(); */
+            byte[] sizeAsBytes = Arrays.copyOfRange(receivedArray, 0,8);
+            long size = ByteBuffer.wrap(sizeAsBytes).order(ByteOrder.LITTLE_ENDIAN).getLong();          // could be unsigned long. This app won't support files greater then 8796093022208 Gb
+            long offset = ByteBuffer.wrap(Arrays.copyOfRange(receivedArray, 8,16)).order(ByteOrder.LITTLE_ENDIAN).getLong();      // could be unsigned long. This app doesn't support files greater then 8796093022208 Gb
 
             // Requesting UTF-8 file name required:
-        if ((receivedArray = readUsb()) == null)
-            return false;
+            receivedArray = readUsb();
 
-        String receivedRequestedNSP = new String(receivedArray, StandardCharsets.UTF_8);
-        logPrinter.print(String.format("TF Reply for: %s" +
+            String nspFileName = new String(receivedArray, StandardCharsets.UTF_8);
+
+            logPrinter.print(String.format("TF Reply to: %s" +
                     "\n         Offset: %-20d 0x%x" +
                     "\n         Size:   %-20d 0x%x",
-                receivedRequestedNSP,
-                receivedRangeOffset, receivedRangeOffset,
-                receivedRangeSize, receivedRangeSize), EMsgType.INFO);
+                    nspFileName,
+                    offset, offset,
+                    size, size), EMsgType.INFO);
 
-        // Sending response header
-        if (! sendResponse(receivedRangeSizeRAW))   // Get receivedRangeSize in 'RAW' format exactly as it has been received to simplify the process.
-            return false;
+            File nspFile = nspMap.get(nspFileName);
+            boolean isSplitFile = nspFile.isDirectory();
 
-        try {
-            byte[] bufferCurrent;   //= new byte[1048576];        // eq. Allocate 1mb
+            // Sending response 'header'
+            if (sendMetaInfoForFile(sizeAsBytes))   // Get size in 'RAW' format exactly as it has been received to simplify the process.
+                return true;
 
-            long currentOffset = 0;
-            // 'End Offset' equal to receivedRangeSize.
-            int readPice = 8388608;                     // = 8Mb
-
-            //---------------! Split files start !---------------
-            if (nspMap.get(receivedRequestedNSP).isDirectory()){
-                NSSplitReader nsSplitReader = new NSSplitReader(nspMap.get(receivedRequestedNSP), receivedRangeSize);
-                if (nsSplitReader.seek(receivedRangeOffset) != receivedRangeOffset){
-                    logPrinter.print("TF Requested offset is out of file size. Nothing to transmit.", EMsgType.FAIL);
-                    return false;
-                }
-
-                while (currentOffset < receivedRangeSize){
-                    if ((currentOffset + readPice) >= receivedRangeSize )
-                        readPice = Math.toIntExact(receivedRangeSize - currentOffset);
-                    //System.out.println("CO: "+currentOffset+"\t\tEO: "+receivedRangeSize+"\t\tRP: "+readPice);  // NOTE: DEBUG
-                    // updating progress bar (if a lot of data requested) START BLOCK
-                    //---Tell progress to UI---/
-                    logPrinter.updateProgress((currentOffset+readPice)/(receivedRangeSize/100.0) / 100.0);
-                    //------------------------/
-                    bufferCurrent = new byte[readPice];                                                         // TODO: not perfect moment, consider refactoring.
-
-                    if (nsSplitReader.read(bufferCurrent) != readPice) {                                      // changed since @ v0.3.2
-                        logPrinter.print("TF Reading from stream suddenly ended.", EMsgType.WARNING);
-                        return false;
-                    }
-                    //write to USB
-                    if (writeUsb(bufferCurrent)) {
-                        logPrinter.print("TF Failure during file transfer.", EMsgType.FAIL);
-                        return false;
-                    }
-                    currentOffset += readPice;
-                }
-                nsSplitReader.close();
-            }
-            //---------------! Split files end     !---------------
-            //---------------! Regular files start !---------------
-            else {
-                BufferedInputStream bufferedInStream = new BufferedInputStream(new FileInputStream(nspMap.get(receivedRequestedNSP)));      // TODO: refactor?
-
-                if (bufferedInStream.skip(receivedRangeOffset) != receivedRangeOffset) {
-                    logPrinter.print("TF Requested offset is out of file size. Nothing to transmit.", EMsgType.FAIL);
-                    return false;
-                }
-                /*
-                File dir = new File(System.getProperty("user.home")+File.separator+"DBG_"+receivedRequestedNSP);                                                    //todo: remove
-                dir.mkdirs();                                                                                                   //todo: remove
-
-                File chunkFile = new File(System.getProperty("user.home")+File.separator+"DBG_"+receivedRequestedNSP+File.separator+receivedRangeSize+"_"+receivedRangeOffset+".part"); //todo: remove
-                BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(chunkFile));                                       //todo: remove
-                */
-                while (currentOffset < receivedRangeSize) {
-                    if ((currentOffset + readPice) >= receivedRangeSize)
-                        readPice = Math.toIntExact(receivedRangeSize - currentOffset);
-                    //System.out.println("CO: "+currentOffset+"\t\tEO: "+receivedRangeSize+"\t\tRP: "+readPice);  // NOTE: DEBUG
-                    //logPrinter.print(String.format("CO: %-20d EO: %-20d RP: %d\n", currentOffset, receivedRangeSize, readPice), EMsgType.NULL);  // NOTE: better DEBUG
-                    // updating progress bar (if a lot of data requested) START BLOCK
-                    //---Tell progress to UI---/
-                    logPrinter.updateProgress((currentOffset + readPice) / (receivedRangeSize / 100.0) / 100.0);
-                    //------------------------/
-                    bufferCurrent = new byte[readPice];                                                         // TODO: not perfect moment, consider refactoring.
-
-                    if (bufferedInStream.read(bufferCurrent) != readPice) {                                      // changed since @ v0.3.2
-                        logPrinter.print("TF Reading from stream suddenly ended.", EMsgType.WARNING);
-                        return false;
-                    }
-                    //write to USB
-                    //bos.write(bufferCurrent);   //todo: remove
-
-                    if (writeUsb(bufferCurrent)) {
-                        logPrinter.print("TF Failure during file transfer.", EMsgType.FAIL);
-                        return false;
-                    }
-                    currentOffset += readPice;
-                }
-                bufferedInStream.close();
-                //bos.close();                    //todo: remove
-            }
-            //---------------! Regular files end     !---------------
-            //---Tell progress to UI---/
-            logPrinter.updateProgress(1.0);
-
-        } catch (FileNotFoundException fnfe){
-            logPrinter.print("TF FileNotFoundException:\n  "+fnfe.getMessage(), EMsgType.FAIL);
-            fnfe.printStackTrace();
-            return false;
+            if (isSplitFile)
+                sendSplitFile(nspFile, size, offset);
+            else
+                sendNormalFile(nspFile, size, offset);
         } catch (IOException ioe){
             logPrinter.print("TF IOException:\n         "+ioe.getMessage(), EMsgType.FAIL);
             ioe.printStackTrace();
-            return false;
+            return true;
         } catch (ArithmeticException ae){
-            logPrinter.print("TF ArithmeticException (can't cast 'offset end' - 'offsets current' to 'integer'):\n  "+ae.getMessage(), EMsgType.FAIL);
+            logPrinter.print("TF ArithmeticException (can't cast 'offset end' - 'offsets current' to 'integer'):" +
+                    "\n         "+ae.getMessage(), EMsgType.FAIL);
             ae.printStackTrace();
-            return false;
+            return true;
         } catch (NullPointerException npe){
-            logPrinter.print("TF NullPointerException (in some moment application didn't find something. Something important.):\n  "+npe.getMessage(), EMsgType.FAIL);
+            logPrinter.print("TF NullPointerException (in some moment application didn't find something. Something important.):" +
+                    "\n         "+npe.getMessage(), EMsgType.FAIL);
             npe.printStackTrace();
+            return true;
+        }
+        catch (Exception defe){
+            logPrinter.print(defe.getMessage(), EMsgType.FAIL);
+            return true;
+        }
         return false;
     }
 
-        return true;
+    void sendSplitFile(File nspFile, long size, long offset) throws IOException, NullPointerException, ArithmeticException {
+        byte[] readBuffer;
+        long currentOffset = 0;
+        int chunk = 8388608; // = 8Mb;
+
+        NSSplitReader nsSplitReader = new NSSplitReader(nspFile, size);
+        if (nsSplitReader.seek(offset) != offset)
+            throw new IOException("TF Requested offset is out of file size. Nothing to transmit.");
+
+        while (currentOffset < size){
+            if ((currentOffset + chunk) >= size )
+                chunk = Math.toIntExact(size - currentOffset);
+            //System.out.println("CO: "+currentOffset+"\t\tEO: "+size+"\t\tRP: "+chunk);  // NOTE: DEBUG
+            logPrinter.updateProgress((currentOffset + chunk) / (size / 100.0) / 100.0);
+
+            readBuffer = new byte[chunk];     // TODO: not perfect moment, consider refactoring.
+
+            if (nsSplitReader.read(readBuffer) != chunk)
+                throw new IOException("TF Reading from stream suddenly ended.");
+
+            if (writeUsb(readBuffer))
+                throw new IOException("TF Failure during file transfer.");
+            currentOffset += chunk;
+        }
+        nsSplitReader.close();
+        logPrinter.updateProgress(1.0);
+    }
+
+    void sendNormalFile(File nspFile, long size, long offset) throws IOException, NullPointerException, ArithmeticException {
+        byte[] readBuffer;
+        long currentOffset = 0;
+        int chunk = 8388608;
+
+        BufferedInputStream bufferedInStream = new BufferedInputStream(new FileInputStream(nspFile));
+
+        if (bufferedInStream.skip(offset) != offset)
+            throw new IOException("TF Requested offset is out of file size. Nothing to transmit.");
+
+        while (currentOffset < size) {
+            if ((currentOffset + chunk) >= size)
+                chunk = Math.toIntExact(size - currentOffset);
+            //System.out.println("CO: "+currentOffset+"\t\tEO: "+receivedRangeSize+"\t\tRP: "+chunk);  // NOTE: DEBUG
+            logPrinter.updateProgress((currentOffset + chunk) / (size / 100.0) / 100.0);
+
+            readBuffer = new byte[chunk];
+
+            if (bufferedInStream.read(readBuffer) != chunk)
+                throw new IOException("TF Reading from stream suddenly ended.");
+
+            if (writeUsb(readBuffer))
+                throw new IOException("TF Failure during file transfer.");
+            currentOffset += chunk;
+        }
+        bufferedInStream.close();
+        logPrinter.updateProgress(1.0);
     }
     /**
      * Send response header.
-     * @return true if everything OK
-     *         false if failed
+     * @return false if everything OK
+     *         true if failed
      * */
-    private boolean sendResponse(byte[] rangeSize){                         // This method as separate function itself for application needed as a cookie in the middle of desert.
+    private boolean sendMetaInfoForFile(byte[] sizeAsBytes){
         final byte[] standardReplyBytes = new byte[] { 0x54, 0x55, 0x43, 0x30,    // 'TUC0'
                                                        0x01, 0x00, 0x00, 0x00,    // CMD_TYPE_RESPONSE = 1
                                                        0x01, 0x00, 0x00, 0x00 };
 
         final byte[] twelveZeroBytes = new byte[12];
-        //logPrinter.print("TF Sending response", EMsgType.INFO);
-        if (writeUsb(standardReplyBytes)       // Send integer value of '1' in Little-endian format.
-        ){
+
+        if (writeUsb(standardReplyBytes)){       // Send integer value of '1' in Little-endian format.
             logPrinter.print("TF Sending response failed [1/3]", EMsgType.FAIL);
-            return false;
+            return true;
         }
 
-        if(writeUsb(rangeSize)) {                                                          // Send EXACTLY what has been received
+        if(writeUsb(sizeAsBytes)) {                                                          // Send EXACTLY what has been received
             logPrinter.print("TF Sending response failed [2/3]", EMsgType.FAIL);
-            return false;
+            return true;
         }
 
         if(writeUsb(twelveZeroBytes)) {                                                       // kinda another one padding
             logPrinter.print("TF Sending response failed [3/3]", EMsgType.FAIL);
-            return false;
-        }
-        logPrinter.print("TF Sending response complete (3/3)", EMsgType.PASS);
             return true;
         }
+        return false;
+    }
 
     /**
      * Sending any byte array to USB device
@@ -304,7 +308,7 @@ class TinFoil extends TransferModule {
         while (! task.isCancelled()) {
             /*
             if (varVar != 0)
-                logPrinter.print("writeUsb() retry cnt: "+varVar, EMsgType.INFO); //todo:remove
+                logPrinter.print("writeUsb() retry cnt: "+varVar, EMsgType.INFO); //NOTE: DEBUG
             varVar++;
             */
             result = LibUsb.bulkTransfer(handlerNS, (byte) 0x01, writeBuffer, writeBufTransferred, 5050);  // last one is TIMEOUT. 0 stands for unlimited. Endpoint OUT = 0x01
@@ -336,7 +340,7 @@ class TinFoil extends TransferModule {
      * @return byte array if data read successful
      *         'null' if read failed
      * */
-    private byte[] readUsb(){
+    private byte[] readUsb() throws Exception{
         ByteBuffer readBuffer = ByteBuffer.allocateDirect(512);
         // We can limit it to 32 bytes, but there is a non-zero chance to got OVERFLOW from libusb.
         IntBuffer readBufTransferred = IntBuffer.allocate(1);
@@ -353,13 +357,11 @@ class TinFoil extends TransferModule {
                 case LibUsb.ERROR_TIMEOUT:
                     continue;
                 default:
-                    logPrinter.print("TF Data transfer issue [read]" +
+                    throw new Exception("TF Data transfer issue [read]" +
                             "\n         Returned: " + UsbErrorCodes.getErrCode(result)+
-                            "\n         (execution stopped)", EMsgType.FAIL);
-                    return null;
+                            "\n         (execution stopped)");
             }
         }
-        logPrinter.print("TF Execution interrupted", EMsgType.INFO);
-        return null;
+        throw new InterruptedException("TF Execution interrupted");
     }
 }

src/main/java/nsusbloader/COM/USB/TransferModule.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
@@ -24,7 +42,7 @@ public abstract class TransferModule {
         this.logPrinter = printer;
 
         // Validate split files to be sure that there is no crap
-        logPrinter.print("TransferModule: Validating split files ...", EMsgType.INFO);
+        //logPrinter.print("TransferModule: Validating split files ...", EMsgType.INFO); // NOTE: Used for debug
         Iterator<Map.Entry<String, File>> iterator = nspMap.entrySet().iterator();
         while (iterator.hasNext()){
             File f = iterator.next().getValue();
@@ -47,7 +65,7 @@ public abstract class TransferModule {
                 } // nice
             } // stairway
         } // here =)
-        logPrinter.print("TransferModule: Validation complete.", EMsgType.INFO);
+        //logPrinter.print("TransferModule: Validation complete.", EMsgType.INFO);  // NOTE: Used for debug
     }
 
     public EFileStatus getStatus(){ return status; }

src/main/java/nsusbloader/COM/USB/UsbCommunications.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB;
 
 import javafx.concurrent.Task;
@@ -18,17 +36,7 @@ public class UsbCommunications extends Task<Void> {
     private LinkedHashMap<String, File> nspMap;
     private String protocol;
     private boolean nspFilterForGl;
-    /*
-        Ok, here is a story. We will pass to NS only file names, not full path. => see nspMap where 'key' is a file name.
-        File name itself should not be greater then 512 bytes, but in real world it's limited by OS to something like 256 bytes.
-        For sure, there could be FS that supports more then 256 and even more then 512 bytes. So if user decides to set name greater then 512 bytes, everything will ruin.
-        There is no extra validations for this situation.
-        Why we poking around 512 bytes? Because it's the maximum size of byte-array that USB endpoind of NS could return. And in runtime it returns the filename.
-        Therefore, the file name shouldn't be greater then 512. If file name + path-to-file is greater then 512 bytes, we can handle it: sending only file name instead of full path.
 
-        Since this application let user an ability (theoretically) to choose same files in different folders, the latest selected file will be added to the list and handled correctly.
-        I have no idea why he/she will make a decision to do that. Just in case, we're good in this point.
-         */
     public UsbCommunications(List<File> nspList, String protocol, boolean filterNspFilesOnlyForGl){
         this.protocol = protocol;
         this.nspFilterForGl = filterNspFilesOnlyForGl;
@@ -40,9 +48,9 @@ public class UsbCommunications extends Task<Void> {
 
     @Override
     protected Void call() {
-        logPrinter.print("\tStart chain", EMsgType.INFO);
+        logPrinter.print("\tStart", EMsgType.INFO);
 
-        UsbConnect usbConnect = new UsbConnect(logPrinter, false);
+        UsbConnect usbConnect = UsbConnect.connectHomebrewMode(logPrinter);
 
         if (! usbConnect.isConnected()){
             close(EFileStatus.FAILED);
@@ -80,7 +88,7 @@ public class UsbCommunications extends Task<Void> {
      */
     private void close(EFileStatus status){
         logPrinter.update(nspMap, status);
-        logPrinter.print("\tEnd chain", EMsgType.INFO);
+        logPrinter.print("\tEnd", EMsgType.INFO);
         logPrinter.close();
     }
 

src/main/java/nsusbloader/COM/USB/UsbConnect.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB;
 
 import nsusbloader.ModelControllers.LogPrinter;
@@ -5,7 +23,17 @@ import nsusbloader.NSLDataTypes.EMsgType;
 import org.usb4java.*;
 
 public class UsbConnect {
-    private int DEFAULT_INTERFACE = 0;
+    private static final int DEFAULT_INTERFACE = 0;
+    private static final int DEFAULT_HOMEBREW_CONFIGURATION = 1;
+
+    private static final short RCM_VID = 0x0955;
+    private static final short RCM_PID = 0x7321;
+
+    private static final short HOMEBREW_VID = 0x057E;
+    private static final short HOMEBREW_PID = 0x3000;
+
+    // private static final short TEST_VID = 0x1a86;
+    // private static final short TEST_PID = 0x7523;
 
     private Context contextNS;
     private DeviceHandle handlerNS;
@@ -15,134 +43,152 @@ public class UsbConnect {
 
     private boolean connected; // TODO: replace to 'connectionFailure' and invert requests everywhere
 
-    public UsbConnect(LogPrinter logPrinter, boolean initForRCM){
+    private short VENDOR_ID;
+    private short PRODUCT_ID;
+
+    private int returningValue;
+    private DeviceList deviceList;
+
+    public static UsbConnect connectRcmMode(LogPrinter logPrinter){
+        UsbConnect usbConnect = new UsbConnect(logPrinter);
+        usbConnect.VENDOR_ID = RCM_VID;
+        usbConnect.PRODUCT_ID = RCM_PID;
+        try{
+            usbConnect.createContextAndInitLibUSB();
+            usbConnect.getDeviceList();
+            usbConnect.findDevice();
+            usbConnect.openDevice();
+            usbConnect.freeDeviceList();
+            usbConnect.setAutoDetachKernelDriver();
+            //this.resetDevice();
+            usbConnect.claimInterface();
+            usbConnect.connected = true;
+        }
+        catch (Exception e){
+            logPrinter.print(e.getMessage(), EMsgType.FAIL);
+            usbConnect.close();
+        }
+
+        return usbConnect;
+    }
+    public static UsbConnect connectHomebrewMode(LogPrinter logPrinter){
+        UsbConnect usbConnect = new UsbConnect(logPrinter);
+        usbConnect.VENDOR_ID = HOMEBREW_VID;
+        usbConnect.PRODUCT_ID = HOMEBREW_PID;
+        try {
+            usbConnect.createContextAndInitLibUSB();
+            usbConnect.getDeviceList();
+            usbConnect.findDevice();
+            usbConnect.openDevice();
+            usbConnect.freeDeviceList();
+            usbConnect.setAutoDetachKernelDriver();
+            //this.resetDevice();
+            usbConnect.setConfiguration(DEFAULT_HOMEBREW_CONFIGURATION);
+            usbConnect.claimInterface();
+            usbConnect.connected = true;
+        }
+        catch (Exception e){
+            logPrinter.print(e.getMessage(), EMsgType.FAIL);
+            usbConnect.close();
+        }
+        return usbConnect;
+    }
+
+    private UsbConnect(){}
+
+    private UsbConnect(LogPrinter logPrinter){
         this.logPrinter = logPrinter;
         this.connected = false;
+    };
 
-        short VENDOR_ID;
-        short PRODUCT_ID;
-
-        if (initForRCM){
-            // CORRECT NV:
-            VENDOR_ID = 0x0955;
-            PRODUCT_ID = 0x7321;
-            /* // QA:
-            VENDOR_ID = 0x1a86;
-            PRODUCT_ID = 0x7523;
-             */
-        }
-        else {
-            VENDOR_ID = 0x057E;
-            PRODUCT_ID = 0x3000;
-        }
-
-        int result;
-
-        // Creating Context required by libusb. Optional. TODO: Consider removing.
+    private void createContextAndInitLibUSB() throws Exception{
+        // Creating Context required by libusb. Optional? Consider removing.
         contextNS = new Context();
-        result = LibUsb.init(contextNS);
-        if (result != LibUsb.SUCCESS) {
-            logPrinter.print("libusb initialization\n  Returned: "+result, EMsgType.FAIL);
-            close();
-            return;
-        }
-        logPrinter.print("libusb initialization", EMsgType.PASS);
 
-        // Searching for NS in devices: obtain list of all devices
-        DeviceList deviceList = new DeviceList();
-        result = LibUsb.getDeviceList(contextNS, deviceList);
-        if (result < 0) {
-            logPrinter.print("Get device list\n  Returned: "+result, EMsgType.FAIL);
-            close();
-            return;
+        returningValue = LibUsb.init(contextNS);
+        if (returningValue != LibUsb.SUCCESS)
+            throw new Exception("libusb initialization\n  Returned: "+UsbErrorCodes.getErrCode(returningValue));
     }
-        logPrinter.print("Get device list", EMsgType.PASS);
+
+    private void getDeviceList() throws Exception{
+        deviceList = new DeviceList();
+        returningValue = LibUsb.getDeviceList(contextNS, deviceList);
+        if (returningValue < 0)
+            throw new Exception("Get device list\n  Returned: "+UsbErrorCodes.getErrCode(returningValue));
+    }
+
+    private void findDevice() throws Exception{
         // Searching for NS in devices: looking for NS
         DeviceDescriptor descriptor;
-        deviceNS = null;
+
         for (Device device: deviceList){
-            descriptor = new DeviceDescriptor();                // mmm.. leave it as is.
-            result = LibUsb.getDeviceDescriptor(device, descriptor);
-            if (result != LibUsb.SUCCESS){
-                logPrinter.print("Read file descriptors for USB devices\n  Returned: "+result, EMsgType.FAIL);
-                LibUsb.freeDeviceList(deviceList, true);
-                close();
-                return;
+            descriptor = new DeviceDescriptor();
+            returningValue = LibUsb.getDeviceDescriptor(device, descriptor);
+            if (returningValue != LibUsb.SUCCESS){
+                this.freeDeviceList();
+                throw new Exception("Read file descriptors for USB devices\n  Returned: "+UsbErrorCodes.getErrCode(returningValue));
             }
             if ((descriptor.idVendor() == VENDOR_ID) && descriptor.idProduct() == PRODUCT_ID){
                 deviceNS = device;
-                logPrinter.print("Read file descriptors for USB devices", EMsgType.PASS);
                 break;
             }
         }
-        // Free device list.
         if (deviceNS == null) {
-            logPrinter.print("NS in connected USB devices not found", EMsgType.FAIL);
-            close();
-            return;
+            this.freeDeviceList();
+            throw new Exception("NS not found in connected USB devices");
+        }
     }
-        logPrinter.print("NS in connected USB devices found", EMsgType.PASS);
 
+    private void openDevice() throws Exception{
         // Handle NS device
         handlerNS = new DeviceHandle();
-        result = LibUsb.open(deviceNS, handlerNS);
-        if (result != LibUsb.SUCCESS) {
-            logPrinter.print("Open NS USB device\n  Returned: "+UsbErrorCodes.getErrCode(result), EMsgType.FAIL);
-            if (result == LibUsb.ERROR_ACCESS)
-                logPrinter.print("Double check that you have administrator privileges (you're 'root') or check 'udev' rules set for this user (linux only)!\n\n" +
-                        String.format("Steps to set 'udev' rules:\n" +
-                                "root # vim /etc/udev/rules.d/99-NS"+(initForRCM?"RCM":"")+".rules\n" +
+        returningValue = LibUsb.open(deviceNS, handlerNS);
+
+        if (returningValue == LibUsb.SUCCESS)
+            return;
+
+        handlerNS = null;  // Avoid issue on close();
+        if (returningValue == LibUsb.ERROR_ACCESS) {
+            throw new Exception(String.format(
+                    "Open NS USB device\n         Returned: %s\n" +
+                    "Double check that you have administrator privileges (you're 'root') or check 'udev' rules set for this user (linux only)!\n\n" +
+                    "Steps to set 'udev' rules:\n" +
+                    "root # vim /etc/udev/rules.d/99-NS" + ((RCM_VID == VENDOR_ID) ? "RCM" : "") + ".rules\n" +
                     "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", GROUP=\"plugdev\"\n" +
-                                "root # udevadm control --reload-rules && udevadm trigger\n", VENDOR_ID, PRODUCT_ID)
-                        , EMsgType.INFO);
-            // Let's make a bit dirty workaround since such shit happened
-            logPrinter.print("Requested context close", EMsgType.INFO);
-            LibUsb.exit(contextNS);
-            return;         // And close
+                    "root # udevadm control --reload-rules && udevadm trigger\n", UsbErrorCodes.getErrCode(returningValue), VENDOR_ID, PRODUCT_ID));
         }
         else
-            logPrinter.print("Open NS USB device", EMsgType.PASS);
+            throw new Exception("Open NS USB device\n         Returned: "+UsbErrorCodes.getErrCode(returningValue));
+    }
 
-        logPrinter.print("Free device list", EMsgType.INFO);
+    private void freeDeviceList(){
         LibUsb.freeDeviceList(deviceList, true);
+    }
+
+    private void setAutoDetachKernelDriver(){
+        // Actually, there are no drivers in Linux kernel which uses this device.
+        returningValue = LibUsb.setAutoDetachKernelDriver(handlerNS, true);
+        if (returningValue != LibUsb.SUCCESS)
+            logPrinter.print("Skip kernel driver attach & detach ("+UsbErrorCodes.getErrCode(returningValue)+")", EMsgType.INFO);
+    }
 
-        // DO some stuff to connected NS
-        // Actually, there are not drivers in Linux kernel that are using this device..
-        if (LibUsb.setAutoDetachKernelDriver(handlerNS, true) == LibUsb.SUCCESS)
-            logPrinter.print("Handle kernel driver attach & detach", EMsgType.PASS);
-        else
-            logPrinter.print("Skip kernel driver attach & detach", EMsgType.INFO);
     /*
-        // Reset device
+    private void resetDevice(){
         result = LibUsb.resetDevice(handlerNS);
-        if (result == 0)
-            logPrinter.print("Reset device", EMsgType.PASS);
-        else {
-            logPrinter.print("Reset device returned: " + result, EMsgType.FAIL);
-            updateAndClose();
-            return;
+        if (returningValue != LibUsb.SUCCESS)
+            throw new Exception("Reset device\n         Returned: "+UsbErrorCodes.getErrCode(returningValue));
     }
      */
-        if ( ! initForRCM){
-            // Set configuration (soft reset if needed)
-            result = LibUsb.setConfiguration(handlerNS, 1);     // 1 - configuration all we need
-            if (result != LibUsb.SUCCESS){
-                logPrinter.print("Set active configuration to device\n         Returned: "+UsbErrorCodes.getErrCode(result), EMsgType.FAIL);
-                close();
-                return;
-            }
-            logPrinter.print("Set active configuration to device.", EMsgType.PASS);
+    private void setConfiguration(int configuration) throws Exception{
+        returningValue = LibUsb.setConfiguration(handlerNS, configuration);
+        if (returningValue != LibUsb.SUCCESS)
+            throw new Exception("Set active configuration to device\n         Returned: "+UsbErrorCodes.getErrCode(returningValue));
     }
+    private void claimInterface() throws Exception{
         // Claim interface
-        result = LibUsb.claimInterface(handlerNS, DEFAULT_INTERFACE);
-        if (result != LibUsb.SUCCESS) {
-            logPrinter.print("Claim interface\n         Returned: "+UsbErrorCodes.getErrCode(result), EMsgType.FAIL);
-            close();
-            return;
-        }
-        logPrinter.print("Claim interface", EMsgType.PASS);
-
-        this.connected = true;
+        returningValue = LibUsb.claimInterface(handlerNS, DEFAULT_INTERFACE);
+        if (returningValue != LibUsb.SUCCESS)
+            throw new Exception("Claim interface\n         Returned: "+UsbErrorCodes.getErrCode(returningValue));
     }
 
     /**
@@ -174,11 +220,10 @@ public class UsbConnect {
         // Close handler in the end
         if (handlerNS != null) {
             // Try to release interface
-            int result = LibUsb.releaseInterface(handlerNS, DEFAULT_INTERFACE);
+            returningValue = LibUsb.releaseInterface(handlerNS, DEFAULT_INTERFACE);
 
-            if (result != LibUsb.SUCCESS)
-                logPrinter.print("Release interface" +
-                        "\n         Returned: "+result+" (sometimes it's not an issue)", EMsgType.WARNING);
+            if (returningValue != LibUsb.SUCCESS)
+                logPrinter.print("Release interface\n         Returned: "+returningValue+" (sometimes it's not an issue)", EMsgType.WARNING);
             else
                 logPrinter.print("Release interface", EMsgType.PASS);
 

src/main/java/nsusbloader/COM/USB/UsbErrorCodes.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.COM.USB;
 
 import org.usb4java.LibUsb;

src/main/java/nsusbloader/Controllers/FrontController.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Controllers;
 
 import javafx.collections.FXCollections;

src/main/java/nsusbloader/Controllers/NSLMainController.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Controllers;
 
 import javafx.application.HostServices;

src/main/java/nsusbloader/Controllers/NSLRowModel.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Controllers;
 
 import nsusbloader.NSLDataTypes.EFileStatus;

src/main/java/nsusbloader/Controllers/NSTableViewController.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko, wolfposd
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Controllers;
 
 import javafx.beans.binding.Bindings;

src/main/java/nsusbloader/Controllers/RcmController.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Controllers;
 
 import javafx.concurrent.Task;

src/main/java/nsusbloader/Controllers/SettingsController.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Controllers;
 
 import javafx.application.HostServices;

src/main/java/nsusbloader/Controllers/SplitMergeController.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Controllers;
 
 import javafx.concurrent.Task;

src/main/java/nsusbloader/Main.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader;
 
 /**

src/main/java/nsusbloader/MediatorControl.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader;
 
 import nsusbloader.Controllers.NSLMainController;

src/main/java/nsusbloader/ModelControllers/LogPrinter.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.ModelControllers;
 
 import nsusbloader.NSLDataTypes.EFileStatus;

src/main/java/nsusbloader/ModelControllers/MessagesConsumer.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.ModelControllers;
 
 import javafx.animation.AnimationTimer;

src/main/java/nsusbloader/ModelControllers/UpdatesChecker.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.ModelControllers;
 
 import javafx.concurrent.Task;

src/main/java/nsusbloader/NSLDataTypes/EFileStatus.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.NSLDataTypes;
 
 public enum EFileStatus {

src/main/java/nsusbloader/NSLDataTypes/EModule.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.NSLDataTypes;
 
 public enum EModule {

src/main/java/nsusbloader/NSLDataTypes/EMsgType.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.NSLDataTypes;
 
 public enum EMsgType {

src/main/java/nsusbloader/NSLMain.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader;
 
 import javafx.application.Application;
@@ -13,7 +31,7 @@ import java.util.ResourceBundle;
 
 public class NSLMain extends Application {
 
-    public static final String appVersion = "v2.1";
+    public static final String appVersion = "v2.2";
 
     @Override
     public void start(Stage primaryStage) throws Exception{

src/main/java/nsusbloader/RainbowHexDump.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader;
 
 import java.nio.charset.StandardCharsets;
@@ -16,7 +34,6 @@ public class RainbowHexDump {
     private static final String ANSI_CYAN = "\u001B[36m";
     private static final String ANSI_WHITE = "\u001B[37m";
 
-
     public static void hexDumpUTF8(byte[] byteArray){
         System.out.print(ANSI_BLUE);
         for (int i=0; i < byteArray.length; i++)

src/main/java/nsusbloader/ServiceWindow.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader;
 
 import javafx.scene.control.Alert;

src/main/java/nsusbloader/Utilities/JNIRcmLoader.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Utilities;
 
 import java.io.File;

src/main/java/nsusbloader/Utilities/RcmSmash.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Utilities;
 
 public class RcmSmash {

src/main/java/nsusbloader/Utilities/RcmTask.java

@@ -1,12 +1,28 @@
-package nsusbloader.Utilities;
 /*
- * Implementation of the 'Fusée Gelée' RCM payload that is inspired by 'fusee-launcher' application by ktemkin.
- * Definitely uses ideas and even some code.
- * Check original project: https://github.com/reswitched/fusee-launcher
- *
- * This code is not political. It could be used by anyone.
- * Find details in LICENSE file in the root directory of this project.
- **/
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+    --
+    Implementation of the 'Fusée Gelée' RCM payload that is inspired by 'fusee-launcher' application by ktemkin.
+    Definitely uses ideas and even some code.
+    Check original project: https://github.com/reswitched/fusee-launcher
+
+    This code is not political. It could be used by anyone.
+*/
+package nsusbloader.Utilities;
 
 import javafx.concurrent.Task;
 import nsusbloader.COM.USB.UsbConnect;
@@ -91,7 +107,7 @@ public class RcmTask extends Task<Boolean> {
         // =================
         // Bring up USB connection
 
-        UsbConnect usbConnect = new UsbConnect(logPrinter, true);
+        UsbConnect usbConnect = UsbConnect.connectRcmMode(logPrinter);
         
         if (! usbConnect.isConnected()){
             logPrinter.close();
@@ -147,8 +163,8 @@ public class RcmTask extends Task<Boolean> {
                 logPrinter.close();
                 return false;
             }
-            logPrinter.print(".:: Payload complete ::.", EMsgType.PASS);
         }
+        logPrinter.print(".:: Payload complete ::.", EMsgType.PASS);
 
         usbConnect.close();
         logPrinter.close();
@@ -271,39 +287,6 @@ public class RcmTask extends Task<Boolean> {
     boolean smashMacOS(){
         ByteBuffer writeBuffer = ByteBuffer.allocateDirect(28672);
         LibUsb.controlTransfer(handler, (byte) 0x82, LibUsb.REQUEST_GET_STATUS, (short) 0, (short) 0, writeBuffer, 1000); // Result doesn't matter.
-        logPrinter.print(".:: Payload complete ::.", EMsgType.PASS);
         return false;
     }
-
-    //*****************************************************************************************************************/
-    /*
-    private void writeTestFile(){
-        try {
-            File testFile = new File("/tmp/dmTests.bin");
-            BufferedOutputStream bos = new BufferedOutputStream(
-                    new FileOutputStream(testFile)
-            );
-            bos.write(fullPayload);
-            bos.close();
-        }
-        catch (Exception e){ e.printStackTrace(); }
-        // ------------------ TEST THIS p.2  ----------------------
-         writeUsbTest(fullPayload);
-    }
-
-    private boolean writeUsbTest(byte[] message){
-        for (int i=0; i < message.length / 0x1000 ;i++){
-            try {
-                File testFile = new File(String.format("/tmp/cnk_%02d.bin", i));
-                BufferedOutputStream bos = new BufferedOutputStream(
-                        new FileOutputStream(testFile)
-                );
-                bos.write(Arrays.copyOfRange(message, i*4096, (i+1)*4096));
-                bos.close();
-            }
-            catch (Exception e){ e.printStackTrace(); }
-        }
-        return false;
-    }
-     */
 }

src/main/java/nsusbloader/Utilities/SplitMergeTool.java

@@ -1,3 +1,21 @@
+/*
+    Copyright 2019-2020 Dmitry Isaenko
+
+    This file is part of NS-USBloader.
+
+    NS-USBloader is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NS-USBloader is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NS-USBloader.  If not, see <https://www.gnu.org/licenses/>.
+*/
 package nsusbloader.Utilities;
 
 import javafx.concurrent.Task;