mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- log prefix for serial_raw fixed

Browse Source 
- clear modem lines and break condition in constructor
- clear comm error and close event object after sending data
- ready_receive() now depends on the number of received bytes (receiver thread
  not present yet)
This commit is contained in:
Volker Ruppert 2004-03-17 17:08:57 +00:00
parent af33a50882
commit 33cb0be81f
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bochs/iodev/serial_raw.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: serial_raw.cc,v 1.11 2004-03-12 14:33:22 vruppert Exp $
// $Id: serial_raw.cc,v 1.12 2004-03-17 17:08:57 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004 MandrakeSoft S.A.
@ -34,7 +34,7 @@
#if USE_RAW_SERIAL
#define LOG_THIS bx_devices.pluginSerialDevice->
#define LOG_THIS
serial_raw::serial_raw (char *devname)
{
@ -67,6 +67,9 @@ serial_raw::serial_raw (char *devname)
#else
present = 0;
#endif
set_modem_control(0x00);
set_break(0);
rxdata_count = 0;
}
serial_raw::~serial_raw (void)
@ -244,6 +247,8 @@ serial_raw::transmit (int val)
}
}
if (Len2 != 1) BX_ERROR(("transmit failed: len = %d", Len2));
ClearCommError(hCOM, &DErr, NULL);
CloseHandle(tx_ovl.hEvent);
#endif
}
}
@ -258,18 +263,24 @@ serial_raw::ready_transmit ()
int
serial_raw::ready_receive ()
{
BX_DEBUG (("ready_receive returning %d", present));
return present;
BX_DEBUG (("ready_receive returning %d", (rxdata_count > 0)));
return (rxdata_count > 0);
}
int
serial_raw::receive ()
{
#ifdef WIN32
DWORD DErr;
#endif
BX_DEBUG (("receive returning 'A'"));
if (present) {
#ifdef WIN32
if (DCBchanged) {
setup_port();
} else {
ClearCommError(hCOM, &DErr, NULL);
}
#endif
return (int)'A';

3
bochs/iodev/serial_raw.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: serial_raw.h,v 1.7 2004-03-08 21:51:19 vruppert Exp $
// $Id: serial_raw.h,v 1.8 2004-03-17 17:08:57 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
@ -35,6 +35,7 @@ class serial_raw : public logfunctions {
private:
void setup_port ();
bx_bool present;
Bit8u rxdata_count;
#ifdef WIN32
HANDLE hCOM;
DCB dcb;