[haiku-development] Re: Proposal to add the USBKit to the DeviceKit
- From: "François Revol" <revol@xxxxxxx>
- To: haiku-development@xxxxxxxxxxxxx
- Date: Mon, 07 Apr 2008 22:44:12 +0200 CEST
> On Mon, 07 Apr 2008 19:52:18 +0200 CEST, François Revol wrote
> > Also, the usb_raw header should be made public too (and cleaned up,
> > I've a pending commit on that but as you are touching it...). The
> > driver cookie struct should be moved out of it, and the names
> > should
> > be B_ised.
>
> Well I'm not to fond of making this protocol public in fact. Anyway
> what
> cleanup are you referring to? It'd be nice if you could send me a
> patch so I
> can check that first. It would be nice if we could keep it compatible
> with the
> existing applications that used USBKit.a and so far anything that was
> added
> didn't really require to break that compatibility.
I don't mean breaking binary compat.
Just make names saner for public, like B_USB_RAW_* for ioctls and
prefix the struct as well.
Also the driver cookie struct (the last one) has no use there, it's
perfect in usb_raw.c alone, and this way we can remove <lock.h>.
.. ah, that'd done already. Hmm there is absolutely no reason to have a
usb_raw_private.h only for a struct btw, it's only of use to
usb_raw.cpp!
Also, when !__HAIKU__ it should probably include <USB.h> instead for
BeOS.
It shouldn't impair people using the Haiku stack on BeOS, but allows
building on BeOS with this single header.
François.
Index: src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp
===================================================================
--- src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp (revision 24860)
+++ src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp (working copy)
@@ -175,22 +175,22 @@
switch (status) {
case B_OK:
- device->status = RAW_STATUS_SUCCESS;
+ device->status = B_USB_RAW_STATUS_SUCCESS;
break;
case B_TIMED_OUT:
- device->status = RAW_STATUS_TIMEOUT;
+ device->status = B_USB_RAW_STATUS_TIMEOUT;
break;
case B_CANCELED:
- device->status = RAW_STATUS_ABORTED;
+ device->status = B_USB_RAW_STATUS_ABORTED;
break;
case B_DEV_CRC_ERROR:
- device->status = RAW_STATUS_CRC_ERROR;
+ device->status = B_USB_RAW_STATUS_CRC_ERROR;
break;
case B_DEV_STALLED:
- device->status = RAW_STATUS_STALLED;
+ device->status = B_USB_RAW_STATUS_STALLED;
break;
default:
- device->status = RAW_STATUS_FAILED;
+ device->status = B_USB_RAW_STATUS_FAILED;
break;
}
@@ -204,199 +204,199 @@
{
TRACE((DRIVER_NAME": ioctl\n"));
raw_device *device = (raw_device *)cookie;
- raw_command *command = (raw_command *)buffer;
+ usb_raw_command *command = (usb_raw_command *)buffer;
if (device->device == 0)
return B_DEV_NOT_READY;
switch (op) {
- case RAW_COMMAND_GET_VERSION: {
+ case B_USB_RAW_COMMAND_GET_VERSION: {
command->version.status = DRIVER_VERSION;
return B_OK;
}
- case RAW_COMMAND_GET_DEVICE_DESCRIPTOR: {
+ case B_USB_RAW_COMMAND_GET_DEVICE_DESCRIPTOR: {
const usb_device_descriptor *deviceDescriptor =
gUSBModule->get_device_descriptor(device->device);
if (!deviceDescriptor) {
- command->device.status = RAW_STATUS_ABORTED;
+ command->device.status =
B_USB_RAW_STATUS_ABORTED;
return B_OK;
}
memcpy(command->device.descriptor, deviceDescriptor,
sizeof(usb_device_descriptor));
- command->device.status = RAW_STATUS_SUCCESS;
+ command->device.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_GET_CONFIGURATION_DESCRIPTOR: {
+ case B_USB_RAW_COMMAND_GET_CONFIGURATION_DESCRIPTOR: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_nth_configuration(device->device,
command->config.config_index);
if (!configurationInfo) {
- command->config.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->config.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
memcpy(command->config.descriptor,
configurationInfo->descr,
sizeof(usb_configuration_descriptor));
- command->config.status = RAW_STATUS_SUCCESS;
+ command->config.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_GET_INTERFACE_DESCRIPTOR: {
+ case B_USB_RAW_COMMAND_GET_INTERFACE_DESCRIPTOR: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_nth_configuration(device->device,
command->interface.config_index);
if (!configurationInfo) {
- command->interface.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->interface.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
if (command->interface.interface_index >=
configurationInfo->interface_count) {
- command->interface.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->interface.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
const usb_interface_info *interfaceInfo =
configurationInfo->interface[command->interface.interface_index].active;
if (!interfaceInfo) {
- command->interface.status = RAW_STATUS_ABORTED;
+ command->interface.status =
B_USB_RAW_STATUS_ABORTED;
return B_OK;
}
memcpy(command->interface.descriptor,
interfaceInfo->descr,
sizeof(usb_interface_descriptor));
- command->interface.status = RAW_STATUS_SUCCESS;
+ command->interface.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_GET_ALT_INTERFACE_COUNT: {
+ case B_USB_RAW_COMMAND_GET_ALT_INTERFACE_COUNT: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_nth_configuration(device->device,
command->alternate.config_index);
if (!configurationInfo) {
- command->alternate.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->alternate.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
if (command->alternate.interface_index >=
configurationInfo->interface_count) {
- command->alternate.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->alternate.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
*command->alternate.alternate_count
=
configurationInfo->interface[command->alternate.interface_index].alt_count;
- command->alternate.status = RAW_STATUS_SUCCESS;
+ command->alternate.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_GET_ALT_INTERFACE_DESCRIPTOR: {
+ case B_USB_RAW_COMMAND_GET_ALT_INTERFACE_DESCRIPTOR: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_nth_configuration(device->device,
command->alternate.config_index);
if (!configurationInfo) {
- command->alternate.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->alternate.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
if (command->alternate.interface_index >=
configurationInfo->interface_count) {
- command->alternate.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->alternate.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
const usb_interface_list *interfaceList =
&configurationInfo->interface[command->alternate.interface_index];
if (command->alternate.alternate_index >=
interfaceList->alt_count) {
- command->alternate.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->alternate.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
memcpy(command->alternate.descriptor,
&interfaceList->alt[command->alternate.alternate_index],
sizeof(usb_interface_descriptor));
- command->alternate.status = RAW_STATUS_SUCCESS;
+ command->alternate.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_GET_ENDPOINT_DESCRIPTOR: {
+ case B_USB_RAW_COMMAND_GET_ENDPOINT_DESCRIPTOR: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_nth_configuration(device->device,
command->endpoint.config_index);
if (!configurationInfo) {
- command->endpoint.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->endpoint.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
if (command->endpoint.interface_index >=
configurationInfo->interface_count) {
- command->endpoint.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->endpoint.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
const usb_interface_info *interfaceInfo =
configurationInfo->interface[command->endpoint.interface_index].active;
if (!interfaceInfo) {
- command->endpoint.status = RAW_STATUS_ABORTED;
+ command->endpoint.status =
B_USB_RAW_STATUS_ABORTED;
return B_OK;
}
if (command->endpoint.endpoint_index >=
interfaceInfo->endpoint_count) {
- command->endpoint.status =
RAW_STATUS_INVALID_ENDPOINT;
+ command->endpoint.status =
B_USB_RAW_STATUS_INVALID_ENDPOINT;
return B_OK;
}
memcpy(command->endpoint.descriptor,
interfaceInfo->endpoint[command->endpoint.endpoint_index].descr,
sizeof(usb_endpoint_descriptor));
- command->endpoint.status = RAW_STATUS_SUCCESS;
+ command->endpoint.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_GET_GENERIC_DESCRIPTOR: {
+ case B_USB_RAW_COMMAND_GET_GENERIC_DESCRIPTOR: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_nth_configuration(device->device,
command->generic.config_index);
if (!configurationInfo) {
- command->generic.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->generic.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
if (command->generic.interface_index >=
configurationInfo->interface_count) {
- command->generic.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->generic.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
const usb_interface_info *interfaceInfo =
configurationInfo->interface[command->generic.interface_index].active;
if (!interfaceInfo) {
- command->generic.status = RAW_STATUS_ABORTED;
+ command->generic.status =
B_USB_RAW_STATUS_ABORTED;
return B_OK;
}
if (command->generic.generic_index >=
interfaceInfo->generic_count) {
- // ToDo: add RAW_STATUS_INVALID_GENERIC
- command->generic.status =
RAW_STATUS_INVALID_ENDPOINT;
+ // ToDo: add B_USB_RAW_STATUS_INVALID_GENERIC
+ command->generic.status =
B_USB_RAW_STATUS_INVALID_ENDPOINT;
return B_OK;
}
usb_descriptor *descriptor =
interfaceInfo->generic[command->generic.generic_index];
if (!descriptor) {
- command->generic.status = RAW_STATUS_ABORTED;
+ command->generic.status =
B_USB_RAW_STATUS_ABORTED;
return B_OK;
}
if (descriptor->generic.length >
command->generic.length) {
- command->generic.status = RAW_STATUS_NO_MEMORY;
+ command->generic.status =
B_USB_RAW_STATUS_NO_MEMORY;
return B_OK;
}
memcpy(command->generic.descriptor, descriptor,
descriptor->generic.length);
- command->generic.status = RAW_STATUS_SUCCESS;
+ command->generic.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_GET_STRING_DESCRIPTOR: {
+ case B_USB_RAW_COMMAND_GET_STRING_DESCRIPTOR: {
size_t actualLength = 0;
uint8 firstTwoBytes[2];
@@ -405,7 +405,7 @@
firstTwoBytes, 2, &actualLength) < B_OK
|| actualLength != 2
|| firstTwoBytes[1] != USB_DESCRIPTOR_STRING) {
- command->string.status = RAW_STATUS_ABORTED;
+ command->string.status =
B_USB_RAW_STATUS_ABORTED;
command->string.length = 0;
return B_OK;
}
@@ -413,7 +413,7 @@
uint8 stringLength = MIN(firstTwoBytes[0],
command->string.length);
char *string = (char *)malloc(stringLength);
if (!string) {
- command->string.status = RAW_STATUS_ABORTED;
+ command->string.status =
B_USB_RAW_STATUS_ABORTED;
command->string.length = 0;
return B_NO_MEMORY;
}
@@ -422,20 +422,20 @@
USB_DESCRIPTOR_STRING,
command->string.string_index, 0,
string, stringLength, &actualLength) < B_OK
|| actualLength != stringLength) {
- command->string.status = RAW_STATUS_ABORTED;
+ command->string.status =
B_USB_RAW_STATUS_ABORTED;
command->string.length = 0;
free(string);
return B_OK;
}
memcpy(command->string.descriptor, string,
stringLength);
- command->string.status = RAW_STATUS_SUCCESS;
+ command->string.status = B_USB_RAW_STATUS_SUCCESS;
command->string.length = stringLength;
free(string);
return B_OK;
}
- case RAW_COMMAND_GET_DESCRIPTOR: {
+ case B_USB_RAW_COMMAND_GET_DESCRIPTOR: {
size_t actualLength = 0;
uint8 firstTwoBytes[2];
@@ -445,7 +445,7 @@
&actualLength) < B_OK
|| actualLength != 2
|| firstTwoBytes[1] !=
command->descriptor.type) {
- command->descriptor.status = RAW_STATUS_ABORTED;
+ command->descriptor.status =
B_USB_RAW_STATUS_ABORTED;
command->descriptor.length = 0;
return B_OK;
}
@@ -453,7 +453,7 @@
uint8 length = MIN(firstTwoBytes[0],
command->descriptor.length);
uint8 *buffer = (uint8 *)malloc(length);
if (!buffer) {
- command->descriptor.status = RAW_STATUS_ABORTED;
+ command->descriptor.status =
B_USB_RAW_STATUS_ABORTED;
command->descriptor.length = 0;
return B_NO_MEMORY;
}
@@ -463,77 +463,77 @@
command->descriptor.language_id, buffer, length,
&actualLength) < B_OK
|| actualLength != length) {
- command->descriptor.status = RAW_STATUS_ABORTED;
+ command->descriptor.status =
B_USB_RAW_STATUS_ABORTED;
command->descriptor.length = 0;
free(buffer);
return B_OK;
}
memcpy(command->descriptor.data, buffer, length);
- command->descriptor.status = RAW_STATUS_SUCCESS;
+ command->descriptor.status = B_USB_RAW_STATUS_SUCCESS;
command->descriptor.length = length;
free(buffer);
return B_OK;
}
- case RAW_COMMAND_SET_CONFIGURATION: {
+ case B_USB_RAW_COMMAND_SET_CONFIGURATION: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_nth_configuration(device->device,
command->config.config_index);
if (!configurationInfo) {
- command->config.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->config.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
if (gUSBModule->set_configuration(device->device,
configurationInfo) < B_OK) {
- command->config.status = RAW_STATUS_FAILED;
+ command->config.status =
B_USB_RAW_STATUS_FAILED;
return B_OK;
}
- command->config.status = RAW_STATUS_SUCCESS;
+ command->config.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_SET_ALT_INTERFACE: {
+ case B_USB_RAW_COMMAND_SET_ALT_INTERFACE: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_nth_configuration(device->device,
command->alternate.config_index);
if (!configurationInfo) {
- command->alternate.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->alternate.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
if (command->alternate.interface_index >=
configurationInfo->interface_count) {
- command->alternate.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->alternate.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
const usb_interface_list *interfaceList =
&configurationInfo->interface[command->alternate.interface_index];
if (command->alternate.alternate_index >=
interfaceList->alt_count) {
- command->alternate.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->alternate.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
if (gUSBModule->set_alt_interface(device->device,
&interfaceList->alt[command->alternate.alternate_index]) < B_OK) {
- command->alternate.status = RAW_STATUS_FAILED;
+ command->alternate.status =
B_USB_RAW_STATUS_FAILED;
return B_OK;
}
- command->alternate.status = RAW_STATUS_SUCCESS;
+ command->alternate.status = B_USB_RAW_STATUS_SUCCESS;
return B_OK;
}
- case RAW_COMMAND_CONTROL_TRANSFER: {
+ case B_USB_RAW_COMMAND_CONTROL_TRANSFER: {
benaphore_lock(&device->lock);
if (gUSBModule->queue_request(device->device,
command->control.request_type,
command->control.request,
command->control.value, command->control.index,
command->control.length, command->control.data,
usb_raw_callback, device) < B_OK) {
- command->control.status = RAW_STATUS_FAILED;
+ command->control.status =
B_USB_RAW_STATUS_FAILED;
command->control.length = 0;
benaphore_unlock(&device->lock);
return B_OK;
@@ -546,48 +546,48 @@
return B_OK;
}
- case RAW_COMMAND_INTERRUPT_TRANSFER:
- case RAW_COMMAND_BULK_TRANSFER:
- case RAW_COMMAND_ISOCHRONOUS_TRANSFER: {
+ case B_USB_RAW_COMMAND_INTERRUPT_TRANSFER:
+ case B_USB_RAW_COMMAND_BULK_TRANSFER:
+ case B_USB_RAW_COMMAND_ISOCHRONOUS_TRANSFER: {
const usb_configuration_info *configurationInfo =
gUSBModule->get_configuration(device->device);
if (!configurationInfo) {
- command->transfer.status =
RAW_STATUS_INVALID_CONFIGURATION;
+ command->transfer.status =
B_USB_RAW_STATUS_INVALID_CONFIGURATION;
return B_OK;
}
if (command->transfer.interface >=
configurationInfo->interface_count) {
- command->transfer.status =
RAW_STATUS_INVALID_INTERFACE;
+ command->transfer.status =
B_USB_RAW_STATUS_INVALID_INTERFACE;
return B_OK;
}
const usb_interface_info *interfaceInfo =
configurationInfo->interface[command->transfer.interface].active;
if (!interfaceInfo) {
- command->transfer.status = RAW_STATUS_ABORTED;
+ command->transfer.status =
B_USB_RAW_STATUS_ABORTED;
return B_OK;
}
if (command->transfer.endpoint >=
interfaceInfo->endpoint_count) {
- command->transfer.status =
RAW_STATUS_INVALID_ENDPOINT;
+ command->transfer.status =
B_USB_RAW_STATUS_INVALID_ENDPOINT;
return B_OK;
}
const usb_endpoint_info *endpointInfo =
&interfaceInfo->endpoint[command->transfer.endpoint];
if (!endpointInfo->handle) {
- command->transfer.status =
RAW_STATUS_INVALID_ENDPOINT;
+ command->transfer.status =
B_USB_RAW_STATUS_INVALID_ENDPOINT;
return B_OK;
}
benaphore_lock(&device->lock);
status_t status;
- if (op == RAW_COMMAND_INTERRUPT_TRANSFER) {
+ if (op == B_USB_RAW_COMMAND_INTERRUPT_TRANSFER) {
status =
gUSBModule->queue_interrupt(endpointInfo->handle,
command->transfer.data,
command->transfer.length,
usb_raw_callback, device);
- } else if (op == RAW_COMMAND_BULK_TRANSFER) {
+ } else if (op == B_USB_RAW_COMMAND_BULK_TRANSFER) {
status =
gUSBModule->queue_bulk(endpointInfo->handle,
command->transfer.data,
command->transfer.length,
usb_raw_callback, device);
@@ -600,7 +600,7 @@
}
if (status < B_OK) {
- command->transfer.status = RAW_STATUS_FAILED;
+ command->transfer.status =
B_USB_RAW_STATUS_FAILED;
command->transfer.length = 0;
benaphore_unlock(&device->lock);
return B_OK;
Index: src/add-ons/kernel/drivers/bus/usb/usb_raw.h
===================================================================
--- src/add-ons/kernel/drivers/bus/usb/usb_raw.h (revision 24860)
+++ src/add-ons/kernel/drivers/bus/usb/usb_raw.h (working copy)
@@ -12,47 +12,47 @@
#include <USB3.h>
typedef enum {
- RAW_COMMAND_GET_VERSION = 0x1000,
+ B_USB_RAW_COMMAND_GET_VERSION = 0x1000,
- RAW_COMMAND_GET_DEVICE_DESCRIPTOR = 0x2000,
- RAW_COMMAND_GET_CONFIGURATION_DESCRIPTOR,
- RAW_COMMAND_GET_INTERFACE_DESCRIPTOR,
- RAW_COMMAND_GET_ENDPOINT_DESCRIPTOR,
- RAW_COMMAND_GET_STRING_DESCRIPTOR,
- RAW_COMMAND_GET_GENERIC_DESCRIPTOR,
- RAW_COMMAND_GET_ALT_INTERFACE_COUNT,
- RAW_COMMAND_GET_ALT_INTERFACE_DESCRIPTOR,
+ B_USB_RAW_COMMAND_GET_DEVICE_DESCRIPTOR = 0x2000,
+ B_USB_RAW_COMMAND_GET_CONFIGURATION_DESCRIPTOR,
+ B_USB_RAW_COMMAND_GET_INTERFACE_DESCRIPTOR,
+ B_USB_RAW_COMMAND_GET_ENDPOINT_DESCRIPTOR,
+ B_USB_RAW_COMMAND_GET_STRING_DESCRIPTOR,
+ B_USB_RAW_COMMAND_GET_GENERIC_DESCRIPTOR,
+ B_USB_RAW_COMMAND_GET_ALT_INTERFACE_COUNT,
+ B_USB_RAW_COMMAND_GET_ALT_INTERFACE_DESCRIPTOR,
- RAW_COMMAND_SET_CONFIGURATION = 0x3000,
- RAW_COMMAND_SET_FEATURE,
- RAW_COMMAND_CLEAR_FEATURE,
- RAW_COMMAND_GET_STATUS,
- RAW_COMMAND_GET_DESCRIPTOR,
- RAW_COMMAND_SET_ALT_INTERFACE,
+ B_USB_RAW_COMMAND_SET_CONFIGURATION = 0x3000,
+ B_USB_RAW_COMMAND_SET_FEATURE,
+ B_USB_RAW_COMMAND_CLEAR_FEATURE,
+ B_USB_RAW_COMMAND_GET_STATUS,
+ B_USB_RAW_COMMAND_GET_DESCRIPTOR,
+ B_USB_RAW_COMMAND_SET_ALT_INTERFACE,
- RAW_COMMAND_CONTROL_TRANSFER = 0x4000,
- RAW_COMMAND_INTERRUPT_TRANSFER,
- RAW_COMMAND_BULK_TRANSFER,
- RAW_COMMAND_ISOCHRONOUS_TRANSFER
-} raw_command_id;
+ B_USB_RAW_COMMAND_CONTROL_TRANSFER = 0x4000,
+ B_USB_RAW_COMMAND_INTERRUPT_TRANSFER,
+ B_USB_RAW_COMMAND_BULK_TRANSFER,
+ B_USB_RAW_COMMAND_ISOCHRONOUS_TRANSFER
+} usb_raw_command_id;
typedef enum {
- RAW_STATUS_SUCCESS = 0,
+ B_USB_RAW_STATUS_SUCCESS = 0,
- RAW_STATUS_FAILED,
- RAW_STATUS_ABORTED,
- RAW_STATUS_STALLED,
- RAW_STATUS_CRC_ERROR,
- RAW_STATUS_TIMEOUT,
+ B_USB_RAW_STATUS_FAILED,
+ B_USB_RAW_STATUS_ABORTED,
+ B_USB_RAW_STATUS_STALLED,
+ B_USB_RAW_STATUS_CRC_ERROR,
+ B_USB_RAW_STATUS_TIMEOUT,
- RAW_STATUS_INVALID_CONFIGURATION,
- RAW_STATUS_INVALID_INTERFACE,
- RAW_STATUS_INVALID_ENDPOINT,
- RAW_STATUS_INVALID_STRING,
+ B_USB_RAW_STATUS_INVALID_CONFIGURATION,
+ B_USB_RAW_STATUS_INVALID_INTERFACE,
+ B_USB_RAW_STATUS_INVALID_ENDPOINT,
+ B_USB_RAW_STATUS_INVALID_STRING,
- RAW_STATUS_NO_MEMORY
-} raw_command_status;
+ B_USB_RAW_STATUS_NO_MEMORY
+} usb_raw_command_status;
typedef union {
@@ -147,6 +147,6 @@
usb_iso_packet_descriptor *packet_descriptors;
uint32
packet_count;
} isochronous;
-} raw_command;
+} usb_raw_command;
#endif // _USB_RAW_H_
Index: src/kits/device/USBConfiguration.cpp
===================================================================
--- src/kits/device/USBConfiguration.cpp (revision 24860)
+++ src/kits/device/USBConfiguration.cpp (working copy)
@@ -19,11 +19,11 @@
fInterfaces(NULL),
fConfigurationString(NULL)
{
- raw_command command;
+ usb_raw_command command;
command.config.descriptor = &fDescriptor;
command.config.config_index = fIndex;
- if (ioctl(fRawFD, RAW_COMMAND_GET_CONFIGURATION_DESCRIPTOR, &command,
sizeof(command))
- || command.config.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_CONFIGURATION_DESCRIPTOR,
&command, sizeof(command))
+ || command.config.status != B_USB_RAW_STATUS_SUCCESS) {
memset(&fDescriptor, 0, sizeof(fDescriptor));
}
Index: src/kits/device/USBDevice.cpp
===================================================================
--- src/kits/device/USBDevice.cpp (revision 24860)
+++ src/kits/device/USBDevice.cpp (working copy)
@@ -55,16 +55,16 @@
return B_ERROR;
}
- raw_command command;
- if (ioctl(fRawFD, RAW_COMMAND_GET_VERSION, &command, sizeof(command))
+ usb_raw_command command;
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_VERSION, &command,
sizeof(command))
|| command.version.status != 0x0015) {
Unset();
return B_ERROR;
}
command.device.descriptor = &fDescriptor;
- if (ioctl(fRawFD, RAW_COMMAND_GET_DEVICE_DESCRIPTOR, &command,
sizeof(command))
- || command.device.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_DEVICE_DESCRIPTOR, &command,
sizeof(command))
+ || command.device.status != B_USB_RAW_STATUS_SUCCESS) {
Unset();
return B_ERROR;
}
@@ -244,13 +244,13 @@
if (!descriptor)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.string.descriptor = descriptor;
command.string.string_index = index;
command.string.length = length;
- if (ioctl(fRawFD, RAW_COMMAND_GET_STRING_DESCRIPTOR, &command,
sizeof(command))
- || command.string.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_STRING_DESCRIPTOR, &command,
sizeof(command))
+ || command.string.status != B_USB_RAW_STATUS_SUCCESS) {
return 0;
}
@@ -288,15 +288,15 @@
if (length > 0 && data == NULL)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.descriptor.type = type;
command.descriptor.index = index;
command.descriptor.language_id = languageID;
command.descriptor.data = data;
command.descriptor.length = length;
- if (ioctl(fRawFD, RAW_COMMAND_GET_DESCRIPTOR, &command, sizeof(command))
- || command.descriptor.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_DESCRIPTOR, &command,
sizeof(command))
+ || command.descriptor.status != B_USB_RAW_STATUS_SUCCESS) {
return 0;
}
@@ -334,11 +334,11 @@
if (!configuration || configuration->Index() >=
fDescriptor.num_configurations)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.config.config_index = configuration->Index();
- if (ioctl(fRawFD, RAW_COMMAND_SET_CONFIGURATION, &command,
sizeof(command))
- || command.config.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_SET_CONFIGURATION, &command,
sizeof(command))
+ || command.config.status != B_USB_RAW_STATUS_SUCCESS) {
return B_ERROR;
}
@@ -354,7 +354,7 @@
if (length > 0 && data == NULL)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.control.request_type = requestType;
command.control.request = request;
command.control.value = value;
@@ -362,8 +362,8 @@
command.control.length = length;
command.control.data = data;
- if (ioctl(fRawFD, RAW_COMMAND_CONTROL_TRANSFER, &command,
sizeof(command))
- || command.control.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_CONTROL_TRANSFER, &command,
sizeof(command))
+ || command.control.status != B_USB_RAW_STATUS_SUCCESS) {
return B_ERROR;
}
Index: src/kits/device/USBEndpoint.cpp
===================================================================
--- src/kits/device/USBEndpoint.cpp (revision 24860)
+++ src/kits/device/USBEndpoint.cpp (working copy)
@@ -17,13 +17,13 @@
fIndex(index),
fRawFD(rawFD)
{
- raw_command command;
+ usb_raw_command command;
command.endpoint.descriptor = &fDescriptor;
command.endpoint.config_index = fInterface->Configuration()->Index();
command.endpoint.interface_index = fInterface->Index();
command.endpoint.endpoint_index = fIndex;
- if (ioctl(fRawFD, RAW_COMMAND_GET_ENDPOINT_DESCRIPTOR, &command,
sizeof(command))
- || command.config.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_ENDPOINT_DESCRIPTOR, &command,
sizeof(command))
+ || command.config.status != B_USB_RAW_STATUS_SUCCESS) {
memset(&fDescriptor, 0, sizeof(fDescriptor));
}
}
@@ -132,7 +132,7 @@
if (length > 0 && data == NULL)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.control.request_type = requestType;
command.control.request = request;
command.control.value = value;
@@ -140,8 +140,8 @@
command.control.length = length;
command.control.data = data;
- if (ioctl(fRawFD, RAW_COMMAND_CONTROL_TRANSFER, &command,
sizeof(command))
- || command.control.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_CONTROL_TRANSFER, &command,
sizeof(command))
+ || command.control.status != B_USB_RAW_STATUS_SUCCESS) {
return B_ERROR;
}
@@ -155,14 +155,14 @@
if (length > 0 && data == NULL)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.transfer.interface = fInterface->Index();
command.transfer.endpoint = fIndex;
command.transfer.data = data;
command.transfer.length = length;
- if (ioctl(fRawFD, RAW_COMMAND_INTERRUPT_TRANSFER, &command,
sizeof(command))
- || command.transfer.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_INTERRUPT_TRANSFER, &command,
sizeof(command))
+ || command.transfer.status != B_USB_RAW_STATUS_SUCCESS) {
return B_ERROR;
}
@@ -176,14 +176,14 @@
if (length > 0 && data == NULL)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.transfer.interface = fInterface->Index();
command.transfer.endpoint = fIndex;
command.transfer.data = data;
command.transfer.length = length;
- if (ioctl(fRawFD, RAW_COMMAND_BULK_TRANSFER, &command, sizeof(command))
- || command.transfer.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_BULK_TRANSFER, &command,
sizeof(command))
+ || command.transfer.status != B_USB_RAW_STATUS_SUCCESS) {
return B_ERROR;
}
@@ -198,7 +198,7 @@
if (length > 0 && data == NULL)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.isochronous.interface = fInterface->Index();
command.isochronous.endpoint = fIndex;
command.isochronous.data = data;
@@ -206,8 +206,8 @@
command.isochronous.packet_descriptors = packetDescriptors;
command.isochronous.packet_count = packetCount;
- if (ioctl(fRawFD, RAW_COMMAND_ISOCHRONOUS_TRANSFER, &command,
sizeof(command))
- || command.isochronous.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_ISOCHRONOUS_TRANSFER, &command,
sizeof(command))
+ || command.isochronous.status != B_USB_RAW_STATUS_SUCCESS) {
return B_ERROR;
}
Index: src/kits/device/USBInterface.cpp
===================================================================
--- src/kits/device/USBInterface.cpp (revision 24860)
+++ src/kits/device/USBInterface.cpp (working copy)
@@ -110,14 +110,14 @@
if (length > 0 && descriptor == NULL)
return B_BAD_VALUE;
- raw_command command;
+ usb_raw_command command;
command.generic.descriptor = descriptor;
command.generic.config_index = fConfiguration->Index();
command.generic.interface_index = fIndex;
command.generic.length = length;
command.generic.generic_index = index;
- if (ioctl(fRawFD, RAW_COMMAND_GET_GENERIC_DESCRIPTOR, &command,
sizeof(command))
- || command.generic.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_GENERIC_DESCRIPTOR, &command,
sizeof(command))
+ || command.generic.status != B_USB_RAW_STATUS_SUCCESS) {
return B_ERROR;
}
@@ -146,12 +146,12 @@
BUSBInterface::CountAlternates() const
{
uint32 alternateCount;
- raw_command command;
+ usb_raw_command command;
command.alternate.alternate_count = &alternateCount;
command.alternate.config_index = fConfiguration->Index();
command.alternate.interface_index = fIndex;
- if (ioctl(fRawFD, RAW_COMMAND_GET_ALT_INTERFACE_COUNT, &command,
sizeof(command))
- || command.alternate.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_ALT_INTERFACE_COUNT, &command,
sizeof(command))
+ || command.alternate.status != B_USB_RAW_STATUS_SUCCESS) {
return 1;
}
@@ -167,13 +167,13 @@
if (descriptor == NULL)
return NULL;
- raw_command command;
+ usb_raw_command command;
command.alternate.descriptor = descriptor;
command.alternate.config_index = fConfiguration->Index();
command.alternate.interface_index = fIndex;
command.alternate.alternate_index = alternateIndex;
- if (ioctl(fRawFD, RAW_COMMAND_GET_ALT_INTERFACE_DESCRIPTOR, &command,
- sizeof(command)) || command.alternate.status !=
RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_ALT_INTERFACE_DESCRIPTOR,
&command,
+ sizeof(command)) || command.alternate.status !=
B_USB_RAW_STATUS_SUCCESS) {
delete descriptor;
return NULL;
}
@@ -185,12 +185,12 @@
status_t
BUSBInterface::SetAlternate(uint32 alternateIndex)
{
- raw_command command;
+ usb_raw_command command;
command.alternate.config_index = fConfiguration->Index();
command.alternate.interface_index = fIndex;
command.alternate.alternate_index = alternateIndex;
- if (ioctl(fRawFD, RAW_COMMAND_SET_ALT_INTERFACE, &command,
sizeof(command))
- || command.alternate.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_SET_ALT_INTERFACE, &command,
sizeof(command))
+ || command.alternate.status != B_USB_RAW_STATUS_SUCCESS) {
return B_ERROR;
}
@@ -202,12 +202,12 @@
void
BUSBInterface::_UpdateDescriptorAndEndpoints()
{
- raw_command command;
+ usb_raw_command command;
command.interface.descriptor = &fDescriptor;
command.interface.config_index = fConfiguration->Index();
command.interface.interface_index = fIndex;
- if (ioctl(fRawFD, RAW_COMMAND_GET_INTERFACE_DESCRIPTOR, &command,
sizeof(command))
- || command.interface.status != RAW_STATUS_SUCCESS) {
+ if (ioctl(fRawFD, B_USB_RAW_COMMAND_GET_INTERFACE_DESCRIPTOR, &command,
sizeof(command))
+ || command.interface.status != B_USB_RAW_STATUS_SUCCESS) {
memset(&fDescriptor, 0, sizeof(fDescriptor));
}
Other related posts:
