summaryrefslogtreecommitdiff
path: root/emulators/bochs
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-01-14 09:08:05 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-01-14 09:08:05 +0000
commit5e37cdbae98dd231bb517834799816b240bd2530 (patch)
tree55923ff31eb3046df32c5c08cc3b3eb045fdd41a /emulators/bochs
parentThere's a bug in bochs that's been annoying me for a while. I have found a (diff)
Support the "seeing" of CDROM drives.
[However, Win95 running in bochs still can't "see" the CD] Submitted by: Mark Ovens <mark@dogma.freebsd-uk.eu.org>
Notes
Notes: svn path=/head/; revision=24717
Diffstat (limited to 'emulators/bochs')
-rw-r--r--emulators/bochs/files/patch-ad38
1 files changed, 38 insertions, 0 deletions
diff --git a/emulators/bochs/files/patch-ad b/emulators/bochs/files/patch-ad
new file mode 100644
index 000000000000..2f299ea8059f
--- /dev/null
+++ b/emulators/bochs/files/patch-ad
@@ -0,0 +1,38 @@
+--- iodev/cdrom.cc.orig Thu Nov 11 21:44:52 1999
++++ iodev/cdrom.cc Fri Jan 14 00:59:58 2000
+@@ -34,7 +34,7 @@
+ }
+ #endif
+
+-#ifdef __OpenBSD__
++#if (defined(__OpenBSD__) || defined(__FreeBSD__))
+ // Here is a diff for cdrom.cc which adds support for OpenBSD.
+ //
+ // Note that since the i386 sys/disklabel.h contains code which c++ considers
+@@ -134,7 +134,7 @@
+ // some ioctl() calls to really eject the CD as well.
+
+ if (fd >= 0) {
+-#ifdef __OpenBSD__
++#if (defined(__OpenBSD__) || defined(__FreeBSD__))
+ (void) ioctl (fd, CDIOCALLOW);
+ if (ioctl (fd, CDIOCEJECT) < 0)
+ fprintf(stderr, "#eject_cdrom: eject returns error.\n");
+@@ -240,7 +240,7 @@
+
+ return true;
+ }
+-#elif defined(__OpenBSD__)
++#elif (defined(__OpenBSD__) || defined(__FreeBSD__))
+ {
+ struct ioc_toc_header h;
+ struct ioc_read_toc_entry t;
+@@ -353,7 +353,7 @@
+ fprintf(stderr, "#cdrom: capacity: %u\n", nr_sects);
+ return(nr_sects);
+ }
+-#elif defined(__OpenBSD__)
++#elif (defined(__OpenBSD__) || defined(__FreeBSD__))
+ {
+ // We just read the disklabel, imagine that...
+ struct disklabel lp;