diff --git a/.gitattributes b/.gitattributes index f90968c..be5295e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,6 +11,8 @@ .json text .license text +packages.lock.json linguist-generated + *.md text *.txt text diff --git a/Directory.Packages.props b/Directory.Packages.props index 8624e76..0c2fae0 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-3.0-only - + diff --git a/UnitTests/packages.lock.json b/UnitTests/packages.lock.json index 5a82b45..66b7f6c 100644 --- a/UnitTests/packages.lock.json +++ b/UnitTests/packages.lock.json @@ -43,9 +43,9 @@ }, "Microsoft.Windows.CsWin32": { "type": "Direct", - "requested": "[0.3.287, )", - "resolved": "0.3.287", - "contentHash": "4CUt0++zGiWsiD37wKQeFOQSvv1TK3FurvdWvcExAjMctnBWCG0WtNMyYVLNbyGa81eRUzY7milANwJUu3QcsA==", + "requested": "[0.3.298, )", + "resolved": "0.3.298", + "contentHash": "moz/CojV5HSeJYV9pNVE6mWMKnJGvPgdD31EhBLyUJ8Ui06PBrH9oPFK1ljXbJJMM4EzKnkE1a0AtBbH1BHDGA==", "dependencies": { "Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha", "Microsoft.Windows.SDK.Win32Metadata": "70.0.11-preview", diff --git a/Usbipd/AttachedEndpoint.cs b/Usbipd/AttachedEndpoint.cs index 69f0a84..c19f765 100644 --- a/Usbipd/AttachedEndpoint.cs +++ b/Usbipd/AttachedEndpoint.cs @@ -274,7 +274,7 @@ sealed class AttachedEndpoint // VBoxUsb needs this to get the endpoint handles var setConfig = new UsbSupSetConfig() { - bConfigurationValue = submit.setup.wValue.Anonymous.LowByte, + bConfigurationValue = submit.setup.wValue.LowByte, }; if (Logger.IsEnabled(LogLevel.Debug)) { @@ -290,8 +290,8 @@ sealed class AttachedEndpoint // VBoxUsb needs this to get the endpoint handles var selectInterface = new UsbSupSelectInterface() { - bInterfaceNumber = submit.setup.wIndex.Anonymous.LowByte, - bAlternateSetting = submit.setup.wValue.Anonymous.LowByte, + bInterfaceNumber = submit.setup.wIndex.LowByte, + bAlternateSetting = submit.setup.wValue.LowByte, }; if (Logger.IsEnabled(LogLevel.Debug)) { @@ -308,7 +308,7 @@ sealed class AttachedEndpoint // VBoxUsb needs this to notify the host controller var clearEndpoint = new UsbSupClearEndpoint() { - bEndpoint = submit.setup.wIndex.Anonymous.LowByte, + bEndpoint = submit.setup.wIndex.LowByte, }; if (Logger.IsEnabled(LogLevel.Debug)) { @@ -358,7 +358,7 @@ sealed class AttachedEndpoint if ((basic.ep == 0) && (submit.setup.bmRequestType.B == (PInvoke.BMREQUEST_TO_DEVICE | (PInvoke.BMREQUEST_DEVICE_TO_HOST << 7))) && (submit.setup.bRequest == PInvoke.USB_REQUEST_GET_DESCRIPTOR) - && (submit.setup.wValue.Anonymous.HiByte == PInvoke.USB_CONFIGURATION_DESCRIPTOR_TYPE)) + && (submit.setup.wValue.HiByte == PInvoke.USB_CONFIGURATION_DESCRIPTOR_TYPE)) { try { diff --git a/Usbipd/ExportedDevice.cs b/Usbipd/ExportedDevice.cs index 0e9d96f..c723538 100644 --- a/Usbipd/ExportedDevice.cs +++ b/Usbipd/ExportedDevice.cs @@ -168,16 +168,16 @@ sealed record ExportedDevice(string InstanceId, BusId BusId, Linux.UsbDeviceSpee ConnectionIndex = device.BusId.Value.Port, Length = (uint)Unsafe.SizeOf(), }; - data2.SupportedUsbProtocols.Anonymous.Usb110 = true; - data2.SupportedUsbProtocols.Anonymous.Usb200 = true; - data2.SupportedUsbProtocols.Anonymous.Usb300 = true; + data2.SupportedUsbProtocols.Usb110 = true; + data2.SupportedUsbProtocols.Usb200 = true; + data2.SupportedUsbProtocols.Usb300 = true; var buf2 = StructToBytes(data2); _ = await hubFile.IoControlAsync(PInvoke.IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX_V2, buf2, buf2); BytesToStruct(buf2, out data2); - if (data2.SupportedUsbProtocols.Anonymous.Usb300) + if (data2.SupportedUsbProtocols.Usb300) { - if (data2.Flags.Anonymous.DeviceIsOperatingAtSuperSpeedPlusOrHigher) + if (data2.Flags.DeviceIsOperatingAtSuperSpeedPlusOrHigher) { // NOTE: Linux vhci_hcd supports USB_SPEED_SUPER_PLUS since kernel version 6.12. // See: https://elixir.bootlin.com/linux/v6.12/source/drivers/usb/usbip/vhci_sysfs.c#L286 @@ -188,7 +188,7 @@ sealed record ExportedDevice(string InstanceId, BusId BusId, Linux.UsbDeviceSpee // speed = Linux.UsbDeviceSpeed.USB_SPEED_SUPER_PLUS; speed = Linux.UsbDeviceSpeed.USB_SPEED_SUPER; } - else if (data2.Flags.Anonymous.DeviceIsOperatingAtSuperSpeedOrHigher) + else if (data2.Flags.DeviceIsOperatingAtSuperSpeedOrHigher) { speed = Linux.UsbDeviceSpeed.USB_SPEED_SUPER; } diff --git a/Usbipd/packages.lock.json b/Usbipd/packages.lock.json index 27eeab2..96cfccd 100644 --- a/Usbipd/packages.lock.json +++ b/Usbipd/packages.lock.json @@ -33,9 +33,9 @@ }, "Microsoft.Windows.CsWin32": { "type": "Direct", - "requested": "[0.3.287, )", - "resolved": "0.3.287", - "contentHash": "4CUt0++zGiWsiD37wKQeFOQSvv1TK3FurvdWvcExAjMctnBWCG0WtNMyYVLNbyGa81eRUzY7milANwJUu3QcsA==", + "requested": "[0.3.298, )", + "resolved": "0.3.298", + "contentHash": "moz/CojV5HSeJYV9pNVE6mWMKnJGvPgdD31EhBLyUJ8Ui06PBrH9oPFK1ljXbJJMM4EzKnkE1a0AtBbH1BHDGA==", "dependencies": { "Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha", "Microsoft.Windows.SDK.Win32Metadata": "70.0.11-preview",