From 47a9c752357518220a5f0d86357ca86612ef769b Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Sat, 20 Mar 2004 12:42:13 +0000 Subject: [PATCH] - some data types changed --- bochs/iodev/serial_raw.cc | 14 +++++++------- bochs/iodev/serial_raw.h | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bochs/iodev/serial_raw.cc b/bochs/iodev/serial_raw.cc index 63978604d..227c104ca 100644 --- a/bochs/iodev/serial_raw.cc +++ b/bochs/iodev/serial_raw.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: serial_raw.cc,v 1.12 2004-03-17 17:08:57 vruppert Exp $ +// $Id: serial_raw.cc,v 1.13 2004-03-20 12:42:12 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2004 MandrakeSoft S.A. @@ -222,14 +222,14 @@ serial_raw::setup_port () } void -serial_raw::transmit (int val) +serial_raw::transmit (Bit8u byte) { #ifdef WIN32 DWORD DErr, Len2; OVERLAPPED tx_ovl; #endif - BX_DEBUG (("transmit %d", val)); + BX_DEBUG (("transmit %d", byte)); if (present) { #ifdef WIN32 if (DCBchanged) { @@ -239,7 +239,7 @@ serial_raw::transmit (int val) } memset(&tx_ovl, 0, sizeof(OVERLAPPED)); tx_ovl.hEvent = CreateEvent(NULL,TRUE,TRUE,"transmit"); - if (!WriteFile(hCOM, &val, 1, &Len2, &tx_ovl)) { + if (!WriteFile(hCOM, &byte, 1, &Len2, &tx_ovl)) { if (GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(tx_ovl.hEvent, 100) == WAIT_OBJECT_0) { GetOverlappedResult(hCOM, &tx_ovl, &Len2, FALSE); @@ -253,21 +253,21 @@ serial_raw::transmit (int val) } } -int +bx_bool serial_raw::ready_transmit () { BX_DEBUG (("ready_transmit returning %d", present)); return present; } -int +bx_bool serial_raw::ready_receive () { BX_DEBUG (("ready_receive returning %d", (rxdata_count > 0))); return (rxdata_count > 0); } -int +Bit8u serial_raw::receive () { #ifdef WIN32 diff --git a/bochs/iodev/serial_raw.h b/bochs/iodev/serial_raw.h index b6cbdf74e..5e3053bea 100644 --- a/bochs/iodev/serial_raw.h +++ b/bochs/iodev/serial_raw.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: serial_raw.h,v 1.8 2004-03-17 17:08:57 vruppert Exp $ +// $Id: serial_raw.h,v 1.9 2004-03-20 12:42:13 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // @@ -27,10 +27,10 @@ class serial_raw : public logfunctions { void set_break (int mode); void set_modem_control (int ctrl); int get_modem_status (); - void transmit (int byte); - int ready_transmit (); - int ready_receive (); - int receive (); + void transmit (Bit8u byte); + bx_bool ready_transmit (); + bx_bool ready_receive (); + Bit8u receive (); private: void setup_port ();