Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc_serial: Remove read and write lock

Browse Source 
As with hrev42089 for usb_serial.
This commit is contained in:
François Revol 2014-08-20 00:12:22 +02:00
parent 0bdabc362b
commit 5925b1badc
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.cpp
View File

@ -59,9 +59,6 @@ SerialDevice::~SerialDevice()
if (fBufferArea >= B_OK)
delete_area(fBufferArea);
mutex_destroy(&fReadLock);
mutex_destroy(&fWriteLock);
}
@ -70,8 +67,6 @@ SerialDevice::Init()
{
fDoneRead = create_sem(0, "usb_serial:done_read");
fDoneWrite = create_sem(0, "usb_serial:done_write");
mutex_init(&fReadLock, "usb_serial:read_lock");
mutex_init(&fWriteLock, "usb_serial:write_lock");
size_t totalBuffers = fReadBufferSize + fWriteBufferSize + fInterruptBufferSize;
fBufferArea = create_area("usb_serial:buffers_area", (void **)&fReadBuffer,
@ -493,17 +488,8 @@ SerialDevice::Read(char *buffer, size_t *numBytes)
status_t status;
status = mutex_lock(&fReadLock);
if (status != B_OK) {
TRACE_ALWAYS("read: failed to get read lock\n");
*numBytes = 0;
return status;
}
status = gTTYModule->tty_read(fSystemTTYCookie, buffer, numBytes);
mutex_unlock(&fReadLock);
return status;
}
@ -516,15 +502,8 @@ SerialDevice::Write(const char *buffer, size_t *numBytes)
status_t status = EINVAL;
status = mutex_lock(&fWriteLock);
if (status != B_OK) {
TRACE_ALWAYS("write: failed to get write lock\n");
return status;
}
//XXX: WTF tty_write() is not for write() hook ?
//status = gTTYModule->tty_write(fSystemTTYCookie, buffer, numBytes);
mutex_unlock(&fWriteLock);
#if 0
status_t status = mutex_lock(&fWriteLock);
@ -669,9 +648,6 @@ SerialDevice::Removed()
//int32 result = B_OK;
//wait_for_thread(fDeviceThread, &result);
fDeviceThread = -1;
mutex_lock(&fWriteLock);
mutex_unlock(&fWriteLock);
}

4
src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.h
View File

@ -149,10 +149,6 @@ static void InterruptCallbackFunction(void *cookie,
/* device thread management */
thread_id fDeviceThread;
bool fStopDeviceThread;
/* device locks to ensure no concurent reads/writes */
mutex fReadLock;
mutex fWriteLock;
};
#endif // _SERIAL_DEVICE_H_