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

- netbsd patch for raw cdrom, from Christian <bloodjerk@gmx.net>

Browse Source
This commit is contained in:
Bryce Denney 2002-04-18 18:17:45 +00:00
parent bb398122d6
commit 6cc9369426
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/iodev/cdrom.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cdrom.cc,v 1.32 2002-04-18 00:22:19 bdenney Exp $
// $Id: cdrom.cc,v 1.33 2002-04-18 18:17:45 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -65,7 +65,7 @@ extern "C" {
#define BX_CD_FRAMESIZE 2048
#endif
#if (defined(__OpenBSD__) || defined(__FreeBSD__))
#if (defined (__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__))
// OpenBSD pre version 2.7 may require extern "C" { } structure around
// all the includes, because the i386 sys/disklabel.h contains code which
// c++ considers invalid.
@ -203,7 +203,7 @@ cdrom_interface::cdrom_interface(char *dev)
void
cdrom_interface::init(void) {
BX_DEBUG(("Init $Id: cdrom.cc,v 1.32 2002-04-18 00:22:19 bdenney Exp $"));
BX_DEBUG(("Init $Id: cdrom.cc,v 1.33 2002-04-18 18:17:45 bdenney Exp $"));
BX_INFO(("file = '%s'",path));
}
@ -495,7 +495,7 @@ cdrom_interface::read_toc(uint8* buf, int* length, bool msf, int start_track)
return true;
}
#elif (defined(__OpenBSD__) || defined(__FreeBSD__))
#elif (defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__))
{
struct ioc_toc_header h;
struct ioc_read_toc_entry t;
@ -622,7 +622,7 @@ cdrom_interface::capacity()
return(buf.st_size);
}
#elif defined(__OpenBSD__)
#elif (defined(__NetBSD__) || defined(__OpenBSD__))
{
// We just read the disklabel, imagine that...
struct disklabel lp;