Skip to content

Commit 1a9078a

Browse files
committed
Further removal of previous CDCACM change
1 parent 49b0b2c commit 1a9078a

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

source/__version.id

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.115
1+
2.6.117

source/rtl/ultibo/core/globalconst.pas

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ interface
5252
{Global constants}
5353
const
5454
{Version constants}
55-
ULTIBO_RELEASE_DATE = '9 October 2025';
55+
ULTIBO_RELEASE_DATE = '10 October 2025';
5656
ULTIBO_RELEASE_NAME = 'Beetroot';
57-
ULTIBO_RELEASE_VERSION = '2.6.115';
57+
ULTIBO_RELEASE_VERSION = '2.6.117';
5858
ULTIBO_RELEASE_VERSION_MAJOR = 2;
5959
ULTIBO_RELEASE_VERSION_MINOR = 6;
60-
ULTIBO_RELEASE_VERSION_REVISION = 115;
60+
ULTIBO_RELEASE_VERSION_REVISION = 117;
6161

6262
FPC_COMPILER_VERSION = {$I %FPCVERSION%}; {The version of FPC used to compile the RTL}
6363

source/rtl/ultibo/drivers/usbcdcacm.pas

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -472,11 +472,11 @@ function CDCACMSerialDeviceOpen(Serial:PSerialDevice;BaudRate,DataBits,StopBits,
472472
end;
473473

474474
{Get Line Coding} {May cause failures with some devices}
475-
{if CDCACMGetLineRequest(PCDCACMDevice(Serial),LineCoding) <> USB_STATUS_SUCCESS then
475+
(*if CDCACMGetLineRequest(PCDCACMDevice(Serial),LineCoding) <> USB_STATUS_SUCCESS then
476476
begin
477477
Result:=ERROR_OPERATION_FAILED;
478478
Exit;
479-
end;}
479+
end;*)
480480

481481
{Setup Line Coding}
482482
FillChar(LineCoding,SizeOf(TUSBCDCLineCoding),0);
@@ -1301,15 +1301,15 @@ function CDCACMDriverBind(Device:PUSBDevice;Interrface:PUSBInterface):LongWord;
13011301
end;
13021302
end;
13031303

1304-
{Set Interface}
1305-
if USBDeviceSetInterface(Device,DataInterface.Descriptor.bInterfaceNumber,DataInterface.Descriptor.bAlternateSetting) <> USB_STATUS_SUCCESS then
1304+
{Set Interface} {May cause failures with some devices}
1305+
(*if USBDeviceSetInterface(Device,DataInterface.Descriptor.bInterfaceNumber,DataInterface.Descriptor.bAlternateSetting) <> USB_STATUS_SUCCESS then
13061306
begin
13071307
if USB_LOG_ENABLED then USBLogError(Device,'CDC ACM: Failed to set interface alternate setting');
13081308
13091309
{Return Result}
13101310
Result:=USB_STATUS_DEVICE_UNSUPPORTED;
13111311
Exit;
1312-
end;
1312+
end;*)
13131313

13141314
{USB device reset not required because the USB core already did a reset on the port during attach}
13151315

0 commit comments

Comments
 (0)