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

* Add a termios member that stores the config across open/close cycles. This

Browse Source 
allows the use of stty to configure the serial device and later using other
  commands with these settings still in place.
* Store incoming termios settings when they are set, restore the previous
  settings on open and apply the control modes to the device side as well.
* Only send the control to the system side tty cookie again. Doing it for both
  cookies was only done to configure the termios, which isn't necessary anymore.
* Remove fallbacks to c_{i|o}speed fields and always use c_cflag & CBAUD for the
  single speed setting we have.
* Remove some leftover control line state logic that doesn't apply anymore.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42161 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2011-06-14 00:09:33 +00:00
parent 75a4759d33
commit 08c7202f8a
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
View File

@ -49,6 +49,8 @@ SerialDevice::SerialDevice(usb_device device, uint16 vendorID,
fInputThread(-1),
fStopThreads(false)
{
memset(&fTTYConfig, 0, sizeof(termios));
fTTYConfig.c_cflag = B9600 | CS8 | CREAD;
}
@ -147,16 +149,29 @@ baud_index_to_speed(int index)
void
SerialDevice::SetModes(struct termios *tios)
{
uint16 newControl = fControlOut;
TRACE_FUNCRES(trace_termios, tios);
int32 speed = baud_index_to_speed(tios->c_cflag & CBAUD);
if (speed < 0)
speed = baud_index_to_speed(tios->c_ispeed);
if (speed < 0)
speed = baud_index_to_speed(tios->c_ospeed);
if (speed < 0)
uint8 baud = tios->c_cflag & CBAUD;
int32 speed = baud_index_to_speed(baud);
if (speed < 0) {
baud = B19200;
speed = 19200;
}
// update our master config in full
memcpy(&fTTYConfig, tios, sizeof(termios));
fTTYConfig.c_cflag &= ~CBAUD;
fTTYConfig.c_cflag |= baud;
// only apply the relevant parts to the device side
termios config;
memset(&config, 0, sizeof(termios));
config.c_cflag = tios->c_cflag;
config.c_cflag &= ~CBAUD;
config.c_cflag |= baud;
// update the termios of the device side
gTTYModule->tty_control(fDeviceTTYCookie, TCSETA, &config, sizeof(termios));
usb_cdc_line_coding lineCoding;
lineCoding.speed = speed;
@ -172,12 +187,6 @@ SerialDevice::SetModes(struct termios *tios)
lineCoding.databits = (tios->c_cflag & CS8) ? 8 : 7;
if (fControlOut != newControl) {
fControlOut = newControl;
TRACE("newctrl send to modem: 0x%08x\n", newControl);
SetControlLineState(newControl);
}
if (memcmp(&lineCoding, &fLineCoding, sizeof(usb_cdc_line_coding)) != 0) {
fLineCoding.speed = lineCoding.speed;
fLineCoding.stopbits = lineCoding.stopbits;
@ -325,6 +334,10 @@ SerialDevice::Open(uint32 flags)
if (status < B_OK)
TRACE_ALWAYS("failed to queue initial interrupt\n");
// set our config (will propagate to the slave config as well in SetModes()
gTTYModule->tty_control(fSystemTTYCookie, TCSETA, &fTTYConfig,
sizeof(termios));
fDeviceOpen = true;
return B_OK;
}
@ -400,9 +413,7 @@ SerialDevice::Control(uint32 op, void *arg, size_t length)
if (fDeviceRemoved)
return B_DEV_NOT_READY;
gTTYModule->tty_control(fSystemTTYCookie, op, arg, length);
gTTYModule->tty_control(fDeviceTTYCookie, op, arg, length);
return B_OK;
return gTTYModule->tty_control(fSystemTTYCookie, op, arg, length);
}

1
src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.h
View File

@ -135,6 +135,7 @@ static void _InterruptCallbackFunction(void *cookie,
struct tty * fSlaveTTY;
struct tty_cookie * fSystemTTYCookie;
struct tty_cookie * fDeviceTTYCookie;
struct termios fTTYConfig;
/* input thread management */
thread_id fInputThread;