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

- some compilation fixes for the raw serial support

Browse Source
This commit is contained in:
Volker Ruppert 2004-09-05 21:09:46 +00:00
parent 9956e47f3e
commit 00bf370db2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/iodev/serial.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: serial.cc,v 1.56 2004-09-05 10:30:19 vruppert Exp $ // $Id: serial.cc,v 1.57 2004-09-05 21:09:46 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2004 MandrakeSoft S.A. // Copyright (C) 2004 MandrakeSoft S.A.
@ -566,7 +566,7 @@ bx_serial_c::write(Bit32u address, Bit32u value, unsigned io_len)
bx_bool gen_int = 0; bx_bool gen_int = 0;
Bit8u offset, new_wordlen; Bit8u offset, new_wordlen;
#if USE_RAW_SERIAL #if USE_RAW_SERIAL
bx_bool mcr_changed; bx_bool mcr_changed = 0;
Bit8u p_mode; Bit8u p_mode;
#endif #endif
Bit8u port = 0; Bit8u port = 0;

9
bochs/iodev/serial.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: serial.h,v 1.20 2004-09-05 10:30:19 vruppert Exp $ // $Id: serial.h,v 1.21 2004-09-05 21:09:46 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2004 MandrakeSoft S.A. // Copyright (C) 2004 MandrakeSoft S.A.
@ -76,6 +76,10 @@ enum {
BX_SER_INT_FIFO BX_SER_INT_FIFO
}; };
#if USE_RAW_SERIAL
class serial_raw;
#endif
typedef struct { typedef struct {
/* /*
* UART internal state * UART internal state
@ -108,7 +112,8 @@ typedef struct {
#if USE_RAW_SERIAL #if USE_RAW_SERIAL
serial_raw* raw; serial_raw* raw;
#elif defined(SERIAL_ENABLE) #endif
#if defined(SERIAL_ENABLE)
struct termios term_orig, term_new; struct termios term_orig, term_new;
#endif #endif