[haiku-commits] r33557 - haiku/trunk/src/add-ons/kernel/drivers/printer/usb
- From: michael.w.pfeiffer@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 12 Oct 2009 19:17:25 +0200 (CEST)
Author: laplace
Date: 2009-10-12 19:17:25 +0200 (Mon, 12 Oct 2009)
New Revision: 33557
Changeset: http://dev.haiku-os.org/changeset/33557/haiku
Modified:
haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp
haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.h
Log:
Fixed style issues.
Modified: haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp
2009-10-12 16:43:23 UTC (rev 33556)
+++ haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.cpp
2009-10-12 17:17:25 UTC (rev 33557)
@@ -101,7 +101,8 @@
do {
bigtime_t timeout = directionIn ? READ_TIMEOUT : WRITE_TIMEOUT;
- result = acquire_sem_etc(device->notify, 1, B_RELATIVE_TIMEOUT,
timeout);
+ result = acquire_sem_etc(device->notify, 1, B_RELATIVE_TIMEOUT,
+ timeout);
if (result == B_TIMED_OUT) {
// Cancel the transfer and collect the sem that should
now be
// released through the callback on cancel. Handling of
device
@@ -150,7 +151,8 @@
device->alternate_setting = 0;
// scan through the interfaces to find our bulk-only data interface
- const usb_configuration_info *configuration =
gUSBModule->get_configuration(newDevice);
+ const usb_configuration_info *configuration =
+ gUSBModule->get_configuration(newDevice);
if (configuration == NULL) {
free(device);
return B_ERROR;
@@ -162,10 +164,12 @@
continue;
if (interface->descr->interface_class == PRINTER_INTERFACE_CLASS
- && interface->descr->interface_subclass ==
PRINTER_INTERFACE_SUBCLASS
+ && interface->descr->interface_subclass ==
+ PRINTER_INTERFACE_SUBCLASS
&& (interface->descr->interface_protocol ==
PIT_UNIDIRECTIONAL
|| interface->descr->interface_protocol ==
PIT_BIDIRECTIONAL
- || interface->descr->interface_protocol ==
PIT_1284_4_COMPATIBLE)) {
+ || interface->descr->interface_protocol ==
+ PIT_1284_4_COMPATIBLE)) {
bool hasIn = false;
bool hasOut = false;
@@ -232,9 +236,9 @@
}
if (freeDeviceMask != (uint32)-1) {
// reuse device number of first 32 devices
- for (int32 device_number = 0; device_number < 32; device_number
++) {
- if (freeDeviceMask & (1 << device_number) == 0) {
- device->device_number = device_number;
+ for (int32 deviceNumber = 0; deviceNumber < 32; deviceNumber++)
{
+ if (freeDeviceMask & (1 << deviceNumber) == 0) {
+ device->device_number = deviceNumber;
break;
}
}
@@ -353,26 +357,29 @@
uint16 value = 0;
uint16 index = (device->interface << 8) | device->alternate_setting;
char device_id[USB_PRINTER_DEVICE_ID_LENGTH + 2];
- size_t device_id_size = 0;
- status_t st = gUSBModule->send_request(device->device, PRINTER_REQUEST,
- REQUEST_GET_DEVICE_ID, value, index,
- sizeof(device_id), device_id, &device_id_size);
+ size_t deviceIdSize = 0;
+ status_t status = gUSBModule->send_request(device->device,
PRINTER_REQUEST,
+ REQUEST_GET_DEVICE_ID, value, index,
+ sizeof(device_id), device_id, &deviceIdSize);
- if (st == B_OK && device_id_size > 2) {
+ if (status == B_OK && deviceIdSize > 2) {
// terminate string
- device_id[device_id_size - 1] = '\0';
+ device_id[deviceIdSize - 1] = '\0';
// skip first two bytes containing string length again
- st = user_strlcpy((char *)buffer, &device_id[2],
USB_PRINTER_DEVICE_ID_LENGTH);
+ status = user_strlcpy((char *)buffer, &device_id[2],
+ USB_PRINTER_DEVICE_ID_LENGTH);
} else {
- dprintf("%s: Failed to get device ID for interface %d and
alternate setting %d: %s\n",
- DRIVER_NAME,
- (int)device->interface,
- (int)device->alternate_setting,
- strerror(st));
- st = user_strlcpy((char *)buffer,
- "MFG:Unknown;CMD:Unknown;MDL:Unknown;",
USB_PRINTER_DEVICE_ID_LENGTH);
+ dprintf("%s: Failed to get device ID for interface %d "
+ "and alternate setting %d: %s\n",
+ DRIVER_NAME,
+ (int)device->interface,
+ (int)device->alternate_setting,
+ strerror(status));
+ status = user_strlcpy((char *)buffer,
+ "MFG:Unknown;CMD:Unknown;MDL:Unknown;",
+ USB_PRINTER_DEVICE_ID_LENGTH);
}
- return st;
+ return status;
}
@@ -404,7 +411,8 @@
static status_t
-usb_printer_transfer(printer_device* device, bool directionIn, void* buffer,
size_t* length)
+usb_printer_transfer(printer_device* device, bool directionIn, void* buffer,
+ size_t* length)
{
status_t result = B_ERROR;
if (buffer == NULL || length == NULL || *length <= 0) {
@@ -479,7 +487,8 @@
return B_DEV_NOT_READY;
}
- status_t result = usb_printer_transfer(device, false, (void*)buffer,
length);
+ status_t result = usb_printer_transfer(device, false, (void*)buffer,
+ length);
mutex_unlock(&device->lock);
if (result == B_OK) {
@@ -498,7 +507,7 @@
//
-status_t
+status_t
init_hardware()
{
TRACE("init_hardware()\n");
Modified: haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.h
2009-10-12 16:43:23 UTC (rev 33556)
+++ haiku/trunk/src/add-ons/kernel/drivers/printer/usb/usb_printer.h
2009-10-12 17:17:25 UTC (rev 33557)
@@ -25,7 +25,8 @@
// class specific requests
// bmRequestType
-#define PRINTER_REQUEST
(USB_REQTYPE_INTERFACE_IN | USB_REQTYPE_CLASS)
+#define PRINTER_REQUEST
(USB_REQTYPE_INTERFACE_IN \
+
| USB_REQTYPE_CLASS)
// bRequest
#define REQUEST_GET_DEVICE_ID 0x00
#define REQUEST_GET_PORT_STATUS 0x01
Other related posts:
