i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style cleanup, 80 char limit. No functional changes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42072 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2011-06-09 19:00:37 +00:00
parent 32b9a38570
commit 4e1d68e994
1 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
+73 -36
View File
@@ -73,7 +73,8 @@ SerialDevice::Init()
mutex_init(&fReadLock, "usb_serial:read_lock"); mutex_init(&fReadLock, "usb_serial:read_lock");
mutex_init(&fWriteLock, "usb_serial:write_lock"); mutex_init(&fWriteLock, "usb_serial:write_lock");
size_t totalBuffers = fReadBufferSize + fWriteBufferSize + fInterruptBufferSize; size_t totalBuffers = fReadBufferSize + fWriteBufferSize
+ fInterruptBufferSize;
fBufferArea = create_area("usb_serial:buffers_area", (void **)&fReadBuffer, fBufferArea = create_area("usb_serial:buffers_area", (void **)&fReadBuffer,
B_ANY_KERNEL_ADDRESS, ROUNDUP(totalBuffers, B_PAGE_SIZE), B_CONTIGUOUS, B_ANY_KERNEL_ADDRESS, ROUNDUP(totalBuffers, B_PAGE_SIZE), B_CONTIGUOUS,
B_READ_AREA | B_WRITE_AREA); B_READ_AREA | B_WRITE_AREA);
@@ -201,7 +202,8 @@ SerialDevice::Service(struct tty *tty, uint32 op, void *buffer, size_t length)
case TTYISTOP: case TTYISTOP:
fInputStopped = *(bool *)buffer; fInputStopped = *(bool *)buffer;
TRACE("TTYISTOP: %sstopped\n", fInputStopped ? "" : "not "); TRACE("TTYISTOP: %sstopped\n", fInputStopped ? "" : "not ");
gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWCTS, !fInputStopped); gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWCTS,
!fInputStopped);
return true; return true;
case TTYGETSIGNALS: case TTYGETSIGNALS:
@@ -209,7 +211,8 @@ SerialDevice::Service(struct tty *tty, uint32 op, void *buffer, size_t length)
gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWDCD, gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWDCD,
(fControlOut & (USB_CDC_CONTROL_SIGNAL_STATE_DTR (fControlOut & (USB_CDC_CONTROL_SIGNAL_STATE_DTR
| USB_CDC_CONTROL_SIGNAL_STATE_RTS)) != 0); | USB_CDC_CONTROL_SIGNAL_STATE_RTS)) != 0);
gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWCTS, !fInputStopped); gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWCTS,
!fInputStopped);
gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWDSR, false); gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWDSR, false);
gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWRI, false); gTTYModule->tty_hardware_signal(fTTYCookie, TTYHWRI, false);
return true; return true;
@@ -277,8 +280,8 @@ SerialDevice::Open(uint32 flags)
ResetDevice(); ResetDevice();
fDeviceThread = spawn_kernel_thread(DeviceThread, "usb_serial device thread", fDeviceThread = spawn_kernel_thread(DeviceThread,
B_NORMAL_PRIORITY, this); "usb_serial device thread", B_NORMAL_PRIORITY, this);
if (fDeviceThread < B_OK) { if (fDeviceThread < B_OK) {
TRACE_ALWAYS("open: failed to spawn kernel thread\n"); TRACE_ALWAYS("open: failed to spawn kernel thread\n");
@@ -355,7 +358,8 @@ SerialDevice::Write(const char *buffer, size_t *numBytes)
status = acquire_sem_etc(fDoneWrite, 1, B_CAN_INTERRUPT, 0); status = acquire_sem_etc(fDoneWrite, 1, B_CAN_INTERRUPT, 0);
if (status < B_OK) { if (status < B_OK) {
TRACE_ALWAYS("write: failed to get write done sem 0x%08x\n", status); TRACE_ALWAYS("write: failed to get write done sem 0x%08x\n",
status);
break; break;
} }
@@ -526,13 +530,15 @@ SerialDevice::DeviceThread(void *data)
device->fReadBuffer, device->fReadBufferSize, device->fReadBuffer, device->fReadBufferSize,
device->ReadCallbackFunction, data); device->ReadCallbackFunction, data);
if (status < B_OK) { if (status < B_OK) {
TRACE_ALWAYS("device thread: queueing failed with error: 0x%08x\n", status); TRACE_ALWAYS("device thread: queueing failed with error: 0x%08x\n",
status);
break; break;
} }
status = acquire_sem_etc(device->fDoneRead, 1, B_CAN_INTERRUPT, 0); status = acquire_sem_etc(device->fDoneRead, 1, B_CAN_INTERRUPT, 0);
if (status < B_OK) { if (status < B_OK) {
TRACE_ALWAYS("device thread: failed to get read done sem 0x%08x\n", status); TRACE_ALWAYS("device thread: failed to get read done sem 0x%08x\n",
status);
break; break;
} }
@@ -566,8 +572,8 @@ void
SerialDevice::ReadCallbackFunction(void *cookie, int32 status, void *data, SerialDevice::ReadCallbackFunction(void *cookie, int32 status, void *data,
uint32 actualLength) uint32 actualLength)
{ {
TRACE_FUNCALLS("read callback: cookie: 0x%08x status: 0x%08x data: 0x%08x len: %lu\n", TRACE_FUNCALLS("read callback: cookie: 0x%08x status: 0x%08x data: 0x%08x "
cookie, status, data, actualLength); "length: %lu\n", cookie, status, data, actualLength);
SerialDevice *device = (SerialDevice *)cookie; SerialDevice *device = (SerialDevice *)cookie;
device->fActualLengthRead = actualLength; device->fActualLengthRead = actualLength;
@@ -580,8 +586,8 @@ void
SerialDevice::WriteCallbackFunction(void *cookie, int32 status, void *data, SerialDevice::WriteCallbackFunction(void *cookie, int32 status, void *data,
uint32 actualLength) uint32 actualLength)
{ {
TRACE_FUNCALLS("write callback: cookie: 0x%08x status: 0x%08x data: 0x%08x len: %lu\n", TRACE_FUNCALLS("write callback: cookie: 0x%08x status: 0x%08x data: 0x%08x "
cookie, status, data, actualLength); "length: %lu\n", cookie, status, data, actualLength);
SerialDevice *device = (SerialDevice *)cookie; SerialDevice *device = (SerialDevice *)cookie;
device->fActualLengthWrite = actualLength; device->fActualLengthWrite = actualLength;
@@ -594,8 +600,8 @@ void
SerialDevice::InterruptCallbackFunction(void *cookie, int32 status, SerialDevice::InterruptCallbackFunction(void *cookie, int32 status,
void *data, uint32 actualLength) void *data, uint32 actualLength)
{ {
TRACE_FUNCALLS("interrupt callback: cookie: 0x%08x status: 0x%08x data: 0x%08x len: %lu\n", TRACE_FUNCALLS("interrupt callback: cookie: 0x%08x status: 0x%08x data: "
cookie, status, data, actualLength); "0x%08x len: %lu\n", cookie, status, data, actualLength);
SerialDevice *device = (SerialDevice *)cookie; SerialDevice *device = (SerialDevice *)cookie;
device->fActualLengthInterrupt = actualLength; device->fActualLengthInterrupt = actualLength;
@@ -611,7 +617,6 @@ SerialDevice::InterruptCallbackFunction(void *cookie, int32 status,
} }
SerialDevice * SerialDevice *
SerialDevice::MakeDevice(usb_device device, uint16 vendorID, SerialDevice::MakeDevice(usb_device device, uint16 vendorID,
uint16 productID) uint16 productID)
@@ -629,51 +634,83 @@ SerialDevice::MakeDevice(usb_device device, uint16 vendorID,
case VENDOR_HAL: case VENDOR_HAL:
{ {
switch (productID) { switch (productID) {
case PRODUCT_PROLIFIC_RSAQ2: description = "PL2303 Serial adapter (IODATA USB-RSAQ2)"; break; case PRODUCT_PROLIFIC_RSAQ2:
case PRODUCT_IODATA_USBRSAQ: description = "I/O Data USB serial adapter USB-RSAQ1"; break; description = "PL2303 Serial adapter (IODATA USB-RSAQ2)";
case PRODUCT_ATEN_UC232A: description = "Aten Serial adapter"; break; break;
case PRODUCT_TDK_UHA6400: description = "TDK USB-PHS Adapter UHA6400"; break; case PRODUCT_IODATA_USBRSAQ:
case PRODUCT_RATOC_REXUSB60: description = "Ratoc USB serial adapter REX-USB60"; break; description = "I/O Data USB serial adapter USB-RSAQ1";
case PRODUCT_PROLIFIC_PL2303: description = "PL2303 Serial adapter (ATEN/IOGEAR UC232A)"; break; break;
case PRODUCT_ELECOM_UCSGT: description = "Elecom UC-SGT"; break; case PRODUCT_ATEN_UC232A:
case PRODUCT_SOURCENEXT_KEIKAI8: description = "SOURCENEXT KeikaiDenwa 8"; break; description = "Aten Serial adapter";
case PRODUCT_SOURCENEXT_KEIKAI8_CHG: description = "SOURCENEXT KeikaiDenwa 8 with charger"; break; break;
case PRODUCT_HAL_IMR001: description = "HAL Corporation Crossam2+USB"; break; case PRODUCT_TDK_UHA6400:
description = "TDK USB-PHS Adapter UHA6400";
break;
case PRODUCT_RATOC_REXUSB60:
description = "Ratoc USB serial adapter REX-USB60";
break;
case PRODUCT_PROLIFIC_PL2303:
description = "PL2303 Serial adapter (ATEN/IOGEAR UC232A)";
break;
case PRODUCT_ELECOM_UCSGT:
description = "Elecom UC-SGT";
break;
case PRODUCT_SOURCENEXT_KEIKAI8:
description = "SOURCENEXT KeikaiDenwa 8";
break;
case PRODUCT_SOURCENEXT_KEIKAI8_CHG:
description = "SOURCENEXT KeikaiDenwa 8 with charger";
break;
case PRODUCT_HAL_IMR001:
description = "HAL Corporation Crossam2+USB";
break;
} }
if (!description) if (description == NULL)
break; break;
return new(std::nothrow) ProlificDevice(device, vendorID, productID, description); return new(std::nothrow) ProlificDevice(device, vendorID, productID,
description);
} }
case VENDOR_FTDI: case VENDOR_FTDI:
{ {
switch (productID) { switch (productID) {
case PRODUCT_FTDI_8U100AX: description = "FTDI 8U100AX serial converter"; break; case PRODUCT_FTDI_8U100AX:
case PRODUCT_FTDI_8U232AM: description = "FTDI 8U232AM serial converter"; break; description = "FTDI 8U100AX serial converter";
break;
case PRODUCT_FTDI_8U232AM:
description = "FTDI 8U232AM serial converter";
break;
} }
if (!description) if (description == NULL)
break; break;
return new(std::nothrow) FTDIDevice(device, vendorID, productID, description); return new(std::nothrow) FTDIDevice(device, vendorID, productID,
description);
} }
case VENDOR_PALM: case VENDOR_PALM:
case VENDOR_KLSI: case VENDOR_KLSI:
{ {
switch (productID) { switch (productID) {
case PRODUCT_PALM_CONNECT: description = "PalmConnect RS232"; break; case PRODUCT_PALM_CONNECT:
case PRODUCT_KLSI_KL5KUSB105D: description = "KLSI KL5KUSB105D"; break; description = "PalmConnect RS232";
break;
case PRODUCT_KLSI_KL5KUSB105D:
description = "KLSI KL5KUSB105D";
break;
} }
if (!description) if (description == NULL)
break; break;
return new(std::nothrow) KLSIDevice(device, vendorID, productID, description); return new(std::nothrow) KLSIDevice(device, vendorID, productID,
description);
} }
} }
return new(std::nothrow) ACMDevice(device, vendorID, productID, "CDC ACM compatible device"); return new(std::nothrow) ACMDevice(device, vendorID, productID,
"CDC ACM compatible device");
} }