Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-30 22:12:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LIBUSB]

Browse source 
- Check the device descriptor is valid
- Implement function to return max packet size

svn path=/trunk/; revision=55945
This commit is contained in:
Johannes Anderwald 2012-03-01 15:51:59 +00:00
parent f8a832a4ea
commit 3735fcc5cd
2 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/lib/drivers/libusb/common_interfaces.h
View file

@ -664,6 +664,13 @@ DECLARE_INTERFACE_(IUSBDevice, IUnknown)
virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) = 0;
//-----------------------------------------------------------------------------------------
//
// GetMaxPacketSize
//
// Description: aborts all pending requsts
virtual UCHAR GetMaxPacketSize() = 0;
};
typedef IUSBDevice *PUSBDEVICE;

31
reactos/lib/drivers/libusb/usb_device.cpp
View file

@ -54,6 +54,7 @@ public:
virtual NTSTATUS SelectConfiguration(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, IN PUSBD_INTERFACE_INFORMATION Interface, OUT USBD_CONFIGURATION_HANDLE *ConfigurationHandle);
virtual NTSTATUS SelectInterface(IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION Interface);
virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor);
virtual UCHAR GetMaxPacketSize();
// local function
@ -342,18 +343,31 @@ CUSBDevice::SetDeviceAddress(
// store new device address
m_DeviceAddress = DeviceAddress;
// check that setting device address succeeded by retrieving the device descriptor
// fetch device descriptor
Status = CreateDeviceDescriptor();
if (!NT_SUCCESS(Status))
{
// failed to retrieve device descriptor
DPRINT1("CUSBbDevice::SetDeviceAddress> failed to retrieve device descriptor with device address set Error %x\n", Status);
m_DeviceAddress = OldAddress;
// return error status
return Status;
}
// check for invalid device descriptor
if (m_DeviceDescriptor.bLength != sizeof(USB_DEVICE_DESCRIPTOR) ||
m_DeviceDescriptor.bDescriptorType != USB_DEVICE_DESCRIPTOR_TYPE ||
m_DeviceDescriptor.bNumConfigurations == 0)
{
// failed to retrieve device descriptor
DPRINT1("CUSBbDevice::SetDeviceAddress> device returned bogus device descriptor\n");
DumpDeviceDescriptor(&m_DeviceDescriptor);
// return error status
return STATUS_UNSUCCESSFUL;
}
// dump device descriptor
DumpDeviceDescriptor(&m_DeviceDescriptor);
// sanity checks
PC_ASSERT(m_DeviceDescriptor.bNumConfigurations);
@ -633,10 +647,9 @@ CUSBDevice::CreateDeviceDescriptor()
if (NT_SUCCESS(Status))
{
//
// informal dbg print
// copy device descriptor
//
RtlCopyMemory(&m_DeviceDescriptor, Buffer, sizeof(USB_DEVICE_DESCRIPTOR));
DumpDeviceDescriptor(&m_DeviceDescriptor);
}
//
@ -1211,6 +1224,12 @@ CUSBDevice::AbortPipe(
return m_Queue->AbortDevicePipe(m_DeviceAddress, EndpointDescriptor);
}
UCHAR
CUSBDevice::GetMaxPacketSize()
{
return m_DeviceDescriptor.bMaxPacketSize0;
}
//----------------------------------------------------------------------------------------
NTSTATUS