Merge pull request #61 from davidgfnet/master

Minor fixes and changes for the PC side software

Author: sharkwouter

.github/workflows/compilation.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Set up Cygwin
         uses: egor-tensin/setup-cygwin@v4
         with:
-          packages: gcc-core gcc-g++ make libreadline8 libreadline-devel libusb1.0 libusb1.0-devel libncursesw10
+          packages: gcc-core gcc-g++ make libreadline8 libreadline-devel libusb1.0 libusb1.0-devel
 
       - name: Compile project
         run: |
@@ -49,12 +49,15 @@ jobs:
           mkdir build
           cp usbhostfs_pc\usbhostfs_pc.exe build
           cp pspsh\pspsh.exe build
-          cp C:\tools\cygwin\bin\cygwin1.dll build
-          cp C:\tools\cygwin\bin\cygstdc++-6.dll build
-          cp C:\tools\cygwin\bin\cyggcc_s-seh-1.dll build
-          cp C:\tools\cygwin\bin\cygreadline8.dll build
-          cp C:\tools\cygwin\bin\cygusb-1.0.dll build
-          cp C:\tools\cygwin\bin\cygncursesw-10.dll build
+
+      - name: Collect and copy Cygwin DLL dependencies
+        shell: C:\tools\cygwin\bin\bash.exe --norc -eo pipefail -o igncr '{0}'
+        run: |
+          for exe in build/usbhostfs_pc.exe build/pspsh.exe; do
+            cygcheck "$exe" | grep -E '\.dll$' | grep "\\\\cyg" | while read -r dll; do
+              [[ -f "$dll" ]] && cp "$dll" build/
+            done
+          done
 
       - name: Upload artifacts
         if: ${{ success() }}

usbhostfs_pc/main.c

@@ -58,6 +58,8 @@
 #define MAX_TOKENS 256
 
 #define BASE_PORT 10000
+#define USB_CONFIG_NUM 1
+#define USB_IFACE_NUM  0
 
 #ifdef __CYGWIN__
 #define USB_TIMEOUT 1000
@@ -272,14 +274,25 @@ libusb_device_handle *open_device(libusb_device *usbdev)
 		return NULL;
 	}
 	if (!r) {
-		r = libusb_set_configuration(ret, 1);
+		int cfgn;
+		r = libusb_get_configuration(ret, &cfgn);
 		if (r) {
 			seteuid(getuid());
 			setegid(getgid());
-			fprintf(stderr, "Failed at selecting USB configuration: %d\n", r);
+			fprintf(stderr, "Failed at reading selected USB configuration: %d\n", r);
 			return NULL;
 		}
-		r = libusb_claim_interface(ret, 0);
+		if (cfgn != USB_CONFIG_NUM)
+		{
+			r = libusb_set_configuration(ret, 1);
+			if (r) {
+				seteuid(getuid());
+				setegid(getgid());
+				fprintf(stderr, "Failed at selecting USB configuration: %d\n", r);
+				return NULL;
+			}
+		}
+		r = libusb_claim_interface(ret, USB_IFACE_NUM);
 		if (r) {
 			seteuid(getuid());
 			setegid(getgid());