mirrors/ns-usbloader
1
0
Fork 0
mirror of https://github.com/developersu/ns-usbloader.git synced 2025-05-13 14:44:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

development release: Using usb4java 1.2.0 to check if it works @ macOS 'High Sierra'

Browse source
This commit is contained in:
Dmitry Isaenko 2019-03-13 17:04:14 +03:00
parent d1b3067575
commit bda316abbb
3 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/nsusbloader/UsbCommunications.java
View file

@ -114,19 +114,17 @@ public class UsbCommunications extends Task<Void> {
switch (result){
case 0:
System.out.println("SUCCES");
System.out.println("\n"+configDescriptor.dump());
printLog("DBG: getActiveConfigDescriptor\n"+configDescriptor.dump(), EMsgType.PASS);
break;
case LibUsb.ERROR_NOT_FOUND:
System.out.println("ERROR_NOT_FOUND "+result);
printLog("DBG: getActiveConfigDescriptor: ERROR_NOT_FOUND", EMsgType.FAIL);
break;
default:
System.out.println("UNKNOWN "+result);
printLog("DBG: getActiveConfigDescriptor: "+result, EMsgType.FAIL);
break;
}
System.out.println();
//LibUsb.freeConfigDescriptor(configDescriptor);
LibUsb.freeConfigDescriptor(configDescriptor);
//*/
/*
* So what did we learn?
@ -228,6 +226,7 @@ public class UsbCommunications extends Task<Void> {
}
else
printLog("libusb doesn't supports function 'CAP_SUPPORTS_DETACH_KERNEL_DRIVER'. Proceeding.", EMsgType.WARNING);
/*
// Reset device
result = LibUsb.resetDevice(handlerNS);
if (result == 0)
@ -237,6 +236,7 @@ public class UsbCommunications extends Task<Void> {
close();
return null;
}
*/
// Set configuration (soft reset if needed)
result = LibUsb.setConfiguration(handlerNS, 1); // 1 - configuration all we need
if (result != LibUsb.SUCCESS){
@ -264,27 +264,6 @@ public class UsbCommunications extends Task<Void> {
printLog("Set active configuration to device.", EMsgType.PASS);
}
////////////////////////////////////////// DEBUG INFORMATION START ///////////////////////////////////////////
//
ConfigDescriptor configDescriptor = new ConfigDescriptor();
//result = LibUsb.getConfigDescriptor(deviceNS, (byte)0x01, configDescriptor);
result = LibUsb.getActiveConfigDescriptor(deviceNS, configDescriptor);
switch (result){
case 0:
printLog("DBG: getActiveConfigDescriptor\n"+configDescriptor.dump(), EMsgType.PASS);
break;
case LibUsb.ERROR_NOT_FOUND:
printLog("DBG: getActiveConfigDescriptor: ERROR_NOT_FOUND", EMsgType.FAIL);
break;
default:
printLog("DBG: getActiveConfigDescriptor: "+result, EMsgType.FAIL);
break;
}
LibUsb.freeConfigDescriptor(configDescriptor);
//*/
////////////////////////////////////////// DEBUG INFORMATION END //////////////////////////////////////////////
// Claim interface
result = LibUsb.claimInterface(handlerNS, DEFAULT_INTERFACE);
if (result != LibUsb.SUCCESS) {