Refactor API classes to support both, WinUsb and Legacy API
To support both, WinUsb and Legacy driver APIs we need to abstract classes that depend on driver API details and then implement two sets of the actual classes: one for WinUsb, and another for the Legacy drivers, so we can choose in runtime which objects should be instantiated, depending on what type of driver we have underneath this API.
This commit is contained in:
@@ -15,14 +15,12 @@
|
||||
*/
|
||||
|
||||
/** \file
|
||||
This file consists of implementation of class AdbIOObject that
|
||||
encapsulates an interface on our USB device.
|
||||
This file consists of implementation of class AdbEndpointObject that
|
||||
encapsulates a handle opened to an endpoint on our device.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "adb_endpoint_object.h"
|
||||
#include "adb_io_completion.h"
|
||||
#include "adb_helper_routines.h"
|
||||
|
||||
AdbEndpointObject::AdbEndpointObject(AdbInterfaceObject* parent_interf,
|
||||
UCHAR endpoint_id,
|
||||
@@ -96,126 +94,3 @@ bool AdbEndpointObject::SyncWrite(void* buffer,
|
||||
bytes_written,
|
||||
time_out);
|
||||
}
|
||||
|
||||
ADBAPIHANDLE AdbEndpointObject::CommonAsyncReadWrite(bool is_read,
|
||||
void* buffer,
|
||||
ULONG bytes_to_transfer,
|
||||
ULONG* bytes_transferred,
|
||||
HANDLE event_handle,
|
||||
ULONG time_out) {
|
||||
if (!SetTimeout(time_out))
|
||||
return false;
|
||||
|
||||
// Create completion i/o object
|
||||
AdbIOCompletion* adb_io_completion = NULL;
|
||||
|
||||
try {
|
||||
adb_io_completion = new AdbIOCompletion(this,
|
||||
bytes_to_transfer,
|
||||
event_handle);
|
||||
} catch (... ) {
|
||||
SetLastError(ERROR_OUTOFMEMORY);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Create a handle for it
|
||||
ADBAPIHANDLE ret = adb_io_completion->CreateHandle();
|
||||
ULONG transferred = 0;
|
||||
if (NULL != ret) {
|
||||
BOOL res = TRUE;
|
||||
// Go the read / write file way
|
||||
res = is_read ?
|
||||
WinUsb_ReadPipe(parent_interface()->winusb_handle(),
|
||||
endpoint_id(),
|
||||
reinterpret_cast<PUCHAR>(buffer),
|
||||
bytes_to_transfer,
|
||||
&transferred,
|
||||
adb_io_completion->overlapped()) :
|
||||
WinUsb_WritePipe(parent_interface()->winusb_handle(),
|
||||
endpoint_id(),
|
||||
reinterpret_cast<PUCHAR>(buffer),
|
||||
bytes_to_transfer,
|
||||
&transferred,
|
||||
adb_io_completion->overlapped());
|
||||
|
||||
if (NULL != bytes_transferred)
|
||||
*bytes_transferred = transferred;
|
||||
|
||||
ULONG error = GetLastError();
|
||||
if (!res && (ERROR_IO_PENDING != error)) {
|
||||
// I/O failed immediatelly. We need to close i/o completion object
|
||||
// before we return NULL to the caller.
|
||||
adb_io_completion->CloseHandle();
|
||||
ret = NULL;
|
||||
SetLastError(error);
|
||||
}
|
||||
}
|
||||
|
||||
// Offseting 'new'
|
||||
adb_io_completion->Release();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool AdbEndpointObject::CommonSyncReadWrite(bool is_read,
|
||||
void* buffer,
|
||||
ULONG bytes_to_transfer,
|
||||
ULONG* bytes_transferred,
|
||||
ULONG time_out) {
|
||||
if (!SetTimeout(time_out))
|
||||
return false;
|
||||
|
||||
// This is synchronous I/O. Since we always open I/O items for
|
||||
// overlapped I/O we're obligated to always provide OVERLAPPED
|
||||
// structure to read / write routines. Prepare it now.
|
||||
OVERLAPPED overlapped;
|
||||
ZeroMemory(&overlapped, sizeof(overlapped));
|
||||
overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
|
||||
|
||||
BOOL ret = TRUE;
|
||||
ULONG transferred = 0;
|
||||
// Go the read / write file way
|
||||
ret = is_read ?
|
||||
WinUsb_ReadPipe(parent_interface()->winusb_handle(),
|
||||
endpoint_id(),
|
||||
reinterpret_cast<PUCHAR>(buffer),
|
||||
bytes_to_transfer,
|
||||
&transferred,
|
||||
&overlapped) :
|
||||
WinUsb_WritePipe(parent_interface()->winusb_handle(),
|
||||
endpoint_id(),
|
||||
reinterpret_cast<PUCHAR>(buffer),
|
||||
bytes_to_transfer,
|
||||
&transferred,
|
||||
&overlapped);
|
||||
|
||||
// Lets see the result
|
||||
if (!ret && (ERROR_IO_PENDING != GetLastError())) {
|
||||
// I/O failed.
|
||||
if (NULL != overlapped.hEvent)
|
||||
::CloseHandle(overlapped.hEvent);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Lets wait till I/O completes
|
||||
ret = WinUsb_GetOverlappedResult(parent_interface()->winusb_handle(), &overlapped,
|
||||
&transferred, TRUE);
|
||||
if (ret && (NULL != bytes_transferred)) {
|
||||
*bytes_transferred = transferred;
|
||||
}
|
||||
|
||||
if (NULL != overlapped.hEvent)
|
||||
::CloseHandle(overlapped.hEvent);
|
||||
|
||||
return ret ? true : false;
|
||||
}
|
||||
|
||||
bool AdbEndpointObject::SetTimeout(ULONG timeout) {
|
||||
if (!WinUsb_SetPipePolicy(parent_interface()->winusb_handle(),
|
||||
endpoint_id(), PIPE_TRANSFER_TIMEOUT,
|
||||
sizeof(ULONG), &timeout)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user