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

- replaced call of obsolete bcopy() by memcpy()

Browse Source 
- the cfmakeraw() function is not available on all platforms (now using code
  that does the same job)
- removed useless strcpy() call
This commit is contained in:
Volker Ruppert 2006-10-08 10:59:21 +00:00
parent b9352f74fd
commit f8f01db46a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/iodev/serial.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: serial.cc,v 1.74 2006-09-12 13:05:07 vruppert Exp $ // $Id: serial.cc,v 1.75 2006-10-08 10:59:21 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2004 MandrakeSoft S.A. // Copyright (C) 2004 MandrakeSoft S.A.
@ -255,8 +255,11 @@ bx_serial_c::init(void)
BX_SER_THIS s[i].io_mode = BX_SER_MODE_TERM; BX_SER_THIS s[i].io_mode = BX_SER_MODE_TERM;
BX_DEBUG(("com%d tty_id: %d", i+1, BX_SER_THIS s[i].tty_id)); BX_DEBUG(("com%d tty_id: %d", i+1, BX_SER_THIS s[i].tty_id));
tcgetattr(BX_SER_THIS s[i].tty_id, &BX_SER_THIS s[i].term_orig); tcgetattr(BX_SER_THIS s[i].tty_id, &BX_SER_THIS s[i].term_orig);
bcopy((caddr_t) &BX_SER_THIS s[i].term_orig, (caddr_t) &BX_SER_THIS s[i].term_new, sizeof(struct termios)); memcpy(&BX_SER_THIS s[i].term_orig, &BX_SER_THIS s[i].term_new, sizeof(struct termios));
cfmakeraw(&BX_SER_THIS s[i].term_new); BX_SER_THIS s[i].term_new.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
BX_SER_THIS s[i].term_new.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
BX_SER_THIS s[i].term_new.c_cflag &= ~(CSIZE|PARENB);
BX_SER_THIS s[i].term_new.c_cflag |= CS8;
BX_SER_THIS s[i].term_new.c_oflag |= OPOST | ONLCR; // Enable NL to CR-NL translation BX_SER_THIS s[i].term_new.c_oflag |= OPOST | ONLCR; // Enable NL to CR-NL translation
#ifndef TRUE_CTLC #ifndef TRUE_CTLC
// ctl-C will exit Bochs, or trap to the debugger // ctl-C will exit Bochs, or trap to the debugger
@ -315,7 +318,6 @@ bx_serial_c::init(void)
strcpy(host, dev); strcpy(host, dev);
char *substr = strtok(host, ":"); char *substr = strtok(host, ":");
strcpy(host, substr);
substr = strtok(NULL, ":"); substr = strtok(NULL, ":");
if (!substr) { if (!substr) {
BX_PANIC(("com%d: inet address is wrong (%s)", i+1, dev)); BX_PANIC(("com%d: inet address is wrong (%s)", i+1, dev));