mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix data write on usb channel

Browse Source
This commit is contained in:
Armin Novak 2021-06-22 14:30:46 +02:00 committed by akallabeth
parent a22bd407b0
commit 34413d9480
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
channels/urbdrc/client/data_transfer.c
View File

@ -724,9 +724,10 @@ static UINT urb_bulk_or_interrupt_transfer(IUDEVICE* pdev, URBDRC_CHANNEL_CALLBA
Stream_Read_UINT32(s, OutputBufferSize); Stream_Read_UINT32(s, OutputBufferSize);
EndpointAddress = (PipeHandle & 0x000000ff); EndpointAddress = (PipeHandle & 0x000000ff);
/** process TS_URB_BULK_OR_INTERRUPT_TRANSFER */ /** process TS_URB_BULK_OR_INTERRUPT_TRANSFER */
return pdev->bulk_or_interrupt_transfer(pdev, callback, MessageId, RequestId, EndpointAddress, return pdev->bulk_or_interrupt_transfer(
TransferFlags, noAck, OutputBufferSize, pdev, callback, MessageId, RequestId, EndpointAddress, TransferFlags, noAck,
urb_bulk_transfer_cb, 10000); OutputBufferSize, (transferDir == USBD_TRANSFER_DIRECTION_OUT) ? Stream_Pointer(s) : NULL,
urb_bulk_transfer_cb, 10000);
} }
static void urb_isoch_transfer_cb(IUDEVICE* pdev, URBDRC_CHANNEL_CALLBACK* callback, wStream* out, static void urb_isoch_transfer_cb(IUDEVICE* pdev, URBDRC_CHANNEL_CALLBACK* callback, wStream* out,

26
channels/urbdrc/client/libusb/libusb_udevice.c
View File

@ -200,8 +200,8 @@ const char* usb_interface_class_to_string(uint8_t class)
static ASYNC_TRANSFER_USER_DATA* async_transfer_user_data_new(IUDEVICE* idev, UINT32 MessageId, static ASYNC_TRANSFER_USER_DATA* async_transfer_user_data_new(IUDEVICE* idev, UINT32 MessageId,
size_t offset, size_t BufferSize, size_t offset, size_t BufferSize,
size_t packetSize, BOOL NoAck, const BYTE* data, size_t packetSize,
t_isoch_transfer_cb cb, BOOL NoAck, t_isoch_transfer_cb cb,
URBDRC_CHANNEL_CALLBACK* callback) URBDRC_CHANNEL_CALLBACK* callback)
{ {
ASYNC_TRANSFER_USER_DATA* user_data = calloc(1, sizeof(ASYNC_TRANSFER_USER_DATA)); ASYNC_TRANSFER_USER_DATA* user_data = calloc(1, sizeof(ASYNC_TRANSFER_USER_DATA));
@ -217,14 +217,19 @@ static ASYNC_TRANSFER_USER_DATA* async_transfer_user_data_new(IUDEVICE* idev, UI
free(user_data); free(user_data);
return NULL; return NULL;
} }
Stream_Seek(user_data->data, offset); /* Skip header offset */ Stream_Seek(user_data->data, offset); /* Skip header offset */
if (data)
memcpy(Stream_Pointer(user_data->data), data, BufferSize);
else
user_data->OutputBufferSize = BufferSize;
user_data->noack = NoAck; user_data->noack = NoAck;
user_data->cb = cb; user_data->cb = cb;
user_data->callback = callback; user_data->callback = callback;
user_data->idev = idev; user_data->idev = idev;
user_data->MessageId = MessageId; user_data->MessageId = MessageId;
user_data->OutputBufferSize = BufferSize;
user_data->queue = pdev->request_queue; user_data->queue = pdev->request_queue;
return user_data; return user_data;
@ -1204,8 +1209,8 @@ static int libusb_udev_isoch_transfer(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* c
return -1; return -1;
urbdrc = pdev->urbdrc; urbdrc = pdev->urbdrc;
user_data = async_transfer_user_data_new(idev, MessageId, 48, BufferSize, outSize + 1024, NoAck, user_data = async_transfer_user_data_new(idev, MessageId, 48, BufferSize, Buffer,
cb, callback); outSize + 1024, NoAck, cb, callback);
if (!user_data) if (!user_data)
return -1; return -1;
@ -1213,12 +1218,7 @@ static int libusb_udev_isoch_transfer(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* c
user_data->ErrorCount = ErrorCount; user_data->ErrorCount = ErrorCount;
user_data->StartFrame = StartFrame; user_data->StartFrame = StartFrame;
if (Buffer) /* We read data, prepare a bufffer */ if (!Buffer)
{
user_data->OutputBufferSize = 0;
memmove(Stream_Pointer(user_data->data), Buffer, BufferSize);
}
else
Stream_Seek(user_data->data, (NumberOfPackets * 12)); Stream_Seek(user_data->data, (NumberOfPackets * 12));
iso_packet_size = BufferSize / NumberOfPackets; iso_packet_size = BufferSize / NumberOfPackets;
@ -1277,7 +1277,7 @@ static BOOL libusb_udev_control_transfer(IUDEVICE* idev, UINT32 RequestId, UINT3
static int libusb_udev_bulk_or_interrupt_transfer(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* callback, static int libusb_udev_bulk_or_interrupt_transfer(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* callback,
UINT32 MessageId, UINT32 RequestId, UINT32 MessageId, UINT32 RequestId,
UINT32 EndpointAddress, UINT32 TransferFlags, UINT32 EndpointAddress, UINT32 TransferFlags,
BOOL NoAck, UINT32 BufferSize, BOOL NoAck, UINT32 BufferSize, const BYTE* data,
t_isoch_transfer_cb cb, UINT32 Timeout) t_isoch_transfer_cb cb, UINT32 Timeout)
{ {
UINT32 transfer_type; UINT32 transfer_type;
@ -1293,7 +1293,7 @@ static int libusb_udev_bulk_or_interrupt_transfer(IUDEVICE* idev, URBDRC_CHANNEL
urbdrc = pdev->urbdrc; urbdrc = pdev->urbdrc;
user_data = user_data =
async_transfer_user_data_new(idev, MessageId, 36, BufferSize, 0, NoAck, cb, callback); async_transfer_user_data_new(idev, MessageId, 36, BufferSize, data, 0, NoAck, cb, callback);
if (!user_data) if (!user_data)
return -1; return -1;

2
channels/urbdrc/client/urbdrc_main.h
View File

@ -134,7 +134,7 @@ struct _IUDEVICE
int (*bulk_or_interrupt_transfer)(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* callback, int (*bulk_or_interrupt_transfer)(IUDEVICE* idev, URBDRC_CHANNEL_CALLBACK* callback,
UINT32 MessageId, UINT32 RequestId, UINT32 EndpointAddress, UINT32 MessageId, UINT32 RequestId, UINT32 EndpointAddress,
UINT32 TransferFlags, BOOL NoAck, UINT32 BufferSize, UINT32 TransferFlags, BOOL NoAck, UINT32 BufferSize,
t_isoch_transfer_cb cb, UINT32 Timeout); const BYTE* data, t_isoch_transfer_cb cb, UINT32 Timeout);
int (*select_configuration)(IUDEVICE* idev, UINT32 bConfigurationValue); int (*select_configuration)(IUDEVICE* idev, UINT32 bConfigurationValue);