debian/0000755000000000000000000000000012154454406007173 5ustar debian/bochs-wx.install0000644000000000000000000000004311403506737012313 0ustar usr/lib/bochs/plugins/libbx_wx.so* debian/bochsbios.install0000644000000000000000000000014511403506737012537 0ustar usr/share/bochs/BIOS-bochs-latest usr/share/bochs/BIOS-bochs-legacy usr/share/bochs/BIOS-qemu-latest debian/bochs.dirs0000644000000000000000000000010311403506737011147 0ustar usr/share/bochs usr/share/man usr/share/doc/bochs/examples usr/bin debian/bochs.install0000644000000000000000000000205011714224407011653 0ustar usr/lib/bochs/plugins/libbx_acpi.so* usr/lib/bochs/plugins/libbx_biosdev.so* usr/lib/bochs/plugins/libbx_cmos.so* usr/lib/bochs/plugins/libbx_dma.so* usr/lib/bochs/plugins/libbx_extfpuirq.so* usr/lib/bochs/plugins/libbx_gameport.so* usr/lib/bochs/plugins/libbx_floppy.so* usr/lib/bochs/plugins/libbx_harddrv.so* usr/lib/bochs/plugins/libbx_hdimage.so* usr/lib/bochs/plugins/libbx_ioapic.so* usr/lib/bochs/plugins/libbx_keyboard.so* usr/lib/bochs/plugins/libbx_busmouse.so* usr/lib/bochs/plugins/libbx_parallel.so* usr/lib/bochs/plugins/libbx_pci*.so* usr/lib/bochs/plugins/libbx_pic.so* usr/lib/bochs/plugins/libbx_pit.so* usr/lib/bochs/plugins/libbx_rfb.so* usr/lib/bochs/plugins/libbx_sb16.so* usr/lib/bochs/plugins/libbx_serial.so* usr/lib/bochs/plugins/libbx_soundmod.so* usr/lib/bochs/plugins/libbx_speaker.so* usr/lib/bochs/plugins/libbx_unmapped.so* usr/lib/bochs/plugins/libbx_usb_*.so* usr/lib/bochs/plugins/libbx_vga.so* usr/share/man/man1/bochs.1.gz usr/share/man/man5/bochsrc.5.gz usr/bin/bochs usr/bin/bochs-bin usr/share/bochs/keymaps etc/bochs-init debian/sb16ctrl.10000644000000000000000000000375611532330411010714 0ustar .\"Document Author: Guillem Jover - .TH sb16ctrl 1 2006-02-09 sb16ctrl "The Bochs Project" .\"SKIP_SECTION" .SH NAME sb16ctrl \- SoundBlaster16 emulator control program for Bochs .\"SKIP_SECTION" .SH USAGE .B sb16ctrl .RI [ options ] .\"SKIP_SECTION" .SH DESCRIPTION .LP sb16ctrl is a program to control the operation of the SoundBlaster16 emulator for bochs. .\".\"DONT_SPLIT" .SH OPTIONS .LP Any number of commands can be given. If none are present "\-f \-" is assumed. The value "#" can be decimal, octal (first digit 0) or hexadecimal (0x..). .TP .BI \-i # show the selected emulator info string .TP .BI \-t #,#,#,#,#,# load the patch translation into the emulator .TP .BI \-r resets the patch translation table .TP .BI \-m #,... sends the given midi message (up to 255 bytes) .TP .BI \-f filename loads commands from the given file, or stdin if "\-" .TP .BI \-v be verbose .\"SKIP_SECTION" .SH LICENSE This program is distributed under the terms of the GNU Lesser General Public License as published by the Free Software Foundation. See the COPYING file located in /usr/local/share/doc/bochs/ for details on the license and the lack of warrantee. .\"SKIP_SECTION" .SH AVAILABILITY The latest version of this program can be found at: http://bochs.sourceforge.net/getcurrent.html .\"SKIP_SECTION" .SH SEE ALSO .BR bochs (1), .BR bochsrc (5), .BR bochs-dlx (1), .BR bximage (1). .PP .nf The Bochs IA-32 Emulator site on the World Wide Web: http://bochs.sourceforge.net Online Bochs Documentation: http://bochs.sourceforge.net/doc/docbook .fi .\"SKIP_SECTION" .SH AUTHORS sb16ctrl was written by Josef Drexler. .\"SKIP_SECTION" .SH BUGS Please report all bugs to the bug tracker on our web site. Just go to http://bochs.sourceforge.net, and click "Bug Reports" on the sidebar under "Feedback." .PP Provide a detailed description of the bug, the version of the program you are running, the operating system you are running the program on and the operating system you are running in the emulator. debian/watch0000644000000000000000000000027111403506737010225 0ustar # You can run the "uscan" command to check for upstream updates and more. # Site Directory Pattern Version Script version=3 http://sf.net/bochs bochs-([\d.]*).tar.gz debian uupdate debian/README.source0000644000000000000000000000054411532330411011341 0ustar This package's orig file contains a pristine Bochs source tree, with some binary blobs removed (like the propietary BIOS VGABIOS-elpin-2.40 which is not free software as per the DFSG). There's a script to help generating this cleaned tarball: $ debian/tarball.sh tarball or a snapshot from Subversion: $ debian/tarball.sh snapshot debian/bochs-doc.docs0000644000000000000000000000031411403506737011705 0ustar debian/tmp/usr/share/doc/bochs/development debian/tmp/usr/share/doc/bochs/documentation debian/tmp/usr/share/doc/bochs/images debian/tmp/usr/share/doc/bochs/index.html debian/tmp/usr/share/doc/bochs/user debian/copyright0000644000000000000000000000446011714224747011136 0ustar This package was debianized by Robert Millan on Sat, 12 Jan 2002 11:34:12 +0100. Later maintained by Guillem Jover from 2004 to 2012. It was downloaded from: . Upstream Author: The Bochs project Copyright Holders: Copyright © 1991-2002 and beyond by Bungie Studios, Inc. Copyright © 1999-2000 The plex86 developers team Copyright © 1999-2003 Kevin P. Lawton Copyright © 2000-2011 The Bochs Project Copyright © 2000 Alexander Langer Copyright © 2000 Frank van der Linden (fvdl@wasabisystems.com) Copyright © 2000 Psyon.Org! Copyright © 2001, 2002 MandrakeSoft S.A. Copyright © 2002, 2003 Mike Nordell Copyright © 2002-2011 Stanislav Shwartsman Copyright © 2002-2009 Zwane Mwaikambo Copyright © 2002 Cegis Enterprises, Inc. Syracuse, NY 13215 Copyright © 2003 David N. Welton Copyright © 2003 Fen Systems Ltd. Copyright © 2003 Net Integration Technologies, Inc. Copyright © 2003 Renzo Davoli Copyright © 2003, 2004 Frank Cornelis Copyright © 2004 Makoto Suzuki (suzu) Copyright © 2004, 2006 Fabrice Bellard Copyright © 2005 Struan Bartlett Copyright © 2006 Sharvil Nanavati Copyright © 2006, 2007, 2009 Volker Ruppert Copyright © 2008 Chourdakis Michael Copyright © 2009 Benjamin David Lunt License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General Public License can be found in '/usr/share/common-licenses/LGPL-2.1'. debian/bximage.install0000644000000000000000000000014211403506737012175 0ustar usr/bin/bximage usr/share/man/man1/bximage.1.gz usr/bin/bxcommit usr/share/man/man1/bxcommit.1.gz debian/source/0000755000000000000000000000000011653545404010475 5ustar debian/source/format0000644000000000000000000000001411403506737011702 0ustar 3.0 (quilt) debian/sb16ctrl-bochs.docs0000644000000000000000000000003311403506737012576 0ustar misc/sb16/sb16ctrl.example debian/changelog0000644000000000000000000012411412153140456011044 0ustar bochs (2.4.6-6) unstable; urgency=low * Remove support for libsvga (which is scheduled for removal) -- Moritz Muehlenhoff Mon, 03 Jun 2013 18:15:20 +0200 bochs (2.4.6-5) unstable; urgency=low * Orphan package, set maintainer to Debian QA Group. * Fix typo (targeted) in README.Debian, spotted by lintian. * Remove sb16ctrl.exe from upstream tarball in debian/tarball.sh. * Add missing backslash to escape $ on XPM_LIB variable: - debian/patches/link-only-needed-libs.patch * Enable support for RFB protocol as GUI frontend (works with VNC viewer). * Use dpkg-buildflags to set build flags (enables default hardening flags). Based on a patch by Moritz Muehlenhoff . (Closes: #653511) * Fix man page warnings due to unescaped ' at the beginning of line. * Reorganize patches: - Remove sequence numbers from non-imported patch filenames. - Rename non-imported patches to more descriptive names. - Split 00_base.patch into a local-config.patch and local-paths.patch. * Switch sb16ctrl-bochs to any-i386 instead of explicit arch list. * Clarify output on what's being done by debian/tarball.sh. * Build bochs-svga on all architectures where svgalib is now available; implies switching from i386 and amd64 to linux-any and kfreebsd-any. -- Guillem Jover Tue, 07 Feb 2012 13:10:17 +0100 bochs (2.4.6-4) unstable; urgency=low * Do not install the ne2k plugin on systems were it's not supported. * Handler Linux 3.x kernels the same way as 2.6.x. (Closes: #647195) * Pack bochsrc.5 man page table to fix a man warning. * Remove now unneeded source lintian override on arch wildcards usage. * Do not unneedingly link the main bochs binary against gtk libraries, neither the wx plugin as it only needs the gdk include path. * Do not unneedingly link the x plugin against libSM and libICE. -- Guillem Jover Mon, 31 Oct 2011 20:58:55 +0100 bochs (2.4.6-3) unstable; urgency=low * Detect which of jade or openjade is installed at configure time, and use the one found. (Closes: #633971) -- Guillem Jover Mon, 25 Jul 2011 07:59:50 +0200 bochs (2.4.6-2) unstable; urgency=low * Set SHELL variables in Makefile.in to @SHELL@ instead of hardcoding them to /bin/sh, which confuses libtool as it might get configured for bash. (Closes: #625183) * Discard .eh_frame sections from the PC BIOS linker scripts, as they cause a build problem due to an overlap with the .data section. * Use jade instead of docbook2html, and thus switch Build-Depends-Indep from docbook-utils to docbook-dsssl. * Now using Standards-Version 3.9.2 (no changes needed). -- Guillem Jover Wed, 04 May 2011 05:29:04 +0200 bochs (2.4.6-1) unstable; urgency=low * New upstream release. - Refresh patches. - debian/patches/11_docbook_section_name.patch: Remove, merged upstream. - debian/patches/12_use_so_plugins.patch: Likewise. * Install new hdimage and soundmod plugins. * Use linux-any instead of explicit list of architectures for libasound2-dev in Build-Depends. * Update tarball.sh to use the new svn repository instead of cvs. * Update debian/copyright with all copyright holders and years. * Now using Standards-Version 3.9.1 (no changes needed). * Suggest grub-rescue-pc instead of dummy transitional grub-disk package. (Closes: #607208) -- Guillem Jover Sun, 27 Feb 2011 04:08:32 +0100 bochs (2.4.5-1) unstable; urgency=low * New upstream release. - Refresh patches. - debian/patches/patches/14_fix_gdbstubs_FTBFS.patch: Remove. * Do not use obsolete --enable-apic, --enable-mmx, --enable-sse-extension, --enable-sse=4, --enable-xsave, --enable-sep, --enable-popcnt and --enable-movbe options. * Do not use incomplete --enable-3dnow option. * Improve tarball.sh to fix wrong permissions from upstream tarballs. * Improve cleanup to fix building twice in a row. * Use system ltdl.h. (Closes: #560884) - Remove all file dependencies on ltdl.h. - Run libtoolize and aclocal in configure target. - Add automake and libtool to Build-Depends. - Remove ltdl.c, ltdl.h, ltdlconf.h, ltmain.sh and aclocal.m4 on clean. - Remove references to ltdlconf.h. - Fix configure.in to use system AC_SYS_LARGEFILE instead of local one. * Fix binary-arch target to not require Build-Depends-Indep packages to be installed. (Closes: #562964) - Disable docbook support in configure so that it does not fail when we only want build-arch or binary-arch. - On build-indep build doc/docbook and pass DOCBOOK2HTML to it (because it's no longer set by configure). - On install-indep install doc/docbook, remove install target dependency, call dh_prep, and populate the debian/tmp directory. * Now using Standards-Version 3.8.4 (no changes needed). * Add a source lintian override for the architecture wildcard used in Build-Depends-Indep to allow cross-building the bios images. -- Guillem Jover Tue, 08 Jun 2010 20:43:22 +0200 bochs (2.4.2-1) unstable; urgency=low * New upstream release. - Refresh patches. - debian/patches/patches/14_fix_gdbstubs_FTBFS.patch: New file. * Do no use obsolete --enable-vme configure option. * Switch to source format “3.0 (quilt)”: - Remove quilt from Build-Depends. - Remove quilt.make include from debian/rules. - Remove patch and unpatch targets from debian/rules. - Remove now unneeded quilt references in debian/README.source. * Use system libltdl shared library. (Closes: #560884) * Switch Build-Depends from libwxgtk2.6-dev to libwxgtk2.8-dev. Thanks to Ryan Niebur . (Closes: #561188) * Add ${misc:Depends} to every package Depends field. -- Guillem Jover Mon, 28 Dec 2009 20:16:50 +0100 bochs (2.4.1-2) unstable; urgency=low * Remove unused “libreadline5-dev | libreadline-dev” from Build-Depends. * Now using Standards-Version 3.8.3 (no changes needed). * Use .so extensions instead of .la in the plugin loader so that we can stop shipping .la files. - debian/patches/12_use_so_plugins.patch: New file. * Rename conf_args to conf_arch_args in debian/rules. * Move -e from the shebang to a 'set -e' in debian/launcher. * Update config.guess and config.sub before running configure and remove them on clean to avoid shipping them on the diff. * Build-Depend on autotools-dev to guarantee updated config.* files. -- Guillem Jover Mon, 14 Sep 2009 16:16:38 +0200 bochs (2.4.1-1) unstable; urgency=low * New upstream release. - Refresh patches. - debian/patches/0013_fix-non-acpi-timer-interrupt-routing.patch: Remove. - debian/patches/11_docbook_section_name.patch: Fix another underscored link. * Add support for building the bochsbios architecture independent package also on any-amd64 systems, and add gcc-multilib for such systems to Build-Depends-Indep. * Now using Standards-Version 3.8.2 (no changes needed). -- Guillem Jover Tue, 07 Jul 2009 08:19:37 +0200 bochs (2.3.7+20090416-1) unstable; urgency=low * New upstream snapshot. - debian/patches/00_base.patch: Refresh. - debian/patches/02_libtool.patch: Likewise. - debian/patches/03_qemu_bios.patch: Likewise. - debian/patches/04_man_table.patch: Likewise. - debian/patches/05_bios_delay_loop.patch: Likewise. - debian/patches/10_enable_iasl.patch: Likewise. - debian/patches/11_docbook_section_name.patch: New file. - debian/patches/11_ftbfs_3dnow.patch: Remove, fixed upstream. * Do no use obsolete --enable-icache configure option. * Fix a bashism in /etc/bochs-init/init.sh by explicitely specifing the variable REPLY for read. (Closes: #489543) * Switch to debhelper compatibility level 7. * Use dh_prep instead of “dh_clean -k”. * Add QEMU patches for bochsbios. (Closes: #523305) - debian/patches/0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch - debian/patches/0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch - debian/patches/0008_qemu-bios-provide-gpe-_l0x-methods.patch - debian/patches/0009_qemu-bios-pci-hotplug-support.patch - debian/patches/0011_read-additional-acpi-tables-from-a-vm.patch - debian/patches/0012-load-smbios-entries-and-files-from-qemu.patch - debian/patches/0013_fix-non-acpi-timer-interrupt-routing.patch * Remove comment from README.Debian about x86-64 support not being enabled. * Remove unused and obsolete plex86 patch. - debian/patches/plex86.disabled * Use $(filter ...) instead of $(findstring ...) to extract space separated options from DEB_BUILD_OPTIONS in debian/rules. * Add following configure options (to explicitly enable them): --enable-pcidev (only on Linux), --enable-acpi, --enable-usb-ohci, --enable-a20-pin, --enable-sse-extension, --enable-xsave, --enable-sep, --enable-popcnt, --enable-movbe. -- Guillem Jover Sat, 18 Apr 2009 02:42:15 +0200 bochs (2.3.7-1) unstable; urgency=low * New upstream release. - debian/patches/00_base.patch: Refresh. - debian/patches/01_build.patch: Likewise. - debian/patches/02_libtool.patch: Likewise. - debian/patches/03_qemu_bios.patch: Likewise. - debian/patches/04_man_table.patch: Likewise. - debian/patches/05_bios_delay_loop.patch: Likewise. - debian/patches/11_ftbfs_3dnow.patch: New file. Fix FTBFS. - debian/patches/99_upstream_bios_update.patch: Remove, in sync with upstream now. -- Guillem Jover Sat, 28 Jun 2008 03:58:49 +0300 bochs (2.3.6-5) unstable; urgency=low * Update packaging Vcs fields to the new URL. * Add a debian/README.source file (and move information about how to create the stripped tarballs from README.Debian). * Now using Standards-Version 3.8.0. * Cleanup debian/copyright: - Change 'Copyright' to 'Copyright Holders'. - Use UTF-8 copyright symbol. - Remove packaging svn information. * Remove perl from Build-Depends-Indep, it's Build-Essential. -- Guillem Jover Sun, 22 Jun 2008 09:52:32 +0300 bochs (2.3.6-4) unstable; urgency=low * Update bochsbios from uptream CVS: - Adds SMBIOS and DMI information. (Closes: #400902) - Adds support for LBA32 and LBA48. (Closes: #471395) - debian/patches/03_qemu_bios.patch: Remove hunk already in upstream. - debian/patches/99_upstream_bios_update.patch: New file. * Ship compressed man pages, just by rebuilding with a fixed debhelper. (Closes: #472932) * Provide a compatibility symlink for VGABIOS-lgpl-latest. (Closes: #462024) -- Guillem Jover Thu, 29 May 2008 05:12:50 +0300 bochs (2.3.6-3) unstable; urgency=low * Fix delay loop used for processors to be brought up, being optimized out when using gcc-4.2. (Closes: #471271) - debian/patches/05_bios_delay_loop.patch: New file. Thanks to Aurelien Jarno * Do not use pkg-config anymore before AC_PATH_XTRA, the build problem was fixed by making sure autoconf was run if needed. - debian/patches/20_use_pkg-config.patch: Remove. -- Guillem Jover Mon, 17 Mar 2008 04:44:33 +0200 bochs (2.3.6-2) unstable; urgency=low * Try to use pkg-config before AC_PATH_XTRA (fixes a FTBFS). Add pkg-config to Build-Depends. - debian/patches/patches/20_use_pkg-config.patch: New file. * Make sure autoconf is run if needed in debian/rules: - Rename configure.in target to setup-source. - Call config.status target in setup-source body. - Make build-arch and build-indep depend on setup-source instead of config.status. -- Guillem Jover Thu, 24 Jan 2008 05:33:20 +0200 bochs (2.3.6-1) unstable; urgency=low * New upstream release. - debian/patches/00_base.patch: Sync. - debian/patches/01_build.patch: Likewise. - debian/patches/02_libtool.patch: Likewise. - debian/patches/03_qemu_bios.patch: Likewise. - debian/patches/10_enable_iasl.patch: Likewise. * Do no use obsolete --enable-save-restore configure option. * Add armel to libasound2-dev architecture specifier in Build-Depends. Thanks to Joey Hess for noticing. * Add hppa to libasound2-dev architecture specifier in Build-Depends. -- Guillem Jover Wed, 23 Jan 2008 10:10:19 +0200 bochs (2.3.5-1) unstable; urgency=low * New upstream release. - debian/patches/01_man.patch: Fixed upstream. Remove. - debian/patches/03_redolog_FTBFS.patch: Likewise. - debian/patches/05_64_bit_cleanliness.patch: Likewise. - debian/patches/00_base.patch: Sync. * Remove versioned Build-Depends on dpkg, which is already on stable. * Remove Tag fields, they are better maintainer outside the package. * Improve tarball.sh to support cleaning upstream tarballs, and document its usage in README.Debian. * Turn failures when creating the tun device file non-fatal. * Add Homepage, Vcs-Browser and Vcs-Svn fields in debian/control. * Call configure with autotools-dev recommended --build and --host options. * Build-Depend on iasl and enable it to build acpi-dsdt.hex. * Ship BIOS-bochs-legacy in bochsbios. * Fix parallel FTBFS and jobserver warnings. - debian/patches/01_build.patch: New file. * Do not directly use the QA SourceForge redirector, instead use an URL to sf.net. (Closes: #453546) * Build and ship a qemu specific bios (BIOS-qemu-latest) in bochsbios. - debian/patches/03_qemu_bios.patch: New file. (Closes: #452937) Based on a patch by Soren Hansen . * Move patch dependency in debian/rules from build-arch and build-indep targets to configure.in. * Fail and print an error explaining that build-indep will only succeed on any-i386. (Closes: #451409) * Now using Standards-Version 3.7.3 (no changes needed). * Set bochs-doc Section to doc. -- Guillem Jover Fri, 07 Dec 2007 09:08:31 +0200 bochs (2.3+20070705-2) unstable; urgency=low * Fix differing prototype for tftp_send_optack in eth_vnet.cc affecting builds on 64 bit architectures. (Closes: #432250, #432405) - debian/patches/05_64_bit_cleanliness.patch: New file. Thanks to Aaron M. Ucko . -- Guillem Jover Tue, 10 Jul 2007 05:44:13 +0300 bochs (2.3+20070705-1) unstable; urgency=low * New upstream snapshot. - Do not provoke a BSOD for Windows 2000 from bochsbios. (Closes: #417416) - Fix OpenBSD 3.9 installation iso booting up to the installer with qemu. (Closes: #382795) - Fix heap buffer overflow in ne2k emulated driver. (Closes: #427144) CVE-2007-2893 - Support spaces in command line bochsrc-like options. (Closes: #250196) - debian/patches/00_base.patch: Sync. - debian/patches/01_man.patch: Likewise. - debian/patches/02_libtool.patch: Likewise. - debian/patches/03_redolog_FTBFS.patch: Likewise. - debian/patches/04_man_table.patch: Likewise. * Update Tag: field to the latest vocabulary. * Use binary:Version instead of deprecated Source-Version substvar. * Update CVSROOT in tarball.sh. * Explicitely point to LGPL 2.1 in debian/copyright. * Update menu entry section. * Do not ignore make errors on clean. * Switch configuration variables to simply expanded ones in debian/rules. * Update config.sub and config.guess on clean. -- Guillem Jover Sat, 07 Jul 2007 05:07:01 +0300 bochs (2.3-2) unstable; urgency=low * Install the note.gif only if building the binary independent packages. * Make the bochs wrapper exec the real binary, to avoid unneecessary running processes. -- Guillem Jover Mon, 18 Sep 2006 03:17:02 +0300 bochs (2.3-1) unstable; urgency=low * New upstream release. - debian/patches/00_base.patch: Sync. - debian/patches/03_g++-4.1.patch: Integrated upstream. Remove. - debian/patches/04_wx2.6.patch: Likewise. - debian/patches/03_redolog_FTBFS.patch: New file. Fix build failure. - Documentation now uses index.html instead of book1.html. Remove now unneeded debian/bochs-doc.links. (Closes: #380380) * Switched to quilt: - Add new debian/patches/series file. - Add Build-Depends on 'quilt (>= 0.40)'. - Include quilt.make from debian/rules. - Remove now unused debian/patch.mk. * Now using Standards-Version 3.7.2 (no changes needed). * Add 2006 to the copyright years in debian/copyright. * Remove obsolete template note and all debconf support with it. * Remove code to strip possible RPATH in SDL plugin as it should not contain it anymore, do not Build-Depend on chrpath anymore. * Use source:Version in bochs' bochsbios Depencency, to make the package binNMU safe, and Build-Depend on dpkg 1.13.19. * Fix manpage warning due to unwrappable long line by using a table. - debian/patches/04_man_table.patch: New file. * Include the note.gif image in the bochs-doc package. (Closes: #198766) * Do not install into bochs doc dir the README-plugins and README-wxWindows files which contain development information not interesting to the user, neither sb16ctrl example and source code which are provided in a separete package already. * Add a small README.plugins in the bochs package to document how to use the ui plugin packages. (Closes: #250194) Thanks to A Costa for the initial text. * Include bxcommit in the bximage package. * Include busmouse plugin in the bochs package. * Do not set unused substvar sb16ctrl-bochs:Architecture in debian/rules. * Enable new PIT model, APIC, Virtual 8086 Mode Extensions, x86_64, SSE4, icache, internal disassembler, io and memory repetition speedups, simulation save and restore, and limited USB support. * Upgrade cpu-level to 6, as required by the x86_64 support. * Add a Tag: field to all binary packages, using the data from debtags. -- Guillem Jover Sun, 17 Sep 2006 20:07:05 +0300 bochs (2.2.6-2) unstable; urgency=low * Fix typos in bochsrc(5). (Closes: #356012) - debian/patches/01_man.patch: New file. Thanks to A Costa . * Fix clean target by calling upstream dist-clean, bios-clean under bios/, and removing the misc/sb16/sb16ctrl and bios/VGABIOS-*. * Switch to libwxgtk2.6-dev and libgtk2.0-dev. - debian/patches/04_wx2.6.patch: New file. Thanks to Hans de Goede . * Fix FTBFS with g++ 4.1. (Closes: #357059) - debian/patches/03_g++-4.1.patch: New file. Thanks to Martin Michlmayr . -- Guillem Jover Tue, 21 Mar 2006 02:51:22 +0200 bochs (2.2.6-1) unstable; urgency=low * New upstream release. - debian/patches/01_doc.patch: Integrated upstream. Remove. - debian/patches/03_gcc-4.0.patch: Likewise. - debian/patches/00_base.patch: Sync. - debian/patches/02_libtool.patch: Likewise. * Do not install ROM BIOS that are not built anymore. * Do not create a fake stamp file for the ROM BIOS. * Fix debian/sb16ctrl.1: - Change the SEE ALSO references to be bold. - Escaped some hyphens. - Reindent the Bochs Online Documentation's URL. * Build the svga module on amd64. (Closes: #346577) Thanks to Kaare Hviid for the initial patch. -- Guillem Jover Thu, 9 Feb 2006 04:30:50 +0200 bochs (2.2.5-1) unstable; urgency=low * New upstream release. - debian/patches/00_base.patch: Synced. - debian/patches/01_doc.patch: Likewise. - debian/patches/02_libtool.patch: Likewise. * Debconf templates: - Added Spanish. (Closes: #333897) Thanks to César Gómez Martín . - Added Swedish. (Closes: #330987) Thanks to Daniel Nylander . - Added Portuguese. (Closes: #338892) Thanks to Simão Pedro Cardoso . * Include pci plugins into bochs package. (Closes: #341436) Thanks to Robert Millan * Fix more typos in bochs and bochsrc manpages. (Closes: #335334, #335336) Thanks to A Costa . * Wrap lines in debian/control fields (knowingly breaking policy). * Switch to debhelper compat level 5. * Build-Conflict against libwxgtk2.6-dev as it FTBFS if present. * Clean up debian/patch.mk: - Rename clean to unpatch. - Switch patch and unpatch to single-colon targets. - Add patch, unpatch, apply-patches and reverse-patches to the PHONY targets. * Clean up debian/rules file: - Add a proper copyright comment header. - Remove null, bochs and INSTALL_PROGRAM variables. - Switch clean to single-colon target, make it depend on unpatch and call make clean. - Swap config.status and configure from target to dependency. - Pass CFLAGS and CXXFLAGS to configure. - Remove configure from the PHONY targets. - Inline the main conf_args to the configure invokation. - Just use autoconf, and do not try autoconf2.50. - Split autoconf and configure commands in different targets. - Make build-arch and build-indep depend on patch and config.status. - Make binary-indep depend on install-indep, and binary-arch on install. - Remove commented debhelper commands. -- Guillem Jover Sat, 7 Jan 2006 08:19:52 +0200 bochs (2.2.1-2) unstable; urgency=low * Use misc:Depends instead of an explicit dependency to debconf to get the alternative debconf-2.0 as well. * Fix typo in bochsrc.5 that prevents the line from being displayed. (Closes: #326528) - debian/patches/01_doc.patch: Updated. Thanks to Nicolas François . * Update LGPL to 2.1 and fix FSF address in debian/copyright. * Change Build-Depends to 'libreadline5-dev | libreadline-dev' from 'libreadline4-dev'. * Fix bashisms in bochs.config and bochs.postinst. * Added missing angle to email address in sb16ctrl.1. * Install sb16ctl.1 in the binary. * Use variable assignment and handle spaces in filenames correctly. - debian/launcher: Updated. * Do not use a variable with read and use $() instead of backticks. - debian/launcher/etc/bochs-init/init.sh: Reindent. Updated. -- Guillem Jover Sun, 11 Sep 2005 05:24:24 +0300 bochs (2.2.1-1) unstable; urgency=low * New upstream release. - debian/patches/00_base.patch: Synced. - debian/patches/01_doc.patch: Likewise. - debian/patches/02_libtool.patch: Likewise. - debian/patches/03_gcc-4.0.patch: Likewise. - debian/patches/04_no_pcibios_init.patch: Removed. - Fix ">>PANIC<< prefetch: RIP > CS.limit". (Closes: #162785, #288766) - Fix TUN/TAP network interface. (Closes: #268422) * Added Vietnamese debconf translation. (Closes: #313170) Thanks to Clytie Siddall . * Fix typos in the bochsrc man page. (Closes: #310359) - debian/patches/01_doc.patch: Update. Thanks to A Costa . * Enable the pseudo NIC interface to be used with EtherBoot and document the addition in the README.Debian file. Thanks to Robert Millan for the pointer. * Cosmetic cleaning of README.Debian. * Provide a symlinked manpage for bochs-bin. * Add a man page for sb16ctrl. * Explicitly state architectures and stop using type-handling. * Replace aalib1-dev Build-Depends with libaa1-dev. * Replace xlibs-dev Build-Depends with the fain grained only ones needed: libx11-dev, libxpm-dev, libice-dev, libsm-dev. * Tighten dependencies on bochsbios and vgabios. (Closes: #290188) * Do not use a stamp file for configure. * Add Debian Subversion repository URL. * Update copyright year. * Update watch file to version 3 (no changes needed). * Now using Standards-Version 3.6.2 (no changes needed). * Use new QA SourceForge watch redirector. * Use new dpkg-architecture variables for os and cpu. * C++ ABI transition. - Remove special case for m68k to use g++-3.4. -- Guillem Jover Fri, 29 Jul 2005 03:18:33 +0300 bochs (2.1.1+20041109-3) unstable; urgency=high * Remove rombios pcibios initialization code. It lets the virtual box in a state inconsitent with what qemu expects. - debian/patches/04_no_pcibios_init.patch: New file. (Closes: #281862, #283166, #284132, #285752) -- Guillem Jover Tue, 11 Jan 2005 18:36:23 +0100 bochs (2.1.1+20041109-2) unstable; urgency=high * Build-Depends and use gcc-3.4 on m68k to avoid an ICE. (Closes: #284050) * Fix build failure with gcc-4.0. (Closes: #284748) Thanks to Andreas Jochens . * Add missing "--tag CXX" in libtool invokations. * Remove possible RPATH in SDL plugin. * Fix typo in documentation. (Partial fix: #198766) * Fix broken links to Home in bochs-doc manuals. (Closes: #198861) * Update bochsrc(5) with new vgaromimage syntax, and fix warnings in all manpages. (Closes: #274336) -- Guillem Jover Mon, 13 Dec 2004 17:22:43 +0100 bochs (2.1.1+20041109-1) unstable; urgency=low * New maintainer. (Closes: #276392) * New upstream snapshot. - Stop using tar in tar. - Fix Linux kernel loading on 2.4.26 or 2.6.8 and up. (Closes: #273424) * Added a debian/tarball.sh script to easily manage snapshots. * Patches: - Use debian/patch.mk. - debian/patches/gdb.diff: Remove, integrated upstream. - debian/patches/gzip.diff: Likewise. - debian/patches/kbsd-gnu.diff: Likewise - debian/patches/orig.diff: Renamed to ... - debian/patches/00_base.patch: ... this. Remove upstream integrated changes. Fixed 3DNow hunk duplication. - debian/patches/plex86.diff: Renamed to ... - debian/patches/plex86.disabled: ... this. * Use new vgaromimage syntax in bochs-init config: - debian/etc/bochs-init/bochsrc: Update. * Create tun devices. (Closes: #215576) * Removed leftover debian/rules.ZILESAVE. * Removed leftover debian/xfonts-bochs.dirs. * General cosmetic fixes. * Cleaned debian/copyright. * Major cleanup of debian/rules. - Honour noopt in DEB_BUILD_OPTIONS. - Build with debugging symbols by default. - Use -s in debhelper scripts instead of -a and hardcoded package excludes. - Use debian/tmp as the source dir in dh_install. Fix all *.install files. * Added a debian/watch file. * Added Catalan debconf template. * Now using Standard-Version 3.6.1. -- Guillem Jover Sat, 13 Nov 2004 17:32:09 +0100 bochs (2.1.1+20040903-3) unstable; urgency=low * QA Upload * Correct QA Group's maintainer address * Bug fix: "Czech translation of bochs debconf messages", thanks to Jan Outrata (Closes: #275500). -- Frank Lichtenheld Mon, 8 Nov 2004 04:28:11 +0100 bochs (2.1.1+20040903-2) unstable; urgency=low * Orphan. - control.in (Maintainer): Set to Debian QA Group. -- Robert Millan Wed, 13 Oct 2004 20:58:27 +0200 bochs (2.1.1+20040903-1) unstable; urgency=low * New upstream snapshot. - patches: Resync some stuff. - control.in (Depends): Set vgabios (>= 0.4c+20040829-2) * Add German and Japanese translations. - po/de.po - po/ja.po -- Robert Millan Fri, 3 Sep 2004 10:34:28 +0200 bochs (2.1.1-11) unstable; urgency=low * rules (conf_args): Enable mmx, 3dnow, compressed-hd (unimplemented). * control (Build-Depends): Add libreadline4-dev. * patches/ftbfs_mmx.diff: New. Fix some fuckery. -- Robert Millan Mon, 30 Aug 2004 04:24:39 +0200 bochs (2.1.1-10) unstable; urgency=high * urgency=high because change in -8 _must_ release with sarge. * patches/gdb.diff: Fix dependency on plex86 patch, which was disabled on 2.1.1-8. (Closes: #265941) * rules: Fail if any patch fails to apply (I hate make). -- Robert Millan Mon, 16 Aug 2004 03:31:50 +0200 bochs (2.1.1-9) unstable; urgency=low * Allow building of bochsbios on non-i386. It was reported that the resulting binary is identical, since we use bin86/bcc to compile it. (Closes: #249796). -- Robert Millan Sun, 15 Aug 2004 02:01:48 +0200 bochs (2.1.1-8) unstable; urgency=low * Disable Plex86 backend. -- Robert Millan Mon, 9 Aug 2004 20:56:01 +0200 bochs (2.1.1-7) unstable; urgency=low * rules: Fallback to autoconf when autoconf2.50 is not found (sigh). -- Robert Millan Thu, 5 Aug 2004 21:11:30 +0200 bochs (2.1.1-6) unstable; urgency=low * Use type-handling to handle dpkg arch-specific build-dependencies. - control.in: New. - rules: Parse @i386@, @linux-gnu@ and @svgalib@ from control.in. * Allow building of binary-indep from any platform. - control.in (Build-Depends): Nuke i386. * Explicitly use autoconf2.50. - rules: s/autoconf/autoconf2.50/g - control.in (Build-Conflicts): Nuke autoconf2.13. * patches/kbsd-gnu.diff: New. Fix GNU/k*BSD portability issues. -- Robert Millan Thu, 5 Aug 2004 04:05:30 +0200 bochs (2.1.1-5) unstable; urgency=low * Fix FTBFS on ! i386-linux-gnu. (Closes: #247957) - rules: Pass -Nbochs-svga to dh_gencontrol for ! i386-linux-gnu. * etc/bochs-init: New. Scripts for running Bochs as init. - README.Debian: Describe what this means. - rules: Install it in debian/tmp. - bochs.install: Add it. -- Robert Millan Tue, 27 Apr 2004 09:44:37 +0200 bochs (2.1.1-4) unstable; urgency=low * New binary package: bochs-svga (SVGA GUI plugin). - control (Build-Depends): Add libsvga1-dev [i386]. - control: Add bochs-svga (for i386-linux-gnu only). - rules (conf_args): Add --with-svga on i386-linux-gnu. - bochs-svga.install: New. Install svga plugin. -- Robert Millan Mon, 26 Apr 2004 20:26:34 +0200 bochs (2.1.1-3) unstable; urgency=low * Noone loves Xfree86 anymore. - control: s/Xfree86/X11/g. * Sad, but true. Disable AMD64 support. (Closes: #242793) - rules (conf_args): Remove --enable-x86-64. - control (Description): Remove amd64-related bits. * Kiss bochsconf goodbye. (Closes: #203698) - bochsconf: Nuked. - README.Debian: Replace bochsconf-related notes. - bochs.install: Nuke bochsconf. - rules: Ditto. - launcher: Remove bochsconf-related lines. * control: Make descriptions of bochsbios, bochs-term, bochs-x, bochs-wx and bochs-sdl more accurate. Thanks Javier. (Closes: #209436, #209437, #209446, #209472, #209522) * Add Dutch po-debconf translation. (Closes: #241317) - po/nl.po: New. Contributed by Luk Claes -- Robert Millan Sun, 25 Apr 2004 21:37:36 +0200 bochs (2.1.1-2) unstable; urgency=low * rules (conf_args): Add --enable-fpu. (Closes: #239904) * control (Build-Depends): Add libasound2-dev, aalib1-dev. (Closes: #239927) * patches/orig.diff: Resync. * README.Debian: Remove reference to user/x1948.html. (Closes: #237274) * control (Suggests): Nuke e2fsprogs. -- Robert Millan Wed, 24 Mar 2004 22:43:26 +0100 bochs (2.1.1-1) unstable; urgency=low * New upstream release. -- Robert Millan Thu, 11 Mar 2004 14:21:42 +0100 bochs (2.1rel-4) unstable; urgency=low * launcher: Made bochsconf run optional. (Closes: #179143) -- Robert Millan Sat, 7 Feb 2004 13:39:56 +0100 bochs (2.1rel-3) unstable; urgency=low * rules: s/gdb-stubs/gdb-stub/g. (Really closes: #224862) -- Robert Millan Fri, 6 Feb 2004 15:04:13 +0100 bochs (2.1rel-2) unstable; urgency=low * patches/gdb.diff: New. Turn GDB stubs into a conffile option. (patch from Charles Duffy) * rules: Enable GDB stubs. (Closes: #224862) - 0list: Update. -- Robert Millan Sun, 1 Feb 2004 23:29:59 +0100 bochs (2.1rel-1) unstable; urgency=low * New upstream release. * patches/plex86.diff: Dont panic on failure to open Plex86 device. (Closes: #222550) -- Robert Millan Sat, 31 Jan 2004 16:54:18 +0100 bochs (2.1pre3-1) unstable; urgency=low * New upstream pre-release. * Switch to debhelper compat 4. - rules: Don't override DH_COMPAT. - compat: New. * rules: Add --enable-idle-hack. Thanks Josh Metzler. (Closes: #223879) -- Robert Millan Sat, 10 Jan 2004 12:53:34 +0100 bochs (2.1pre1.a-2) unstable; urgency=low * rules: Reorganise kernel-specific checks. -- Robert Millan Tue, 16 Dec 2003 16:45:21 +0100 bochs (2.1pre1.a-1) unstable; urgency=low * Switched to DBS-like tarball/patch handling. (Closes: #217522) * control: Lower Recommends to Suggests for Plex86. (Closes: #215112) * Nuked redundant upstream changelog.gz file. (Closes: #170545) -- Robert Millan Tue, 28 Oct 2003 20:07:59 +0100 bochs (2.1pre1-1) unstable; urgency=low * New upstream release. -- Robert Millan Wed, 8 Oct 2003 21:57:37 +0000 bochs (2.0.2+20030829-1) unstable; urgency=low * New upstream snapshot. - Updated libtool. (Closes: #195826) - Fixed CPU bug. (Closes: #197094) - debian/patches/orig.diff: Update. - debian/patches/plex86.diff: Update. * debian/{control,po/,templates}: Switch to gettext-based debconf templates; thanks Christian Perrier. (Closes: #205777) * debian/po/fr.po: New. French debconf translation; thanks again to Christian Perrier. (Closes: #206735) * debian/rules: s/freebsd/kfreebsd-gnu/g cleanup. * debian/control (xfonts-bochs): Nuked (obsoleted upstream). * debian/rules: Likewise. * debian/bochs.install: Add "gameport" plugin. * debian/control (bochsbios): Bumped bochs dependency. -- Robert Millan Fri, 29 Aug 2003 14:09:39 +0000 bochs (2.0.2+20030525-1) unstable; urgency=low * New upstream snapshot. * Merged fix-link-deps.diff and cpu/3dnow.cc fixes into upstream. * Update plex86.diff from upstream's bts. (see patch header) -- Robert Millan Sun, 25 May 2003 03:49:22 +0200 bochs (2.0.2+20030522-3) unstable; urgency=low * Fixed link dependencies in bochs-* GUI packages so that GUI plugins depend on their respective GUI libraries, and bochs can stop depending on them. (Closes: #176458) -- Robert Millan Sat, 24 May 2003 13:36:09 +0200 bochs (2.0.2+20030522-2) unstable; urgency=low * Moved diffs into debian/patches. * Added patch for Plex86 support. -- Robert Millan Fri, 23 May 2003 17:17:50 +0000 bochs (2.0.2+20030522-1) unstable; urgency=low * New upstream snapshot. - fixes FTBFS. - has x11-pc-be.map (Closes: #191080) * Copy all missing plugins from plugin dir. (Closes: #191639) -- Robert Millan Thu, 22 May 2003 00:36:17 +0200 bochs (2.0.2+20020419-1) unstable; urgency=low * New upstream snapshot. (Closes: #188538) * Fix x86-64 emulation. thanks Arnd Bergmann. (Closes: #189349) -- Robert Millan Sat, 19 Apr 2003 19:38:39 +0200 bochs (2.0.2-3) unstable; urgency=low * Added libgtk1.2-dev explicitly to Build-Depends. (Closes: #181964) * Put debian address in Maintainer field. -- Robert Millan Fri, 21 Feb 2003 18:46:59 +0100 bochs (2.0.2-2) unstable; urgency=low * First upload as a developer. * Building against libwxgtk2.4-dev. (Closes: #178294) * Fixed marks in SGML documentation, thanks Aaron M. Ucko. (Closes: #179138) * Fixed GZIP variable mess in Makefile.in. -- Robert Millan Thu, 20 Feb 2003 22:43:05 +0100 bochs (2.0.2-1) unstable; urgency=low * New upstream release. (Closes: #176339) * Fixed build problem with sb16ctrl. (Closes: #175947) * Added Replaces line on all bochs-gui packages. (Closes: #175264) * Removed HTML documentation from bochs package. * Fixed wrong links in index.html of documentation. (Closes: #175888) -- Robert Millan Fri, 24 Jan 2003 16:47:21 +0100 bochs (2.0rel-2) unstable; urgency=low * Added sb16ctrl-bochs (again). * Removed linuxisms from sb16ctrl.c. * Put xfonts-bochs dependency on bochs-x. (Closes: #174109) * Now building html docs from docbook. Splitted into bochs-doc package. * Added entry in debian menu. -- Robert Millan Wed, 25 Dec 2002 01:56:24 +0100 bochs (2.0rel-1) unstable; urgency=low * New upstream release. * Split GUI plugins in their own packages to lower dependencies. * Fixed Hurd nomenclaure in documentation. -- Robert Millan Sun, 22 Dec 2002 01:55:56 +0100 bochs (2.0pre3-1) unstable; urgency=low * New upstream release. * Enabling plugins. * Compiling SDL support. * Add version check for conffile change debconf warning. (Closes: #170725) * Add some notes about sb16ctrl.c in README.Debian. (Closes: #161873) * Got rid of CHANGES.gz. (Closes: #170545) -- Robert Millan Sat, 7 Dec 2002 14:57:30 +0100 bochs (2.0pre2-1) unstable; urgency=low * New upstream release. * Building WxWindows frontend (GTK+ based). * Enabling x86-64 by default. * Merged support for the different GUIs (X, curses, Wx) into one binary, as they are no longer exclussive. * Removed sb16ctrl package as it prevented Bochs from getting into testing. Now sb16ctrl is in /usr/share/doc/bochs/sb16ctrl.c for you to build. (Closes: #161873) * Now Bochs binary can do most of what the launcher used to, so I've rewritten the bochs launcher to do no more than a pair of things. * Configuration file #home# and #guest# tags are now environmental variables, added debconf template to tell the user he/she has to rework his/her bochsrc. -- Robert Millan Fri, 22 Nov 2002 15:51:16 +0100 bochs (1.4.1.z.cvs20021031-1) unstable; urgency=low * New upstream snapshot. * Fixed commandline parser of launcher, thanks Robbe. (Closes: #167152) * Force creating sb16ctrl symlink. (Closes: #166906) * Using --enable-all-optimizations autoconf flag. * Stripping sb16ctrl with dh_strip. -- Robert Millan Fri, 1 Nov 2002 15:23:52 +0100 bochs (1.4.1.z.cvs20020927-1) unstable; urgency=low * New upstream snapshot. Implemented x86-64 support (see README.Debian) * Disabling i686 optimisations as are discouraged upstream (fallback to i586) * Fixed targets in debian/rules for building build-arch separately from build-indep. (Closes: #161831) * Now using dh_install. -- Robert Millan Fri, 27 Sep 2002 13:51:53 +0200 bochs (1.4.1.z.cvs20020915-1) unstable; urgency=low * New upstream snapshot with GDB stub patch. * Reactivating bios building, as bug #153449 is fixed now. * Enabling i686, MMX and FPU optimisations. -- Robert Millan Sun, 15 Sep 2002 07:51:41 +0200 bochs (1.4.1.no.gifs-1) unstable; urgency=low * Got rid of gifs. * Splitted build-indep section. * Addition of bochsbios and sb16ctrl. * Temporarily deactivating bios building (see bug #153449). -- Robert Millan Mon, 29 Jul 2002 23:54:45 +0200 bochs (1.4.1.no.elpin-1) unstable; urgency=low * Removed nonfree elpin BIOS (ouch!). (Closes: #152762) -- Robert Millan Fri, 12 Jul 2002 05:52:51 +0200 bochs (1.4.1-1) unstable; urgency=low * New upstream release. * Add dependancy on bochs to bochs-x and bochs-curses. (Closes: #150553) -- Robert Millan Wed, 26 Jun 2002 09:16:29 +0200 bochs (1.4rel-6) unstable; urgency=low * Removed DOC-linux.html installation document, useless in the package. * Fixed sed rule in upstream Makefile to replace @VERSION@. (Closes: #140219) * Made launcher to search .bochsrc in `pwd` first. (Closes: #146397) * Patched misc non-upstream issues in manpages. -- Robert Millan Sat, 11 May 2002 12:52:50 +0200 bochs (1.4rel-5) unstable; urgency=low * Enabled support to specify location for bochsrc. * Using versioned depends from bochs to bochs-{x,curses}. (Closes: #145268) * Enabling serial support in iodev/serial.cc. (Closes: #145983) * Merged FHS fixes into Makefile. Fixed misc install issues. (Closes: #140219, #145943) * Added GNU #defines to iodev/cdrom.cc. -- Robert Millan Sun, 21 Apr 2002 08:36:14 +0200 bochs (1.4rel-4) unstable; urgency=low * Got rid of linux/fs.h include that broak build on some arches. -- Robert Millan Thu, 18 Apr 2002 15:20:52 +0200 bochs (1.4rel-3) unstable; urgency=low * Fallback to fixed fonts when vga fonts are not present. * Fixed deboostrap typo in debian/control. * Checking for X properly with test -z $DISPLAY. (Closes: #142537) -- Robert Millan Fri, 12 Apr 2002 12:31:35 +0200 bochs (1.4rel-2) unstable; urgency=low * Reworked launcher script to be more flexible and less intrusive. * Written Bochsconf tool to simplify setup. (please test!) * Nicer error message when xfont is not present. (Closes: 142059) -- Robert Millan Mon, 8 Apr 2002 18:47:21 +0200 bochs (1.4rel-1) unstable; urgency=low * New upstream release. * Merged gui/gui.cc into upstream. * Fixed bad syntax in debian/rules that disabled vbe, cdrom, sb16 and ne2k support for the X interface. (Closes: #140233) -- Robert Millan Thu, 28 Mar 2002 22:04:59 +0100 bochs (1.4pre2-2) unstable; urgency=low * Enabled Vesa Bios Extensions support, since vgabios now provides it. * Created a bochs-curses package with ncurses interface. (had to fix gui/gui.cc, with undeclared identifiers) * Now using tempfile to get random locations in laucher. -- Robert Millan Wed, 20 Mar 2002 13:32:27 +0100 bochs (1.4pre2-1) unstable; urgency=low * New upstream release * Created a launcher script for bochs. bochsrc is autoloaded and $HOME is parsed. * Enabled network support for GNU/Linux (oops) -- Robert Millan Wed, 6 Mar 2002 15:41:58 +0100 bochs (1.3-2) unstable; urgency=low * Removed unnecessary bcc and bin86 from Build-Depends. (sigh, did i dream they were required?) * Added support for GNU and GNU/*BSD. * Passing DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE to configure. -- Robert Millan Sun, 3 Mar 2002 14:21:16 +0100 bochs (1.3-1) unstable; urgency=low * Initial Release. (Closes: #78642) * Sorry Goswin, had to take it. -- Robert Millan Sat, 12 Jan 2002 11:34:12 +0100 debian/compat0000644000000000000000000000000211403506737010372 0ustar 7 debian/patches/0000755000000000000000000000000011714224746010625 5ustar debian/patches/series0000644000000000000000000000124011714224725012034 0ustar local-config.patch local-paths.patch build-recursive-make.patch build-use-jade-instead-of-docboock2html.patch build-fix-SHELL.patch build-fix-libtool-calls.patch build-use-system-libltdl.patch build-on-linux-3.x.patch build-link-only-needed-libs.patch build-qemu-bios.patch 0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch 0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch 0008_qemu-bios-provide-gpe-_l0x-methods.patch 0009_qemu-bios-pci-hotplug-support.patch 0011_read-additional-acpi-tables-from-a-vm.patch 0012-load-smbios-entries-and-files-from-qemu.patch build-enable-iasl.patch bios-discard-eh_frame.patch bios-delay-loop.patch man-warnings.patch debian/patches/build-on-linux-3.x.patch0000644000000000000000000000111011714224746015113 0ustar Author: Guillem Jover --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/configure.in +++ b/configure.in @@ -702,12 +702,12 @@ AC_ARG_ENABLE(pcidev, PCIDEV_MODULE_MAKE_ALL="all-kernel24" KERNEL_MODULE_SUFFIX="o" ;; - 2.6*) + 2.6*|3.*) PCIDEV_MODULE_MAKE_ALL="all-kernel26" KERNEL_MODULE_SUFFIX="ko" ;; *) - AC_MSG_ERROR([Linux kernel 2.4 or 2.6 is required]) + AC_MSG_ERROR([Linux kernel 2.4, 2.6 or 3.x is required]) ;; esac KERNELDIR="/lib/modules/$linux_version/build" debian/patches/bios-delay-loop.patch0000644000000000000000000000103611714224725014642 0ustar Author: Aurelien Jarno Since bochsbios is built with gcc-4.2, the delay loop that is used to wait for processors to be brought up is being optimized out. This result in -smp not working in QEMU. --- bios/rombios32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -369,7 +369,7 @@ void bios_printf(int flags, const char * void delay_ms(int n) { - int i, j; + volatile int i, j; for(i = 0; i < n; i++) { #ifdef BX_QEMU volatile int k; debian/patches/man-warnings.patch0000644000000000000000000000325411714224746014253 0ustar Author: Guillem Jover --- doc/man/bochsrc.5 | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) --- a/doc/man/bochsrc.5 +++ b/doc/man/bochsrc.5 @@ -169,13 +169,18 @@ starts to autorepeat, and the measureme BogoMips and other benchmarks. Example Specifications[1] - Bochs Machine/Compiler Mips - ------------------------------------------------------------------- - 2.3.7 3.2Ghz Intel Core 2 Q9770 with WinXP/g++ 3.4 50 to 55 Mips - 2.3.7 2.6Ghz Intel Core 2 Duo with WinXP/g++ 3.4 38 to 43 Mips - 2.2.6 2.6Ghz Intel Core 2 Duo with WinXP/g++ 3.4 21 to 25 Mips - 2.2.6 2.1Ghz Athlon XP with Linux 2.6/g++ 3.4 12 to 15 Mips - 2.0.1 1.6Ghz Intel P4 with Win2000/g++ 3.3 5 to 7 Mips + +.TS +tab (@); +l l l. +Bochs@Machine/Compiler@Mips +_ +2.3.7@3.2Ghz Intel Core 2 Q9770 w/ WinXP/g++ 3.4@50-55 Mips +2.3.7@2.6Ghz Intel Core 2 Duo w/ WinXP/g++ 3.4@38-43 Mips +2.2.6@2.6Ghz Intel Core 2 Duo w/ WinXP/g++ 3.4@21-25 Mips +2.2.6@2.1Ghz Athlon XP w/ Linux 2.6/g++ 3.4@12-15 Mips +2.0.1@1.6Ghz Intel P4 w/ Win2000/g++ 3.3@5-7 Mips +.TE [1] IPS measurements depend on OS and compiler configuration in addition to processor clock @@ -931,7 +936,7 @@ Example: This option controls the presence of the USB root hub which is a part of the i440FX PCI chipset. With the portX option you can connect devices to the hub (currently supported: 'mouse', 'tablet', 'keypad', 'disk', 'cdrom', -'hub' and 'printer'). +\(aqhub' and 'printer'). The optionsX parameter can be used to assign specific options to the device connected to the corresponding USB port. Currently this feature is only used debian/patches/0011_read-additional-acpi-tables-from-a-vm.patch0000644000000000000000000001134211714224407021304 0ustar Read additional ACPI tables from a VM (Gleb Natapov) Signed-off-by: Gleb Natapov Signed-off-by: Anthony Liguori --- bios/rombios.h | 2 + bios/rombios32.c | 79 +++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 61 insertions(+), 20 deletions(-) --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -449,6 +449,27 @@ void qemu_cfg_read(uint8_t *buf, int len while (len--) *(buf++) = inb(QEMU_CFG_DATA_PORT); } + +static uint16_t acpi_additional_tables(void) +{ + uint16_t cnt; + + qemu_cfg_select(QEMU_CFG_ACPI_TABLES); + qemu_cfg_read((uint8_t*)&cnt, sizeof(cnt)); + + return cnt; +} + +static int acpi_load_table(int i, uint32_t addr, uint16_t *len) +{ + qemu_cfg_read((uint8_t*)len, sizeof(*len)); + + if (!*len) + return -1; + + qemu_cfg_read((uint8_t*)addr, *len); + return 0; +} #endif void uuid_probe(void) @@ -1484,8 +1505,8 @@ void acpi_bios_init(void) uint32_t hpet_addr; #endif uint32_t base_addr, rsdt_addr, fadt_addr, addr, facs_addr, dsdt_addr, ssdt_addr; - uint32_t acpi_tables_size, madt_addr, madt_size; - int i; + uint32_t acpi_tables_size, madt_addr, madt_size, rsdt_size; + uint16_t i, external_tables; if (ram_size - ACPI_DATA_SIZE < 0x100000) { BX_INFO("Not enough memory for ACPI tables\n"); @@ -1503,10 +1524,17 @@ void acpi_bios_init(void) bios_table_cur_addr += sizeof(*rsdp); #endif +#ifdef BX_QEMU + external_tables = acpi_additional_tables(); +#else + external_tables = 0; +#endif + addr = base_addr = ram_size - ACPI_DATA_SIZE; rsdt_addr = addr; rsdt = (void *)(addr); - addr += sizeof(*rsdt); + rsdt_size = sizeof(*rsdt) + external_tables * 4; + addr += rsdt_size; fadt_addr = addr; fadt = (void *)(addr); @@ -1545,12 +1573,6 @@ void acpi_bios_init(void) addr += sizeof(*hpet); #endif - acpi_tables_size = addr - base_addr; - - BX_INFO("ACPI tables: RSDP addr=0x%08lx ACPI DATA addr=0x%08lx size=0x%x\n", - (unsigned long)rsdp, - (unsigned long)rsdt, acpi_tables_size); - /* RSDP */ memset(rsdp, 0, sizeof(*rsdp)); memcpy(rsdp->signature, "RSD PTR ", 8); @@ -1562,17 +1584,6 @@ void acpi_bios_init(void) rsdp->rsdt_physical_address = cpu_to_le32(rsdt_addr); rsdp->checksum = acpi_checksum((void *)rsdp, 20); - /* RSDT */ - memset(rsdt, 0, sizeof(*rsdt)); - rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr); - rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr); - rsdt->table_offset_entry[2] = cpu_to_le32(ssdt_addr); -#ifdef BX_QEMU - rsdt->table_offset_entry[3] = cpu_to_le32(hpet_addr); -#endif - acpi_build_table_header((struct acpi_table_header *)rsdt, - "RSDT", sizeof(*rsdt), 1); - /* FADT */ memset(fadt, 0, sizeof(*fadt)); fadt->firmware_ctrl = cpu_to_le32(facs_addr); @@ -1649,6 +1660,7 @@ void acpi_bios_init(void) "APIC", madt_size, 1); } + memset(rsdt, 0, rsdt_size); #ifdef BX_QEMU /* HPET */ memset(hpet, 0, sizeof(*hpet)); @@ -1659,8 +1671,35 @@ void acpi_bios_init(void) hpet->addr.address = cpu_to_le32(ACPI_HPET_ADDRESS); acpi_build_table_header((struct acpi_table_header *)hpet, "HPET", sizeof(*hpet), 1); + + acpi_additional_tables(); /* resets cfg to required entry */ + for(i = 0; i < external_tables; i++) { + uint16_t len; + if(acpi_load_table(i, addr, &len) < 0) + BX_PANIC("Failed to load ACPI table from QEMU\n"); + rsdt->table_offset_entry[i+4] = cpu_to_le32(addr); + addr += len; + if(addr >= ram_size) + BX_PANIC("ACPI table overflow\n"); + } #endif + /* RSDT */ + rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr); + rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr); + rsdt->table_offset_entry[2] = cpu_to_le32(ssdt_addr); +#ifdef BX_QEMU + rsdt->table_offset_entry[3] = cpu_to_le32(hpet_addr); +#endif + acpi_build_table_header((struct acpi_table_header *)rsdt, + "RSDT", rsdt_size, 1); + + acpi_tables_size = addr - base_addr; + + BX_INFO("ACPI tables: RSDP addr=0x%08lx ACPI DATA addr=0x%08lx size=0x%x\n", + (unsigned long)rsdp, + (unsigned long)rsdt, acpi_tables_size); + } /* SMBIOS entry point -- must be written to a 16-bit aligned address --- a/bios/rombios.h +++ b/bios/rombios.h @@ -215,6 +215,8 @@ #define QEMU_CFG_SIGNATURE 0x00 #define QEMU_CFG_ID 0x01 #define QEMU_CFG_UUID 0x02 +#define QEMU_CFG_ARCH_LOCAL 0x8000 +#define QEMU_CFG_ACPI_TABLES (QEMU_CFG_ARCH_LOCAL + 0) #define PCI_ADDRESS_SPACE_MEM 0x00 #define PCI_ADDRESS_SPACE_IO 0x01 debian/patches/bios-discard-eh_frame.patch0000644000000000000000000000056611714224746015764 0ustar Author: Guillem Jover --- bios/rombios32.ld | 1 + 1 file changed, 1 insertion(+) --- a/bios/rombios32.ld +++ b/bios/rombios32.ld @@ -12,6 +12,7 @@ SECTIONS /DISCARD/ : { *(.stab) *(.stabstr) *(.comment) + *(.eh_frame) *(.note) } } debian/patches/build-enable-iasl.patch0000644000000000000000000000150511714224746015120 0ustar Author: Guillem Jover --- bios/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/bios/Makefile.in +++ b/bios/Makefile.in @@ -62,6 +62,7 @@ bios: biossums BIOS-bochs-latest BIOS-bo clean: @RMCOMMAND@ *.o *.a *.s _rombios*_.c rombios*.txt rombios*.sym + @RMCOMMAND@ acpi-dsdt.hex acpi-dsdt.aml @RMCOMMAND@ usage biossums @RMCOMMAND@ rombios16.bin rombios16-qemu.bin @RMCOMMAND@ rombios32.bin rombios32.out @@ -124,13 +125,11 @@ rombios32.o: rombios32.c acpi-dsdt.hex r rombios32-qemu.o: rombios32.c acpi-dsdt.hex rombios.h $(GCC32) -DBX_QEMU -O2 -Wall -c -o $@ $< -ifeq ("1", "0") acpi-dsdt.hex: acpi-dsdt.dsl cpp -P $< $<.i iasl -tc -p $@ $<.i rm $<.i sed -i -e's/^unsigned/const unsigned/' $@ -endif rombios32start.o: rombios32start.S $(GCC32) -c -o $@ $< debian/patches/0008_qemu-bios-provide-gpe-_l0x-methods.patch0000644000000000000000000000420511714224407020731 0ustar qemu: bios: provide gpe _L0x methods (Glauber Costa) provide methods for gpe blk 0, even though they do nothing atm Signed-off-by: Glauber Costa Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- bios/acpi-dsdt.dsl | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ bios/rombios32.c | 2 + 2 files changed, 57 insertions(+) --- a/bios/acpi-dsdt.dsl +++ b/bios/acpi-dsdt.dsl @@ -597,4 +597,59 @@ DefinitionBlock ( Zero, /* reserved */ Zero /* reserved */ }) + + Scope (\_GPE) + { + Name(_HID, "ACPI0006") + + Method(_L00) { + Return(0x01) + } + Method(_L01) { + Return(0x01) + } + Method(_L02) { + Return(0x01) + } + Method(_L03) { + Return(0x01) + } + Method(_L04) { + Return(0x01) + } + Method(_L05) { + Return(0x01) + } + Method(_L06) { + Return(0x01) + } + Method(_L07) { + Return(0x01) + } + Method(_L08) { + Return(0x01) + } + Method(_L09) { + Return(0x01) + } + Method(_L0A) { + Return(0x01) + } + Method(_L0B) { + Return(0x01) + } + Method(_L0C) { + Return(0x01) + } + Method(_L0D) { + Return(0x01) + } + Method(_L0E) { + Return(0x01) + } + Method(_L0F) { + Return(0x01) + } + } + } --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -1591,6 +1591,8 @@ void acpi_bios_init(void) fadt->pm_tmr_len = 4; fadt->plvl2_lat = cpu_to_le16(0xfff); // C2 state not supported fadt->plvl3_lat = cpu_to_le16(0xfff); // C3 state not supported + fadt->gpe0_blk = cpu_to_le32(0xafe0); + fadt->gpe0_blk_len = 4; /* WBINVD + PROC_C1 + PWR_BUTTON + SLP_BUTTON + FIX_RTC */ fadt->flags = cpu_to_le32((1 << 0) | (1 << 2) | (1 << 4) | (1 << 5) | (1 << 6)); acpi_build_table_header((struct acpi_table_header *)fadt, "FACP", debian/patches/0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch0000644000000000000000000000273411403506737022554 0ustar bios: add 26 pci slots, bringing the total to 32 (Avi Kivity) lack of pci slots causes Windows to complain when installing too many devices. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- bios/acpi-dsdt.dsl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) --- a/bios/acpi-dsdt.dsl +++ b/bios/acpi-dsdt.dsl @@ -63,6 +63,32 @@ DefinitionBlock ( prt_slot3(0x0003), prt_slot0(0x0004), prt_slot1(0x0005), + prt_slot2(0x0006), + prt_slot3(0x0007), + prt_slot0(0x0008), + prt_slot1(0x0009), + prt_slot2(0x000a), + prt_slot3(0x000b), + prt_slot0(0x000c), + prt_slot1(0x000d), + prt_slot2(0x000e), + prt_slot3(0x000f), + prt_slot0(0x0010), + prt_slot1(0x0011), + prt_slot2(0x0012), + prt_slot3(0x0013), + prt_slot0(0x0014), + prt_slot1(0x0015), + prt_slot2(0x0016), + prt_slot3(0x0017), + prt_slot0(0x0018), + prt_slot1(0x0019), + prt_slot2(0x001a), + prt_slot3(0x001b), + prt_slot0(0x001c), + prt_slot1(0x001d), + prt_slot2(0x001e), + prt_slot3(0x001f), }) Name (_CRS, ResourceTemplate () debian/patches/0009_qemu-bios-pci-hotplug-support.patch0000644000000000000000000000766011403506737020171 0ustar qemu: bios: pci hotplug support (Marcelo Tosatti) Signed-off-by: Marcelo Tosatti Signed-off-by: Anthony Liguori --- bios/acpi-dsdt.dsl | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) --- a/bios/acpi-dsdt.dsl +++ b/bios/acpi-dsdt.dsl @@ -91,6 +91,61 @@ DefinitionBlock ( prt_slot3(0x001f), }) + OperationRegion(PCST, SystemIO, 0xae00, 0x08) + Field (PCST, DWordAcc, NoLock, WriteAsZeros) + { + PCIU, 32, + PCID, 32, + } + + OperationRegion(SEJ, SystemIO, 0xae08, 0x04) + Field (SEJ, DWordAcc, NoLock, WriteAsZeros) + { + B0EJ, 32, + } + +#define hotplug_slot(name, nr) \ + Device (S##name) { \ + Name (_ADR, nr##0000) \ + Method (_EJ0,1) { \ + Store(ShiftLeft(1, nr), B0EJ) \ + Return (0x0) \ + } \ + Name (_SUN, name) \ + } + + hotplug_slot(1, 0x0001) + hotplug_slot(2, 0x0002) + hotplug_slot(3, 0x0003) + hotplug_slot(4, 0x0004) + hotplug_slot(5, 0x0005) + hotplug_slot(6, 0x0006) + hotplug_slot(7, 0x0007) + hotplug_slot(8, 0x0008) + hotplug_slot(9, 0x0009) + hotplug_slot(10, 0x000a) + hotplug_slot(11, 0x000b) + hotplug_slot(12, 0x000c) + hotplug_slot(13, 0x000d) + hotplug_slot(14, 0x000e) + hotplug_slot(15, 0x000f) + hotplug_slot(16, 0x0010) + hotplug_slot(17, 0x0011) + hotplug_slot(18, 0x0012) + hotplug_slot(19, 0x0013) + hotplug_slot(20, 0x0014) + hotplug_slot(21, 0x0015) + hotplug_slot(22, 0x0016) + hotplug_slot(23, 0x0017) + hotplug_slot(24, 0x0018) + hotplug_slot(25, 0x0019) + hotplug_slot(26, 0x001a) + hotplug_slot(27, 0x001b) + hotplug_slot(28, 0x001c) + hotplug_slot(29, 0x001d) + hotplug_slot(30, 0x001e) + hotplug_slot(31, 0x001f) + Name (_CRS, ResourceTemplate () { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode, @@ -605,8 +660,50 @@ DefinitionBlock ( Method(_L00) { Return(0x01) } + +#define gen_pci_hotplug(nr) \ + If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) { \ + Notify(\_SB.PCI0.S##nr, 1) \ + } \ + If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) { \ + Notify(\_SB.PCI0.S##nr, 3) \ + } + Method(_L01) { - Return(0x01) + gen_pci_hotplug(1) + gen_pci_hotplug(2) + gen_pci_hotplug(3) + gen_pci_hotplug(4) + gen_pci_hotplug(5) + gen_pci_hotplug(6) + gen_pci_hotplug(7) + gen_pci_hotplug(8) + gen_pci_hotplug(9) + gen_pci_hotplug(10) + gen_pci_hotplug(11) + gen_pci_hotplug(12) + gen_pci_hotplug(13) + gen_pci_hotplug(14) + gen_pci_hotplug(15) + gen_pci_hotplug(16) + gen_pci_hotplug(17) + gen_pci_hotplug(18) + gen_pci_hotplug(19) + gen_pci_hotplug(20) + gen_pci_hotplug(21) + gen_pci_hotplug(22) + gen_pci_hotplug(23) + gen_pci_hotplug(24) + gen_pci_hotplug(25) + gen_pci_hotplug(26) + gen_pci_hotplug(27) + gen_pci_hotplug(28) + gen_pci_hotplug(29) + gen_pci_hotplug(30) + gen_pci_hotplug(31) + + Return (0x01) + } Method(_L02) { Return(0x01) debian/patches/build-qemu-bios.patch0000644000000000000000000000526411714224746014653 0ustar Author: Guillem Jover --- bios/Makefile.in | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) --- a/bios/Makefile.in +++ b/bios/Makefile.in @@ -58,18 +58,21 @@ BIOS_BUILD_DATE = "-DBIOS_BUILD_DATE=\"$ $(CXX) -c $(BX_INCDIRS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@ -bios: biossums BIOS-bochs-latest BIOS-bochs-legacy +bios: biossums BIOS-bochs-latest BIOS-bochs-legacy BIOS-qemu-latest clean: @RMCOMMAND@ *.o *.a *.s _rombios*_.c rombios*.txt rombios*.sym - @RMCOMMAND@ usage biossums rombios16.bin + @RMCOMMAND@ usage biossums + @RMCOMMAND@ rombios16.bin rombios16-qemu.bin @RMCOMMAND@ rombios32.bin rombios32.out + @RMCOMMAND@ rombios32-qemu.bin rombios32-qemu.out dist-clean: clean @RMCOMMAND@ Makefile bios-clean: @RMCOMMAND@ BIOS-bochs-* + @RMCOMMAND@ BIOS-qemu-* BIOS-bochs-legacy: rombios.c apmbios.S biossums rombios.h $(GCC32) $(BIOS_BUILD_DATE) -DLEGACY -E -P $< > _rombiosl_.c @@ -81,6 +84,15 @@ BIOS-bochs-legacy: rombios.c apmbios.S b ./biossums $@ @RMCOMMAND@ _rombiosl_.s +rombios16-qemu.bin: rombios.c apmbios.S biossums rombios.h + $(GCC32) $(BIOS_BUILD_DATE) -DBX_QEMU -E -P $< > _rombiosq_.c + $(BCC) -o rombiosq.s -C-c -D__i86__ -0 -S _rombiosq_.c + sed -e 's/^\.text//' -e 's/^\.data//' rombiosq.s > _rombiosq_.s + $(AS86) _rombiosq_.s -b $@.tmp.bin -u- -w- -g -0 -j -O -l rombiosq.txt + -perl ${srcdir}/makesym.perl < rombiosq.txt > rombiosq.sym + mv $@.tmp.bin $@ + ./biossums $@ + @RMCOMMAND@ _rombiosq_.s rombios16.bin: rombios.c apmbios.S biossums rombios.h $(GCC32) $(BIOS_BUILD_DATE) -E -P $< > _rombios_.c @@ -92,17 +104,26 @@ rombios16.bin: rombios.c apmbios.S bioss ./biossums rombios16.bin @RMCOMMAND@ _rombios_.s - rombios32.bin: rombios32.out rombios.h objcopy -O binary $< $@ ./biossums -pad $@ +rombios32-qemu.bin: rombios32-qemu.out rombios.h + objcopy -O binary $< $@ + ./biossums -pad $@ + rombios32.out: rombios32start.o rombios32.o rombios32.ld ld -o $@ -T $(srcdir)/rombios32.ld rombios32start.o rombios32.o +rombios32-qemu.out: rombios32start.o rombios32-qemu.o rombios32.ld + ld -o $@ -T $(srcdir)/rombios32.ld rombios32start.o rombios32-qemu.o + rombios32.o: rombios32.c acpi-dsdt.hex rombios.h $(GCC32) -O2 -Wall -c -o $@ $< +rombios32-qemu.o: rombios32.c acpi-dsdt.hex rombios.h + $(GCC32) -DBX_QEMU -O2 -Wall -c -o $@ $< + ifeq ("1", "0") acpi-dsdt.hex: acpi-dsdt.dsl cpp -P $< $<.i @@ -117,4 +138,7 @@ rombios32start.o: rombios32start.S BIOS-bochs-latest: rombios16.bin rombios32.bin cat rombios32.bin rombios16.bin > $@ +BIOS-qemu-latest: rombios16-qemu.bin rombios32-qemu.bin + cat rombios32-qemu.bin rombios16-qemu.bin > $@ + biossums: biossums.o debian/patches/build-link-only-needed-libs.patch0000644000000000000000000000746611714224746017045 0ustar Author: Guillem Jover --- Makefile.in | 4 +--- configure.in | 40 +++++++++++++++++++++++----------------- gui/Makefile.in | 4 +--- 3 files changed, 25 insertions(+), 23 deletions(-) --- a/configure.in +++ b/configure.in @@ -122,8 +122,6 @@ dnl Configure the ltdl library. This mu dnl else it disables shared libraries somehow. AC_LIB_LTDL -AC_PATH_XTRA - AC_C_BIGENDIAN AC_C_INLINE AC_CHECK_SIZEOF(unsigned char) @@ -1896,7 +1894,7 @@ AC_MSG_RESULT($WX_CONFIG) ok_wx_version=0 wx_multi_lib=0 needs_gtk2=0 -wx_needs_gtk2=0 +wx_needs_gdk2=0 AC_MSG_CHECKING(for wxWidgets library version) if test x$WX_CONFIG != xnot_found; then WX_VERSION=`$WX_CONFIG --version` @@ -1912,7 +1910,7 @@ if test x$WX_CONFIG != xnot_found; then ok_wx_version=1 wx_multi_lib=1 case x$WX_BASENAME in - xwx_gtk2|xwx_gtk2u) wx_needs_gtk2=1 ;; + xwx_gtk2|xwx_gtk2u) wx_needs_gdk2=1 ;; *) ;; esac ;; @@ -1928,9 +1926,6 @@ if test "$cross_configure" = 0; then if test "$with_all_libs" = yes; then with_wx=yes fi - if test "$with_wx" = yes; then - needs_gtk2=$wx_needs_gtk2 - fi else if test "$with_wx" = yes; then AC_MSG_WARN([Bochs for wxWidgets cannot be compiled here, disabling it]) @@ -1955,15 +1950,7 @@ if test "$with_x11" = yes; then echo ERROR: X windows gui was selected, but X windows libraries were not found. exit 1 fi - AC_DEFINE(BX_WITH_X11, 1) - SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_X11)" - GUI_CFLAGS="$GUI_CFLAGS \$(X_CFLAGS)" - GUI_CXXFLAGS="$GUI_CXXFLAGS \$(X_CFLAGS)" - GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_X)" - # The enhanced X debugger depends on GTK2 - if test "$gui_debugger" = 1; then - needs_gtk2=1 - fi + check_xpm=0 AC_MSG_CHECKING(whether user wants XPM support) AC_ARG_ENABLE(xpm, @@ -1987,8 +1974,22 @@ if test "$with_x11" = yes; then XPM_LIB='-lXpm' ]) fi + + X_CFLAGS="`pkg-config --cflags x11`" + X_LIBS="`pkg-config --libs x11` \$(XPM_LIB) -lXrandr" + + AC_DEFINE(BX_WITH_X11, 1) + SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_X11)" + GUI_CFLAGS="$GUI_CFLAGS \$(X_CFLAGS)" + GUI_CXXFLAGS="$GUI_CXXFLAGS \$(X_CFLAGS)" + GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_X)" + # The enhanced X debugger depends on GTK2 + if test "$gui_debugger" = 1; then + needs_gtk2=1 + fi fi -AC_SUBST(XPM_LIB) +AC_SUBST(X_CFLAGS) +AC_SUBST(X_LIBS) if test "$with_beos" = yes; then display_libs="$display_libs beos" @@ -2118,6 +2119,11 @@ if test "$with_wx" = yes; then SPECIFIC_GUI_SUPPORT_OBJS="$SPECIFIC_GUI_SUPPORT_OBJS \$(GUI_OBJS_WX_SUPPORT)" WX_CFLAGS="`$WX_CONFIG --cflags`" WX_CXXFLAGS="`$WX_CONFIG --cxxflags`" + if test "$wx_needs_gdk2" = 1; then + GDK_CFLAGS="`pkg-config --cflags gdk-2.0`" + WX_CFLAGS="$WX_CFLAGS $GDK_CFLAGS" + WX_CXXFLAGS="$WX_CXXFLAGS $GDK_CFLAGS" + fi if test "$wx_multi_lib" = 1; then GUI_LINK_OPTS_WX="`$WX_CONFIG --libs core,base`" else --- a/Makefile.in +++ b/Makefile.in @@ -94,9 +94,7 @@ LIBS = @LIBS@ # linux needs just -lreadline # solaris needs -lreadline -lcurses X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -XPM_LIB = @XPM_LIB@ -GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XPM_LIB) -lXrandr +GUI_LINK_OPTS_X = $(X_LIBS) GUI_LINK_OPTS_SDL = `sdl-config --cflags --libs` GUI_LINK_OPTS_SVGA = -lvga -lvgagl GUI_LINK_OPTS_BEOS = -lbe --- a/gui/Makefile.in +++ b/gui/Makefile.in @@ -68,9 +68,7 @@ OBJS_THAT_CANNOT_BE_PLUGINS = keymap.o g OBJS_THAT_CAN_BE_PLUGINS = @GUI_OBJS@ X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -XPM_LIB = @XPM_LIB@ -GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XPM_LIB) -lXrandr +GUI_LINK_OPTS_X = $(X_LIBS) GUI_LINK_OPTS_SDL = `sdl-config --cflags --libs` GUI_LINK_OPTS_SVGA = -lvga -lvgagl GUI_LINK_OPTS_BEOS = -lbe debian/patches/0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch0000644000000000000000000000530511403506737023510 0ustar qemu: bios: use preprocessor for pci link routing (Avi Kivity) Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- bios/acpi-dsdt.dsl | 52 ++++++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 36 deletions(-) --- a/bios/acpi-dsdt.dsl +++ b/bios/acpi-dsdt.dsl @@ -47,42 +47,22 @@ DefinitionBlock ( section 6.2.8.1 */ /* Note: we provide the same info as the PCI routing table of the Bochs BIOS */ - - // PCI Slot 0 - Package() {0x0000ffff, 0, LNKD, 0}, - Package() {0x0000ffff, 1, LNKA, 0}, - Package() {0x0000ffff, 2, LNKB, 0}, - Package() {0x0000ffff, 3, LNKC, 0}, - - // PCI Slot 1 - Package() {0x0001ffff, 0, LNKA, 0}, - Package() {0x0001ffff, 1, LNKB, 0}, - Package() {0x0001ffff, 2, LNKC, 0}, - Package() {0x0001ffff, 3, LNKD, 0}, - - // PCI Slot 2 - Package() {0x0002ffff, 0, LNKB, 0}, - Package() {0x0002ffff, 1, LNKC, 0}, - Package() {0x0002ffff, 2, LNKD, 0}, - Package() {0x0002ffff, 3, LNKA, 0}, - - // PCI Slot 3 - Package() {0x0003ffff, 0, LNKC, 0}, - Package() {0x0003ffff, 1, LNKD, 0}, - Package() {0x0003ffff, 2, LNKA, 0}, - Package() {0x0003ffff, 3, LNKB, 0}, - - // PCI Slot 4 - Package() {0x0004ffff, 0, LNKD, 0}, - Package() {0x0004ffff, 1, LNKA, 0}, - Package() {0x0004ffff, 2, LNKB, 0}, - Package() {0x0004ffff, 3, LNKC, 0}, - - // PCI Slot 5 - Package() {0x0005ffff, 0, LNKA, 0}, - Package() {0x0005ffff, 1, LNKB, 0}, - Package() {0x0005ffff, 2, LNKC, 0}, - Package() {0x0005ffff, 3, LNKD, 0}, +#define prt_slot(nr, lnk0, lnk1, lnk2, lnk3) \ + Package() { nr##ffff, 0, lnk0, 0 }, \ + Package() { nr##ffff, 1, lnk1, 0 }, \ + Package() { nr##ffff, 2, lnk2, 0 }, \ + Package() { nr##ffff, 3, lnk3, 0 } + +#define prt_slot0(nr) prt_slot(nr, LNKD, LNKA, LNKB, LNKC) +#define prt_slot1(nr) prt_slot(nr, LNKA, LNKB, LNKC, LNKD) +#define prt_slot2(nr) prt_slot(nr, LNKB, LNKC, LNKD, LNKA) +#define prt_slot3(nr) prt_slot(nr, LNKC, LNKD, LNKA, LNKB) + prt_slot0(0x0000), + prt_slot1(0x0001), + prt_slot2(0x0002), + prt_slot3(0x0003), + prt_slot0(0x0004), + prt_slot1(0x0005), }) Name (_CRS, ResourceTemplate () debian/patches/build-fix-libtool-calls.patch0000644000000000000000000001767011714224746016302 0ustar Author: Guillem Jover --- configure.in | 4 ++-- gui/Makefile.in | 28 ++++++++++++++-------------- iodev/Makefile.in | 26 +++++++++++++------------- 3 files changed, 29 insertions(+), 29 deletions(-) --- a/gui/Makefile.in +++ b/gui/Makefile.in @@ -108,47 +108,47 @@ libgui.a: $(NONPLUGIN_OBJS) ##### building plugins with libtool %.lo: %.@CPP_SUFFIX@ - $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@ + $(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@ libbx_%.la: %.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) libbx_x.la: x.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_X) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_X) libbx_sdl.la: sdl.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SDL) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SDL) libbx_svga.la: svga.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SVGA) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SVGA) libbx_beos.la: beos.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_BEOS) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_BEOS) libbx_rfb.la: rfb.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_RFB) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_RFB) libbx_amigaos.la: amigaos.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_AMIGAOS) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_AMIGAOS) libbx_win32.la: win32.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_WIN32) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_WIN32) libbx_macos.la: macos.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_MACOS) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_MACOS) libbx_carbon.la: carbon.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_CARBON) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_CARBON) libbx_nogui.la: nogui.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_NOGUI) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_NOGUI) libbx_term.la: term.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_TERM) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_TERM) # special link rules for plugins that require more than one object file libbx_wx.la: $(GUI_OBJS_WX:.o=.lo) $(GUI_OBJS_WX_SUPPORT:.o=.lo) - $(LIBTOOL) --mode=link $(CXX) -module $(GUI_OBJS_WX:.o=.lo) $(GUI_OBJS_WX_SUPPORT:.o=.lo) -o libbx_wx.la -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_WX) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $(GUI_OBJS_WX:.o=.lo) $(GUI_OBJS_WX_SUPPORT:.o=.lo) -o libbx_wx.la -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_WX) #### building DLLs for win32 (tested on cygwin only) bx_%.dll: %.o --- a/iodev/Makefile.in +++ b/iodev/Makefile.in @@ -128,44 +128,44 @@ pcidev.o : pcidev.@CPP_SUFFIX@ ##### building plugins with libtool %.lo: %.@CPP_SUFFIX@ - $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@ + $(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@ pcidev.lo : pcidev.@CPP_SUFFIX@ - $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(PCIDEV_CXXFLAGS) $< -o $@ + $(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(PCIDEV_CXXFLAGS) $< -o $@ libbx_%.la: %.lo - $(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) # special link rules for plugins that require more than one object file libbx_harddrv.la: harddrv.lo $(CDROM_OBJS:.o=.lo) - $(LIBTOOL) --mode=link $(CXX) -module harddrv.lo $(CDROM_OBJS:.o=.lo) -o libbx_harddrv.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module harddrv.lo $(CDROM_OBJS:.o=.lo) -o libbx_harddrv.la -rpath $(PLUGIN_PATH) libbx_hdimage.la: hdimage.lo vmware3.lo vmware4.lo vvfat.lo - $(LIBTOOL) --mode=link $(CXX) -module hdimage.lo vmware3.lo vmware4.lo vvfat.lo -o libbx_hdimage.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module hdimage.lo vmware3.lo vmware4.lo vvfat.lo -o libbx_hdimage.la -rpath $(PLUGIN_PATH) libbx_keyboard.la: keyboard.lo scancodes.lo - $(LIBTOOL) --mode=link $(CXX) -module keyboard.lo scancodes.lo -o libbx_keyboard.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module keyboard.lo scancodes.lo -o libbx_keyboard.la -rpath $(PLUGIN_PATH) libbx_pit_wrap.la: pit82c54.lo pit_wrap.lo - $(LIBTOOL) --mode=link $(CXX) -module pit82c54.lo pit_wrap.lo -o libbx_pit.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module pit82c54.lo pit_wrap.lo -o libbx_pit.la -rpath $(PLUGIN_PATH) libbx_soundmod.la: soundmod.lo $(SOUNDLOW_OBJS:.o=.lo) - $(LIBTOOL) --mode=link $(CXX) -module soundmod.lo $(SOUNDLOW_OBJS:.o=.lo) -o libbx_soundmod.la -rpath $(PLUGIN_PATH) $(SOUND_LINK_OPTS) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module soundmod.lo $(SOUNDLOW_OBJS:.o=.lo) -o libbx_soundmod.la -rpath $(PLUGIN_PATH) $(SOUND_LINK_OPTS) libbx_ne2k.la: ne2k.lo $(NETLOW_OBJS:.o=.lo) - $(LIBTOOL) --mode=link $(CXX) -module ne2k.lo $(NETLOW_OBJS:.o=.lo) -o libbx_ne2k.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module ne2k.lo $(NETLOW_OBJS:.o=.lo) -o libbx_ne2k.la -rpath $(PLUGIN_PATH) libbx_pcipnic.la: pcipnic.lo $(NETLOW_OBJS:.o=.lo) - $(LIBTOOL) --mode=link $(CXX) -module pcipnic.lo $(NETLOW_OBJS:.o=.lo) -o libbx_pcipnic.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module pcipnic.lo $(NETLOW_OBJS:.o=.lo) -o libbx_pcipnic.la -rpath $(PLUGIN_PATH) libbx_serial.la: serial.lo serial_raw.lo - $(LIBTOOL) --mode=link $(CXX) -module serial.lo serial_raw.lo -o libbx_serial.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module serial.lo serial_raw.lo -o libbx_serial.la -rpath $(PLUGIN_PATH) libbx_vga.la: vga.lo svga_cirrus.lo - $(LIBTOOL) --mode=link $(CXX) -module vga.lo svga_cirrus.lo -o libbx_vga.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module vga.lo svga_cirrus.lo -o libbx_vga.la -rpath $(PLUGIN_PATH) libbx_usb_common.la: usb_common.lo $(USBDEV_OBJS:.o=.lo) scsi_device.lo $(CDROM_OBJS:.o=.lo) - $(LIBTOOL) --mode=link $(CXX) -module usb_common.lo $(USBDEV_OBJS:.o=.lo) scsi_device.lo $(CDROM_OBJS:.o=.lo) -o libbx_usb_common.la -rpath $(PLUGIN_PATH) + $(LIBTOOL) --mode=link --tag CXX $(CXX) -module usb_common.lo $(USBDEV_OBJS:.o=.lo) scsi_device.lo $(CDROM_OBJS:.o=.lo) -o libbx_usb_common.la -rpath $(PLUGIN_PATH) #### building DLLs for win32 (tested on cygwin only) bx_%.dll: %.o --- a/configure.in +++ b/configure.in @@ -1870,8 +1870,8 @@ OFP="-o " MAKELIB="ar rv \$@" RMCOMMAND="rm -f " # first define link variables without libtool -LINK="\$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)" -LINK_CONSOLE="\$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)" +LINK="--tag CXX \$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)" +LINK_CONSOLE="--tag CXX \$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)" # unless NO_LT is set, add libtool to the front of the link command if test "$NO_LT" != 1; then LINK="\$(LIBTOOL) --mode=link $LINK" debian/patches/0012-load-smbios-entries-and-files-from-qemu.patch0000644000000000000000000003561411714224407021657 0ustar qemu:bios: Load SMBIOS entries and files from qemu (Alex Williamson) Allow SMBIOS fields to be overridden and entries replaced by those read from qemu. Signed-off-by: Alex Williamson Signed-off-by: Anthony Liguori --- bios/rombios.h | 1 bios/rombios32.c | 299 +++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 236 insertions(+), 64 deletions(-) --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -400,7 +400,6 @@ uint32_t cpuid_features; uint32_t cpuid_ext_features; unsigned long ram_size; uint64_t ram_end; -uint8_t bios_uuid[16]; #ifdef BX_USE_EBDA_TABLES unsigned long ebda_cur_addr; #endif @@ -470,19 +469,17 @@ static int acpi_load_table(int i, uint32 qemu_cfg_read((uint8_t*)addr, *len); return 0; } -#endif -void uuid_probe(void) +static uint16_t smbios_entries(void) { -#ifdef BX_QEMU - if(qemu_cfg_port) { - qemu_cfg_select(QEMU_CFG_UUID); - qemu_cfg_read(bios_uuid, 16); - return; - } -#endif - memset(bios_uuid, 0, 16); + uint16_t cnt; + + qemu_cfg_select(QEMU_CFG_SMBIOS_ENTRIES); + qemu_cfg_read((uint8_t*)&cnt, sizeof(cnt)); + + return cnt; } +#endif void cpu_probe(void) { @@ -1900,21 +1897,106 @@ smbios_entry_point_init(void *start, ep->intermediate_checksum = -sum; } +struct smbios_header { + uint16_t length; + uint8_t type; +} __attribute__((__packed__)); + +struct smbios_field { + struct smbios_header header; + uint8_t type; + uint16_t offset; + uint8_t data[]; +} __attribute__((__packed__)); + +struct smbios_table { + struct smbios_header header; + uint8_t data[]; +} __attribute__((__packed__)); + +#define SMBIOS_FIELD_ENTRY 0 +#define SMBIOS_TABLE_ENTRY 1 + +static size_t +smbios_load_field(int type, size_t offset, void *addr) +{ +#ifdef BX_QEMU + int i; + + for (i = smbios_entries(); i > 0; i--) { + struct smbios_field field; + + qemu_cfg_read((uint8_t *)&field, sizeof(struct smbios_header)); + field.header.length -= sizeof(struct smbios_header); + + if (field.header.type != SMBIOS_FIELD_ENTRY) { + while (field.header.length--) + inb(QEMU_CFG_DATA_PORT); + continue; + } + + qemu_cfg_read((uint8_t *)&field.type, + sizeof(field) - sizeof(struct smbios_header)); + field.header.length -= sizeof(field) - sizeof(struct smbios_header); + + if (field.type != type || field.offset != offset) { + while (field.header.length--) + inb(QEMU_CFG_DATA_PORT); + continue; + } + + qemu_cfg_read(addr, field.header.length); + return (size_t)field.header.length; + } +#endif + return 0; +} + +#define load_str_field_with_default(type, field, def) do { \ + size = smbios_load_field(type, offsetof(struct smbios_type_##type, \ + field), end); \ + if (size > 0) { \ + end += size; \ + } else { \ + memcpy(end, def, sizeof(def)); \ + end += sizeof(def); \ + } \ + p->field = ++str_index; \ +} while (0) + +#define load_str_field_or_skip(type, field) do { \ + size = smbios_load_field(type, offsetof(struct smbios_type_##type, \ + field), end); \ + if (size > 0) { \ + end += size; \ + p->field = ++str_index; \ + } else { \ + p->field = 0; \ + } \ +} while (0) + + /* Type 0 -- BIOS Information */ #define RELEASE_DATE_STR "01/01/2007" static void * -smbios_type_0_init(void *start) +smbios_init_type_0(void *start) { struct smbios_type_0 *p = (struct smbios_type_0 *)start; + char *end = (char *)start + sizeof(struct smbios_type_0); + size_t size; + int str_index = 0; p->header.type = 0; p->header.length = sizeof(struct smbios_type_0); p->header.handle = 0; - p->vendor_str = 1; - p->bios_version_str = 2; + load_str_field_with_default(0, vendor_str, BX_APPVENDOR); + load_str_field_with_default(0, bios_version_str, BX_APPNAME); + p->bios_starting_address_segment = 0xe000; - p->bios_release_date_str = 3; + + load_str_field_with_default(0, bios_release_date_str, RELEASE_DATE_STR); + p->bios_rom_size = 1; /* 128 kB */ memset(p->bios_characteristics, 0, 8); @@ -1946,52 +2028,66 @@ smbios_type_0_init(void *start) p->bios_characteristics_extension_bytes[0] = 1; /* Bit 0 - ACPI supported */ p->bios_characteristics_extension_bytes[1] = 0; - p->system_bios_major_release = 1; - p->system_bios_minor_release = 0; + if (!smbios_load_field(0, offsetof(struct smbios_type_0, + system_bios_major_release), + &p->system_bios_major_release)) + p->system_bios_major_release = 1; + + if (!smbios_load_field(0, offsetof(struct smbios_type_0, + system_bios_minor_release), + &p->system_bios_minor_release)) + p->system_bios_minor_release = 0; + p->embedded_controller_major_release = 0xff; p->embedded_controller_minor_release = 0xff; - start += sizeof(struct smbios_type_0); - memcpy((char *)start, BX_APPVENDOR, sizeof(BX_APPVENDOR)); - start += sizeof(BX_APPVENDOR); - memcpy((char *)start, BX_APPNAME, sizeof(BX_APPNAME)); - start += sizeof(BX_APPNAME); - memcpy((char *)start, RELEASE_DATE_STR, sizeof(RELEASE_DATE_STR)); - start += sizeof(RELEASE_DATE_STR); - *((uint8_t *)start) = 0; + *end = 0; + end++; - return start+1; + return end; } /* Type 1 -- System Information */ static void * -smbios_type_1_init(void *start) +smbios_init_type_1(void *start) { struct smbios_type_1 *p = (struct smbios_type_1 *)start; + char *end = (char *)start + sizeof(struct smbios_type_1); + size_t size; + int str_index = 0; + p->header.type = 1; p->header.length = sizeof(struct smbios_type_1); p->header.handle = 0x100; - p->manufacturer_str = 0; - p->product_name_str = 0; - p->version_str = 0; - p->serial_number_str = 0; - - memcpy(p->uuid, bios_uuid, 16); + load_str_field_or_skip(1, manufacturer_str); + load_str_field_or_skip(1, product_name_str); + load_str_field_or_skip(1, version_str); + load_str_field_or_skip(1, serial_number_str); + + size = smbios_load_field(1, offsetof(struct smbios_type_1, + uuid), &p->uuid); + if (size == 0) + memset(p->uuid, 0, 16); p->wake_up_type = 0x06; /* power switch */ - p->sku_number_str = 0; - p->family_str = 0; - start += sizeof(struct smbios_type_1); - *((uint16_t *)start) = 0; + load_str_field_or_skip(1, sku_number_str); + load_str_field_or_skip(1, family_str); - return start+2; + *end = 0; + end++; + if (!str_index) { + *end = 0; + end++; + } + + return end; } /* Type 3 -- System Enclosure */ static void * -smbios_type_3_init(void *start) +smbios_init_type_3(void *start) { struct smbios_type_3 *p = (struct smbios_type_3 *)start; @@ -2021,7 +2117,7 @@ smbios_type_3_init(void *start) /* Type 4 -- Processor Information */ static void * -smbios_type_4_init(void *start, unsigned int cpu_number) +smbios_init_type_4(void *start, unsigned int cpu_number) { struct smbios_type_4 *p = (struct smbios_type_4 *)start; @@ -2061,7 +2157,7 @@ smbios_type_4_init(void *start, unsigned /* Type 16 -- Physical Memory Array */ static void * -smbios_type_16_init(void *start, uint32_t memsize, int nr_mem_devs) +smbios_init_type_16(void *start, uint32_t memsize, int nr_mem_devs) { struct smbios_type_16 *p = (struct smbios_type_16*)start; @@ -2084,7 +2180,7 @@ smbios_type_16_init(void *start, uint32_ /* Type 17 -- Memory Device */ static void * -smbios_type_17_init(void *start, uint32_t memory_size_mb, int instance) +smbios_init_type_17(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_17 *p = (struct smbios_type_17 *)start; @@ -2115,7 +2211,7 @@ smbios_type_17_init(void *start, uint32_ /* Type 19 -- Memory Array Mapped Address */ static void * -smbios_type_19_init(void *start, uint32_t memory_size_mb, int instance) +smbios_init_type_19(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_19 *p = (struct smbios_type_19 *)start; @@ -2136,7 +2232,7 @@ smbios_type_19_init(void *start, uint32_ /* Type 20 -- Memory Device Mapped Address */ static void * -smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance) +smbios_init_type_20(void *start, uint32_t memory_size_mb, int instance) { struct smbios_type_20 *p = (struct smbios_type_20 *)start; @@ -2160,7 +2256,7 @@ smbios_type_20_init(void *start, uint32_ /* Type 32 -- System Boot Information */ static void * -smbios_type_32_init(void *start) +smbios_init_type_32(void *start) { struct smbios_type_32 *p = (struct smbios_type_32 *)start; @@ -2178,7 +2274,7 @@ smbios_type_32_init(void *start) /* Type 127 -- End of Table */ static void * -smbios_type_127_init(void *start) +smbios_init_type_127(void *start) { struct smbios_type_127 *p = (struct smbios_type_127 *)start; @@ -2192,6 +2288,78 @@ smbios_type_127_init(void *start) return start + 2; } +static int +smbios_load_external(int type, char **p, unsigned *nr_structs, + unsigned *max_struct_size) +{ +#ifdef BX_QEMU + static uint64_t used_bitmap[4] = { 0 }; + char *start = *p; + int i; + + /* Check if we've already reported these tables */ + if (used_bitmap[(type >> 6) & 0x3] & (1ULL << (type & 0x3f))) + return 1; + + /* Don't introduce spurious end markers */ + if (type == 127) + return 0; + + for (i = smbios_entries(); i > 0; i--) { + struct smbios_table table; + struct smbios_structure_header *header = (void *)*p; + int string; + + qemu_cfg_read((uint8_t *)&table, sizeof(struct smbios_header)); + table.header.length -= sizeof(struct smbios_header); + + if (table.header.type != SMBIOS_TABLE_ENTRY) { + while (table.header.length--) + inb(QEMU_CFG_DATA_PORT); + continue; + } + + qemu_cfg_read((uint8_t *)*p, sizeof(struct smbios_structure_header)); + table.header.length -= sizeof(struct smbios_structure_header); + + if (header->type != type) { + while (table.header.length--) + inb(QEMU_CFG_DATA_PORT); + continue; + } + + *p += sizeof(struct smbios_structure_header); + + /* Entries end with a double NULL char, if there's a string at + * the end (length is greater than formatted length), the string + * terminator provides the first NULL. */ + string = header->length < table.header.length + + sizeof(struct smbios_structure_header); + + /* Read the rest and terminate the entry */ + qemu_cfg_read((uint8_t *)*p, table.header.length); + *p += table.header.length; + *((uint8_t*)*p) = 0; + (*p)++; + if (!string) { + *((uint8_t*)*p) = 0; + (*p)++; + } + + (*nr_structs)++; + if (*p - (char *)header > *max_struct_size) + *max_struct_size = *p - (char *)header; + } + + /* Mark that we've reported on this type */ + used_bitmap[(type >> 6) & 0x3] |= (1ULL << (type & 0x3f)); + + return (start != *p); +#else /* !BX_QEMU */ + return 0; +#endif +} + void smbios_init(void) { unsigned cpu_num, nr_structs = 0, max_struct_size = 0; @@ -2205,34 +2373,39 @@ void smbios_init(void) p = (char *)start + sizeof(struct smbios_entry_point); -#define add_struct(fn) do { \ - q = (fn); \ - nr_structs++; \ - if ((q - p) > max_struct_size) \ - max_struct_size = q - p; \ - p = q; \ +#define add_struct(type, args...) do { \ + if (!smbios_load_external(type, &p, &nr_structs, &max_struct_size)) { \ + q = smbios_init_type_##type(args); \ + nr_structs++; \ + if ((q - p) > max_struct_size) \ + max_struct_size = q - p; \ + p = q; \ + } \ } while (0) - add_struct(smbios_type_0_init(p)); - add_struct(smbios_type_1_init(p)); - add_struct(smbios_type_3_init(p)); + add_struct(0, p); + add_struct(1, p); + add_struct(3, p); for (cpu_num = 1; cpu_num <= smp_cpus; cpu_num++) - add_struct(smbios_type_4_init(p, cpu_num)); + add_struct(4, p, cpu_num); /* Each 'memory device' covers up to 16GB of address space. */ nr_mem_devs = (memsize + 0x3fff) >> 14; - add_struct(smbios_type_16_init(p, memsize, nr_mem_devs)); + add_struct(16, p, memsize, nr_mem_devs); for ( i = 0; i < nr_mem_devs; i++ ) { uint32_t dev_memsize = ((i == (nr_mem_devs - 1)) ? (((memsize - 1) & 0x3fff) + 1) : 0x4000); - add_struct(smbios_type_17_init(p, dev_memsize, i)); - add_struct(smbios_type_19_init(p, dev_memsize, i)); - add_struct(smbios_type_20_init(p, dev_memsize, i)); + add_struct(17, p, dev_memsize, i); + add_struct(19, p, dev_memsize, i); + add_struct(20, p, dev_memsize, i); } - add_struct(smbios_type_32_init(p)); - add_struct(smbios_type_127_init(p)); + add_struct(32, p); + /* Add any remaining provided entries before the end marker */ + for (i = 0; i < 256; i++) + smbios_load_external(i, &p, &nr_structs, &max_struct_size); + add_struct(127, p); #undef add_struct @@ -2336,8 +2509,6 @@ void rombios32_init(uint32_t *s3_resume_ mptable_init(); - uuid_probe(); - smbios_init(); if (acpi_enabled) --- a/bios/rombios.h +++ b/bios/rombios.h @@ -217,6 +217,7 @@ #define QEMU_CFG_UUID 0x02 #define QEMU_CFG_ARCH_LOCAL 0x8000 #define QEMU_CFG_ACPI_TABLES (QEMU_CFG_ARCH_LOCAL + 0) +#define QEMU_CFG_SMBIOS_ENTRIES (QEMU_CFG_ARCH_LOCAL + 1) #define PCI_ADDRESS_SPACE_MEM 0x00 #define PCI_ADDRESS_SPACE_IO 0x01 debian/patches/build-use-jade-instead-of-docboock2html.patch0000644000000000000000000001452411714224746021225 0ustar Author: Guillem Jover --- configure.in | 2 doc/docbook/Makefile.in | 20 +++++-- doc/docbook/docbook-utils.dsl | 115 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 4 deletions(-) --- a/doc/docbook/Makefile.in +++ b/doc/docbook/Makefile.in @@ -9,12 +9,24 @@ prefix = @prefix@ srcdir = @srcdir@ +abs_srcdir = @abs_srcdir@ docdir = $(prefix)/share/doc/bochs -DOCBOOK2HTML = @DOCBOOK2HTML@ WGET = @WGET@ TARGZ = bochsdoc.tar.gz RENDERED_DOC_URL = http://bochs.sf.net/doc/docbook/$(TARGZ) +ifdef USE_JADE +# jade build +HTML_STYLESHEET = $(abs_srcdir)/docbook-utils.dsl\#html +JADE = @JADE@ +JADE_ARGS = -t sgml -i html -d $(HTML_STYLESHEET) # -V nochunks +SGML_VALIDATE = nsgmls -s +DOCBOOK2HTML = $(JADE) $(JADE_ARGS) +else +# docbook-utils build +DOCBOOK2HTML = @DOCBOOK2HTML@ +endif + DESTDIR= # name of the major documentation sections @@ -42,15 +54,15 @@ all: $(SECTION_HTML) user/index.html: $(srcdir)/user/user.dbk -mkdir -p user - $(DOCBOOK2HTML) -o user $(srcdir)/user/user.dbk + cd user; $(DOCBOOK2HTML) user.dbk documentation/index.html: $(srcdir)/documentation/documentation.dbk -mkdir -p documentation - $(DOCBOOK2HTML) -o documentation $(srcdir)/documentation/documentation.dbk + cd documentation; $(DOCBOOK2HTML) documentation.dbk development/index.html: $(srcdir)/development/development.dbk -mkdir -p development - $(DOCBOOK2HTML) -o development $(srcdir)/development/development.dbk + cd development; $(DOCBOOK2HTML) development.dbk fixperm:: # fix permissions locally so that tar will install things right --- /dev/null +++ b/doc/docbook/docbook-utils.dsl @@ -0,0 +1,115 @@ + + + + + + ]]> + + + ]]> +]> + + + + + +;; =================================================================== +;; Generic Parameters +;; (Generic currently means: both print and html) + +(define %chapter-autolabel% #t) +(define %section-autolabel% #t) +(define (toc-depth nd) 3) + + + + + + +;; =================================================================== +;; Print Parameters +;; Call: jade -d docbook-utils.dsl#print + +; === Page layout === +;; (define %paper-type% "A4") ;; use A4 paper - comment this out if needed + +; === Media objects === +(define preferred-mediaobject-extensions ;; this magic allows to use different graphical + (list "eps")) ;; formats for printing and putting online +(define acceptable-mediaobject-extensions + '()) +(define preferred-mediaobject-notations + (list "EPS")) +(define acceptable-mediaobject-notations + (list "linespecific")) + +; === Rendering === +(define %head-after-factor% 0.2) ;; not much whitespace after orderedlist head +(define ($paragraph$) ;; more whitespace after paragraph than before + (make paragraph + first-line-start-indent: (if (is-first-para) + %para-indent-firstpara% + %para-indent%) + space-before: (* %para-sep% 4) + space-after: (/ %para-sep% 4) + quadding: %default-quadding% + hyphenate?: %hyphenation% + language: (dsssl-language-code) + (process-children))) + + + + + + +;; =================================================================== +;; HTML Parameters +;; Call: jade -d docbook-utils.dsl#html + +; === File names === +(define %root-filename% "index") ;; name for the root html file +(define %html-ext% ".html") ;; default extension for html output files +(define %html-prefix% "") ;; prefix for all filenames generated (except root) +(define %use-id-as-filename% #f) ;; if #t uses ID value, if present, as filename + ;; otherwise a code is used to indicate level + ;; of chunk, and general element number + ;; (nth element in the document) +(define use-output-dir #f) ;; output in separate directory? +(define %output-dir% "HTML") ;; if output in directory, it's called HTML + +; === HTML settings === +(define %html-pubid% "-//W3C//DTD HTML 4.01 Transitional//EN") ;; Nearly true :-( +(define %html40% #t) + +; === Media objects === +(define preferred-mediaobject-extensions ;; this magic allows to use different graphical + (list "png" "jpg" "jpeg")) ;; formats for printing and putting online +(define acceptable-mediaobject-extensions + (list "bmp" "gif" "eps" "epsf" "avi" "mpg" "mpeg" "qt")) +(define preferred-mediaobject-notations + (list "PNG" "JPG" "JPEG")) +(define acceptable-mediaobject-notations + (list "EPS" "BMP" "GIF" "linespecific")) +; === Rendering === +(define %admon-graphics% #t) ;; use symbols for Caution|Important|Note|Tip|Warning + +; === Books only === +(define %generate-book-titlepage% #t) +(define %generate-book-toc% #t) +(define ($generate-chapter-toc$) #f) ;; never generate a chapter TOC in books + +; === Articles only === +(define %generate-article-titlepage% #t) +(define %generate-article-toc% #t) ;; make TOC + + + + + + + --- a/configure.in +++ b/configure.in @@ -2206,6 +2206,8 @@ AC_SUBST(WX_CFLAGS) AC_SUBST(WX_CXXFLAGS) AC_SUBST(TOOLKIT_CXXFLAGS) +AC_CHECK_PROGS([JADE], [jade openjade]) + AC_CHECK_PROGS(WGET, wget curl fetch, not_found) if test "$WGET" = not_found; then AC_MSG_WARN([cannot find wget (or equivalent) command]) debian/patches/build-recursive-make.patch0000644000000000000000000000075611714224746015675 0ustar Author: Guillem Jover --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/Makefile.in +++ b/Makefile.in @@ -374,13 +374,13 @@ install_doc:: build_docbook:: - cd doc/docbook; make + $(MAKE) -C doc/docbook dl_docbook:: - cd doc/docbook; make dl_docs + $(MAKE) -C doc/docbook dl_docs install_docbook: build_docbook - cd doc/docbook; make install + $(MAKE) -C doc/docbook install install_man:: -mkdir -p $(DESTDIR)$(man1dir) debian/patches/local-config.patch0000644000000000000000000002126711714224746014213 0ustar Author: Robert Millan Author: Guillem Jover --- .bochsrc | 85 ++++++++++++--------------------------------------------------- 1 file changed, 17 insertions(+), 68 deletions(-) --- a/.bochsrc +++ b/.bochsrc @@ -19,8 +19,7 @@ # the "wx" display library. #======================================================================= #config_interface: textconfig -#config_interface: win32config -#config_interface: wx +config_interface: wx #======================================================================= # DISPLAY_LIBRARY @@ -34,11 +33,6 @@ # # The choices are: # x use X windows interface, cross platform -# win32 use native win32 libraries -# carbon use Carbon library (for MacOS X) -# beos use native BeOS libraries -# macintosh use MacOS pre-10 -# amigaos use native AmigaOS libraries # sdl use SDL library, cross platform # svga use SVGALIB library for Linux, allows graphics without X11 # term text only, uses curses/ncurses library, cross platform @@ -53,16 +47,11 @@ # Some display libraries now support specific option to control their # behaviour. See the examples below for currently supported options. #======================================================================= -#display_library: amigaos -#display_library: beos -#display_library: carbon -#display_library: macintosh #display_library: nogui #display_library: rfb, options="timeout=60" # time to wait for client #display_library: sdl, options="fullscreen" # startup in fullscreen mode #display_library: term -#display_library: win32, options="gui_debug" # use Win32 debugger gui -#display_library: wx +display_library: wx #display_library: x, options="hideIPS" # disable IPS output in status bar #display_library: x, options="gui_debug" # use GTK debugger gui @@ -79,7 +68,7 @@ # now supported, but we still recommend to use the BIOS distributed with # Bochs. The start address optional, since it can be calculated from image size. #======================================================================= -romimage: file=$BXSHARE/BIOS-bochs-latest +romimage: file=/usr/share/bochs/BIOS-bochs-latest #romimage: file=bios/seabios-0.5.1.bin #romimage: file=mybios.bin, address=0xfff80000 # 512k at memory top @@ -254,9 +243,8 @@ memory: guest=512, host=256 # VGAROMIMAGE # You now need to load a VGA ROM BIOS into C0000. #======================================================================= -#vgaromimage: file=bios/VGABIOS-elpin-2.40 -vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest -#vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus +vgaromimage: file=/usr/share/vgabios/vgabios.bin +#vgaromimage: file=/usr/share/vgabios/vgabios.debug.bin #======================================================================= # VGA: @@ -382,14 +370,11 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2= # ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63 # ata3-slave: type=cdrom, path=iso.sample, status=inserted #======================================================================= -ata0-master: type=disk, mode=flat, path="30M.sample" -#ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17 +#ata0-master: type=disk, mode=flat, path="d.sample" +#ata0-master: type=disk, mode=flat, path="$HOME/.bochs/guest.hd0", cylinders=#cylinders#, heads=16, spt=63 #ata0-master: type=disk, mode=flat, path="c.img", cylinders=0 # autodetect #ata0-slave: type=disk, mode=vvfat, path=/bochs/images/vvfat, journal=vvfat.redolog -#ata0-slave: type=cdrom, path=D:, status=inserted -#ata0-slave: type=cdrom, path=/dev/cdrom, status=inserted -#ata0-slave: type=cdrom, path="drive", status=inserted -#ata0-slave: type=cdrom, path=/dev/rcd0d, status=inserted +ata0-slave: type=cdrom, path=/dev/#cdrom#, status=inserted #======================================================================= # BOOT: @@ -403,7 +388,8 @@ ata0-master: type=disk, mode=flat, path= # boot: cdrom, floppy, disk #======================================================================= #boot: floppy -boot: disk +#boot: disk +boot: cdrom #======================================================================= # CLOCK: @@ -464,8 +450,9 @@ floppy_bootsig_check: disabled=0 # log: ./bochs.out # log: /dev/tty #======================================================================= +log: /dev/stdout #log: /dev/null -log: bochsout.txt +#log: /tmp/bochsout.txt #======================================================================= # LOGPREFIX: @@ -557,7 +544,7 @@ debugger_log: - # com4: enabled=1, mode=pipe-client, dev=\\.\pipe\mypipe # com4: enabled=1, mode=pipe-server, dev=\\.\pipe\mypipe #======================================================================= -#com1: enabled=1, mode=term, dev=/dev/ttyp9 +com1: enabled=1, mode=term, dev=/dev/#com# #======================================================================= @@ -573,7 +560,7 @@ debugger_log: - # parport2: enabled=1, file="/dev/lp0" # parport1: enabled=0 #======================================================================= -parport1: enabled=1, file="parport.out" +parport1: enabled=1, file="/dev/lp0" #======================================================================= # SB16: @@ -611,7 +598,7 @@ parport1: enabled=1, file="parport.out" # sb16: midimode=1, midi="", wavemode=1, wave="" # win32 # sb16: midimode=1, midi=alsa:128:0, wavemode=1, wave=alsa # Linux with ALSA #======================================================================= -#sb16: midimode=1, midi=/dev/midi00, wavemode=1, wave=/dev/dsp, loglevel=2, log=sb16.log, dmatimer=600000 +sb16: midimode=1, midi=/dev/midi00, wavemode=1, wave=/dev/dsp, loglevel=2, log=/dev/stdout, dmatimer=600000 #======================================================================= # VGA_UPDATE_INTERVAL: @@ -702,18 +689,6 @@ mouse: enabled=0 private_colormap: enabled=0 #======================================================================= -# fullscreen: ONLY IMPLEMENTED ON AMIGA -# Request that Bochs occupy the entire screen instead of a -# window. -# -# Examples: -# fullscreen: enabled=0 -# fullscreen: enabled=1 -#======================================================================= -#fullscreen: enabled=0 -#screenmode: name="sample" - -#======================================================================= # ne2k: NE2000 compatible ethernet adapter # # Examples: @@ -754,10 +729,7 @@ private_colormap: enabled=0 # overwrite files. # #======================================================================= -# ne2k: ioaddr=0x300, irq=9, mac=fe:fd:00:00:00:01, ethmod=fbsd, ethdev=en0 #macosx -# ne2k: ioaddr=0x300, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xl0 -# ne2k: ioaddr=0x300, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0 -# ne2k: ioaddr=0x300, irq=9, mac=b0:c4:20:00:00:01, ethmod=win32, ethdev=MYCARD +# ne2k: ioaddr=0x300, irq=9, mac=b0:c4:20:00:00:00, ethmod=#kernel#, ethdev=#eth# # ne2k: ioaddr=0x300, irq=9, mac=fe:fd:00:00:00:01, ethmod=tap, ethdev=tap0 # ne2k: ioaddr=0x300, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=/dev/net/tun0, script=./tunconfig # ne2k: ioaddr=0x300, irq=9, mac=b0:c4:20:00:00:01, ethmod=null, ethdev=eth0 @@ -785,7 +757,7 @@ private_colormap: enabled=0 # Examples: # keyboard_mapping: enabled=1, map=gui/keymaps/x11-pc-de.map #======================================================================= -keyboard_mapping: enabled=0, map= +#keyboard_mapping: enabled=0, map=/usr/share/bochs/keymaps/x11-pc-de.map #======================================================================= # KEYBOARD_TYPE: @@ -964,26 +936,3 @@ i440fxsupport: enabled=1 # See the example in the Bochs sources how to write a plugin device. #======================================================================= #user_plugin: name=testdev - -#======================================================================= -# for Macintosh, use the style of pathnames in the following -# examples. -# -# vgaromimage: :bios:VGABIOS-elpin-2.40 -# romimage: file=:bios:BIOS-bochs-latest, address=0xf0000 -# floppya: 1_44=[fd:], status=inserted -#======================================================================= - -#======================================================================= -# MEGS -# Set the number of Megabytes of physical memory you want to emulate. -# The default is 32MB, most OS's won't need more than that. -# The maximum amount of memory supported is 2048Mb. -# The 'MEGS' option is deprecated. Use 'MEMORY' option instead. -#======================================================================= -#megs: 256 -#megs: 128 -#megs: 64 -#megs: 32 -#megs: 16 -#megs: 8 debian/patches/build-use-system-libltdl.patch0000644000000000000000000023761211714224746016520 0ustar Author: Guillem Jover --- Makefile.in | 19 +-- bx_debug/Makefile.in | 6 - configure.in | 1 fpu/Makefile.in | 16 +-- gui/Makefile.in | 72 +++++++------- iodev/Makefile.in | 256 +++++++++++++++++++++++++-------------------------- memory/Makefile.in | 4 7 files changed, 186 insertions(+), 188 deletions(-) --- a/configure.in +++ b/configure.in @@ -4,7 +4,6 @@ AC_PREREQ(2.50) AC_INIT(bochs.h) AC_REVISION([[$Id: configure.in,v 1.443 2011/02/22 17:07:25 vruppert Exp $]]) AC_CONFIG_HEADER(config.h) -AC_CONFIG_HEADER(ltdlconf.h) dnl // Put Bochs version information right here so that it gets substituted dnl // into all the right places. --- a/Makefile.in +++ b/Makefile.in @@ -467,7 +467,6 @@ local-dist-clean: clean @RMCOMMAND@ build/win32/nsis/Makefile build/win32/nsis/bochs.nsi @RMCOMMAND@ build/macosx/Info.plist build/macosx/script_compiled.rsrc @RMCOMMAND@ libtool - @RMCOMMAND@ ltdlconf.h all-clean: clean cd iodev @COMMAND_SEPARATOR@ @@ -667,13 +666,13 @@ install_macosx: all download_dlx install ########################################### config.o: config.@CPP_SUFFIX@ bochs.h config.h osdep.h bx_debug/debug.h config.h \ osdep.h bxversion.h gui/siminterface.h gui/paramtree.h memory/memory.h \ - pc_system.h plugin.h extplugin.h ltdl.h gui/gui.h \ + pc_system.h plugin.h extplugin.h gui/gui.h \ instrument/stubs/instrument.h iodev/iodev.h bochs.h param_names.h \ param_names.h crc.o: crc.@CPP_SUFFIX@ config.h gdbstub.o: gdbstub.@CPP_SUFFIX@ bochs.h config.h osdep.h bx_debug/debug.h config.h \ osdep.h bxversion.h gui/siminterface.h gui/paramtree.h memory/memory.h \ - pc_system.h plugin.h extplugin.h ltdl.h gui/gui.h \ + pc_system.h plugin.h extplugin.h gui/gui.h \ instrument/stubs/instrument.h param_names.h cpu/cpu.h \ cpu/model_specific.h cpu/crregs.h cpu/descriptor.h cpu/instr.h \ cpu/ia_opcodes.h cpu/lazy_flags.h cpu/icache.h cpu/apic.h cpu/i387.h \ @@ -681,7 +680,7 @@ gdbstub.o: gdbstub.@CPP_SUFFIX@ bochs.h cpu/stack.h iodev/iodev.h bochs.h param_names.h load32bitOShack.o: load32bitOShack.@CPP_SUFFIX@ bochs.h config.h osdep.h \ bx_debug/debug.h config.h osdep.h bxversion.h gui/siminterface.h \ - gui/paramtree.h memory/memory.h pc_system.h plugin.h extplugin.h ltdl.h \ + gui/paramtree.h memory/memory.h pc_system.h plugin.h extplugin.h \ gui/gui.h instrument/stubs/instrument.h param_names.h cpu/cpu.h \ cpu/model_specific.h cpu/crregs.h cpu/descriptor.h cpu/instr.h \ cpu/ia_opcodes.h cpu/lazy_flags.h cpu/icache.h cpu/apic.h cpu/i387.h \ @@ -689,7 +688,7 @@ load32bitOShack.o: load32bitOShack.@CPP_ iodev/iodev.h bochs.h param_names.h logio.o: logio.@CPP_SUFFIX@ bochs.h config.h osdep.h bx_debug/debug.h config.h \ osdep.h bxversion.h gui/siminterface.h gui/paramtree.h memory/memory.h \ - pc_system.h plugin.h extplugin.h ltdl.h gui/gui.h \ + pc_system.h plugin.h extplugin.h gui/gui.h \ instrument/stubs/instrument.h cpu/cpu.h cpu/model_specific.h \ cpu/crregs.h cpu/descriptor.h cpu/instr.h cpu/ia_opcodes.h \ cpu/lazy_flags.h cpu/icache.h cpu/apic.h cpu/i387.h fpu/softfloat.h \ @@ -697,7 +696,7 @@ logio.o: logio.@CPP_SUFFIX@ bochs.h conf bochs.h param_names.h main.o: main.@CPP_SUFFIX@ bochs.h config.h osdep.h bx_debug/debug.h config.h \ osdep.h bxversion.h gui/siminterface.h gui/paramtree.h memory/memory.h \ - pc_system.h plugin.h extplugin.h ltdl.h gui/gui.h \ + pc_system.h plugin.h extplugin.h gui/gui.h \ instrument/stubs/instrument.h param_names.h gui/textconfig.h cpu/cpu.h \ cpu/model_specific.h cpu/crregs.h cpu/descriptor.h cpu/instr.h \ cpu/ia_opcodes.h cpu/lazy_flags.h cpu/icache.h cpu/apic.h cpu/i387.h \ @@ -705,11 +704,11 @@ main.o: main.@CPP_SUFFIX@ bochs.h config iodev/iodev.h bochs.h param_names.h osdep.o: osdep.@CPP_SUFFIX@ bochs.h config.h osdep.h bx_debug/debug.h config.h \ osdep.h bxversion.h gui/siminterface.h gui/paramtree.h memory/memory.h \ - pc_system.h plugin.h extplugin.h ltdl.h gui/gui.h \ + pc_system.h plugin.h extplugin.h gui/gui.h \ instrument/stubs/instrument.h pc_system.o: pc_system.@CPP_SUFFIX@ bochs.h config.h osdep.h bx_debug/debug.h \ config.h osdep.h bxversion.h gui/siminterface.h gui/paramtree.h \ - memory/memory.h pc_system.h plugin.h extplugin.h ltdl.h gui/gui.h \ + memory/memory.h pc_system.h plugin.h extplugin.h gui/gui.h \ instrument/stubs/instrument.h cpu/cpu.h cpu/model_specific.h \ cpu/crregs.h cpu/descriptor.h cpu/instr.h cpu/ia_opcodes.h \ cpu/lazy_flags.h cpu/icache.h cpu/apic.h cpu/i387.h fpu/softfloat.h \ @@ -717,10 +716,10 @@ pc_system.o: pc_system.@CPP_SUFFIX@ boch bochs.h param_names.h plex86-interface.o: plex86-interface.@CPP_SUFFIX@ bochs.h config.h osdep.h \ bx_debug/debug.h config.h osdep.h bxversion.h gui/siminterface.h \ - gui/paramtree.h memory/memory.h pc_system.h plugin.h extplugin.h ltdl.h \ + gui/paramtree.h memory/memory.h pc_system.h plugin.h extplugin.h \ gui/gui.h instrument/stubs/instrument.h plex86-interface.h \ plex86/plex86.h plex86/descriptor.h plugin.o: plugin.@CPP_SUFFIX@ bochs.h config.h osdep.h bx_debug/debug.h config.h \ osdep.h bxversion.h gui/siminterface.h gui/paramtree.h memory/memory.h \ - pc_system.h plugin.h extplugin.h ltdl.h gui/gui.h \ + pc_system.h plugin.h extplugin.h gui/gui.h \ instrument/stubs/instrument.h iodev/iodev.h bochs.h param_names.h --- a/bx_debug/Makefile.in +++ b/bx_debug/Makefile.in @@ -115,7 +115,7 @@ parser.o: parser.c debug.h ../config.h . dbg_main.o: dbg_main.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../cpu/cpu.h \ ../cpu/model_specific.h ../cpu/crregs.h ../cpu/descriptor.h \ ../cpu/instr.h ../cpu/ia_opcodes.h ../cpu/lazy_flags.h ../cpu/icache.h \ @@ -124,7 +124,7 @@ dbg_main.o: dbg_main.@CPP_SUFFIX@ ../boc linux.o: linux.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../cpu/cpu.h ../cpu/model_specific.h ../cpu/crregs.h \ ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -133,7 +133,7 @@ linux.o: linux.@CPP_SUFFIX@ ../bochs.h . symbols.o: symbols.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../cpu/cpu.h ../cpu/model_specific.h \ ../cpu/crregs.h ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ --- a/gui/Makefile.in +++ b/gui/Makefile.in @@ -188,24 +188,24 @@ dist-clean: clean amigaos.o: amigaos.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../iodev/iodev.h beos.o: beos.@CPP_SUFFIX@ ../param_names.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../iodev/iodev.h carbon.o: carbon.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ keymap.h ../iodev/iodev.h ../param_names.h enh_dbg.o: enh_dbg.@CPP_SUFFIX@ ../config.h gtk_enh_dbg_osdep.o: gtk_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h gui.o: gui.@CPP_SUFFIX@ ../iodev/iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../iodev/vga.h \ keymap.h ../gui/bitmaps/floppya.h ../gui/bitmaps/floppyb.h \ ../gui/bitmaps/mouse.h ../gui/bitmaps/reset.h ../gui/bitmaps/power.h \ @@ -215,55 +215,55 @@ gui.o: gui.@CPP_SUFFIX@ ../iodev/iodev.h keymap.o: keymap.@CPP_SUFFIX@ ../param_names.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h keymap.h macintosh.o: macintosh.@CPP_SUFFIX@ ../param_names.h ../bochs.h ../config.h \ ../osdep.h ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../iodev/iodev.h nogui.o: nogui.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h icon_bochs.h paramtree.o: paramtree.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h paramtree.h rfb.o: rfb.@CPP_SUFFIX@ ../param_names.h ../iodev/iodev.h ../bochs.h ../config.h \ ../osdep.h ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h keymap.h icon_bochs.h \ ../font/vga.bitmap.h sdl.h rfb.h rfbkeys.h sdl.o: sdl.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h keymap.h ../iodev/iodev.h icon_bochs.h sdl.h sdlkeys.h siminterface.o: siminterface.@CPP_SUFFIX@ ../param_names.h ../iodev/iodev.h \ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h ../config.h \ ../osdep.h ../bxversion.h ../gui/siminterface.h ../gui/paramtree.h \ - ../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h \ + ../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \ ../gui/gui.h ../instrument/stubs/instrument.h svga.o: svga.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h ../iodev/iodev.h term.o: term.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h ../iodev/iodev.h textconfig.o: textconfig.@CPP_SUFFIX@ ../config.h ../osdep.h ../param_names.h \ - textconfig.h siminterface.h paramtree.h ../extplugin.h ../ltdl.h + textconfig.h siminterface.h paramtree.h ../extplugin.h win32.o: win32.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h keymap.h ../iodev/iodev.h ../iodev/vga.h win32dialog.o: win32dialog.@CPP_SUFFIX@ win32dialog.h ../config.h win32_enh_dbg_osdep.o: win32_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h @@ -271,7 +271,7 @@ win32paramdlg.o: win32paramdlg.@CPP_SUFF wx.o: wx.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h keymap.h ../iodev/iodev.h \ ../font/vga.bitmap.h wxmain.h wxdialog.o: wxdialog.@CPP_SUFFIX@ ../config.h ../param_names.h \ @@ -279,37 +279,37 @@ wxdialog.o: wxdialog.@CPP_SUFFIX@ ../con ../gui/paramtree.h ../bxversion.h wxdialog.h wxmain.h wxmain.o: wxmain.@CPP_SUFFIX@ ../config.h ../param_names.h \ ../osdep.h ../gui/siminterface.h ../gui/paramtree.h ../bxversion.h \ - wxdialog.h wxmain.h ../extplugin.h ../ltdl.h bitmaps/cdromd.xpm \ + wxdialog.h wxmain.h ../extplugin.h bitmaps/cdromd.xpm \ bitmaps/copy.xpm bitmaps/floppya.xpm bitmaps/floppyb.xpm bitmaps/paste.xpm \ bitmaps/power.xpm bitmaps/reset.xpm bitmaps/snapshot.xpm bitmaps/mouse.xpm \ bitmaps/userbutton.xpm bitmaps/saverestore.xpm icon_bochs.xpm x.o: x.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h keymap.h ../iodev/iodev.h enh_dbg.h icon_bochs.xpm \ ../font/vga.bitmap.h amigaos.lo: amigaos.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../iodev/iodev.h beos.lo: beos.@CPP_SUFFIX@ ../param_names.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../iodev/iodev.h carbon.lo: carbon.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ keymap.h ../iodev/iodev.h ../param_names.h enh_dbg.lo: enh_dbg.@CPP_SUFFIX@ ../config.h gtk_enh_dbg_osdep.lo: gtk_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h gui.lo: gui.@CPP_SUFFIX@ ../iodev/iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../iodev/vga.h \ keymap.h ../gui/bitmaps/floppya.h ../gui/bitmaps/floppyb.h \ ../gui/bitmaps/mouse.h ../gui/bitmaps/reset.h ../gui/bitmaps/power.h \ @@ -319,55 +319,55 @@ gui.lo: gui.@CPP_SUFFIX@ ../iodev/iodev. keymap.lo: keymap.@CPP_SUFFIX@ ../param_names.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h keymap.h macintosh.lo: macintosh.@CPP_SUFFIX@ ../param_names.h ../bochs.h ../config.h \ ../osdep.h ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../iodev/iodev.h nogui.lo: nogui.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h icon_bochs.h paramtree.lo: paramtree.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h paramtree.h rfb.lo: rfb.@CPP_SUFFIX@ ../param_names.h ../iodev/iodev.h ../bochs.h ../config.h \ ../osdep.h ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h keymap.h icon_bochs.h \ ../font/vga.bitmap.h sdl.h rfb.h rfbkeys.h sdl.lo: sdl.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h keymap.h ../iodev/iodev.h icon_bochs.h sdl.h sdlkeys.h siminterface.lo: siminterface.@CPP_SUFFIX@ ../param_names.h ../iodev/iodev.h \ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h ../config.h \ ../osdep.h ../bxversion.h ../gui/siminterface.h ../gui/paramtree.h \ - ../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h \ + ../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \ ../gui/gui.h ../instrument/stubs/instrument.h svga.lo: svga.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h ../iodev/iodev.h term.lo: term.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h ../iodev/iodev.h textconfig.lo: textconfig.@CPP_SUFFIX@ ../config.h ../osdep.h ../param_names.h \ - textconfig.h siminterface.h paramtree.h ../extplugin.h ../ltdl.h + textconfig.h siminterface.h paramtree.h ../extplugin.h win32.lo: win32.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h keymap.h ../iodev/iodev.h win32dialog.lo: win32dialog.@CPP_SUFFIX@ win32dialog.h ../config.h win32_enh_dbg_osdep.lo: win32_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h @@ -375,7 +375,7 @@ win32paramdlg.lo: win32paramdlg.@CPP_SUF wx.lo: wx.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h keymap.h ../iodev/iodev.h \ ../font/vga.bitmap.h wxmain.h wxdialog.lo: wxdialog.@CPP_SUFFIX@ ../config.h ../param_names.h \ @@ -383,13 +383,13 @@ wxdialog.lo: wxdialog.@CPP_SUFFIX@ ../co ../gui/paramtree.h ../bxversion.h wxdialog.h wxmain.h wxmain.lo: wxmain.@CPP_SUFFIX@ ../config.h ../param_names.h \ ../osdep.h ../gui/siminterface.h ../gui/paramtree.h ../bxversion.h \ - wxdialog.h wxmain.h ../extplugin.h ../ltdl.h bitmaps/cdromd.xpm \ + wxdialog.h wxmain.h ../extplugin.h bitmaps/cdromd.xpm \ bitmaps/copy.xpm bitmaps/floppya.xpm bitmaps/floppyb.xpm bitmaps/paste.xpm \ bitmaps/power.xpm bitmaps/reset.xpm bitmaps/snapshot.xpm bitmaps/mouse.xpm \ bitmaps/userbutton.xpm bitmaps/saverestore.xpm icon_bochs.xpm x.lo: x.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../param_names.h keymap.h ../iodev/iodev.h enh_dbg.h icon_bochs.xpm \ ../font/vga.bitmap.h --- a/iodev/Makefile.in +++ b/iodev/Makefile.in @@ -226,674 +226,674 @@ dist-clean: clean acpi.o: acpi.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h acpi.h biosdev.o: biosdev.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h biosdev.h busmouse.o: busmouse.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h busmouse.h cdrom_amigaos.o: cdrom_amigaos.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h scsi_commands.h cdrom.h cdrom_beos.o: cdrom_beos.@CPP_SUFFIX@ cdrom_beos.h cdrom.o: cdrom.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ cdrom.h cmos.o: cmos.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h cmos.h crc32.o: crc32.@CPP_SUFFIX@ crc32.h ../config.h devices.o: devices.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../iodev/virt_timer.h \ ../iodev/slowdown_timer.h dma.o: dma.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h dma.h eth_arpback.o: eth_arpback.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.o: eth.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_fbsd.o: eth_fbsd.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth_linux.o: eth_linux.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_null.o: eth_null.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_packetmaker.o: eth_packetmaker.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h \ ../osdep.h ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth_tap.o: eth_tap.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_tuntap.o: eth_tuntap.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_vde.o: eth_vde.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_vnet.o: eth_vnet.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_win32.o: eth_win32.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h extfpuirq.o: extfpuirq.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h extfpuirq.h floppy.o: floppy.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h floppy.h gameport.o: gameport.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h gameport.h guest2host.o: guest2host.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h guest2host.h harddrv.o: harddrv.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h harddrv.h hdimage.h \ cdrom.h hdimage.o: hdimage.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h vmware3.h \ vmware4.h vvfat.h ioapic.o: ioapic.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ioapic.h iodebug.o: iodebug.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h keyboard.o: keyboard.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../gui/keymap.h \ keyboard.h scancodes.h ne2k.o: ne2k.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h ne2k.h eth.h parallel.o: parallel.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h parallel.h pci2isa.o: pci2isa.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h pci2isa.h pci.o: pci.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h pcidev.o: pcidev.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci_ide.o: pci_ide.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h pci_ide.h pcipnic.o: pcipnic.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pcivga.o: pcivga.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h pcivga.h pic.o: pic.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pic.h pit82c54.o: pit82c54.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pit82c54.h pit_wrap.o: pit_wrap.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pit_wrap.h pit82c54.h \ virt_timer.h speaker.h sb16.o: sb16.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h sb16.h soundmod.h \ soundlnx.h soundwin.h soundosx.h scancodes.o: scancodes.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h scancodes.h scsi_device.o: scsi_device.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h cdrom.h \ scsi_device.h serial.o: serial.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h serial.h serial_raw.o: serial_raw.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h slowdown_timer.o: slowdown_timer.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h slowdown_timer.h soundlnx.o: soundlnx.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h soundmod.h soundlnx.h soundmod.o: soundmod.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h soundmod.h soundlnx.h \ soundosx.h soundwin.h soundosx.o: soundosx.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h soundmod.h soundosx.h soundwin.o: soundwin.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h soundmod.h soundwin.h speaker.o: speaker.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h speaker.h svga_cirrus.o: svga_cirrus.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h vga.h svga_cirrus.h unmapped.o: unmapped.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h unmapped.h usb_common.o: usb_common.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h \ usb_hid.h usb_hub.h usb_msd.h usb_printer.h usb_hid.o: usb_hid.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h \ usb_hid.h usb_hub.o: usb_hub.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h \ usb_hub.h usb_msd.o: usb_msd.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h cdrom.h \ hdimage.h scsi_device.h usb_msd.h usb_ohci.o: usb_ohci.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h usb_common.h \ usb_ohci.h usb_printer.o: usb_printer.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h \ usb_printer.h usb_uhci.o: usb_uhci.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h usb_common.h \ usb_uhci.h vga.o: vga.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h vga.h virt_timer.o: virt_timer.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h virt_timer.h vmware3.o: vmware3.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h vmware3.h vmware4.o: vmware4.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h vmware4.h vvfat.o: vvfat.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h vvfat.h acpi.lo: acpi.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h acpi.h biosdev.lo: biosdev.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h biosdev.h busmouse.lo: busmouse.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h busmouse.h cdrom_amigaos.lo: cdrom_amigaos.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h scsi_commands.h cdrom.h cdrom_beos.lo: cdrom_beos.@CPP_SUFFIX@ cdrom_beos.h cdrom.lo: cdrom.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ cdrom.h cmos.lo: cmos.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h cmos.h crc32.lo: crc32.@CPP_SUFFIX@ crc32.h ../config.h devices.lo: devices.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../iodev/virt_timer.h \ ../iodev/slowdown_timer.h dma.lo: dma.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h dma.h eth_arpback.lo: eth_arpback.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.lo: eth.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_fbsd.lo: eth_fbsd.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth_linux.lo: eth_linux.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_null.lo: eth_null.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_packetmaker.lo: eth_packetmaker.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h \ ../osdep.h ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth_tap.lo: eth_tap.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_tuntap.lo: eth_tuntap.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_vde.lo: eth_vde.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_vnet.lo: eth_vnet.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h eth.h eth_win32.lo: eth_win32.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h extfpuirq.lo: extfpuirq.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h extfpuirq.h floppy.lo: floppy.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h floppy.h gameport.lo: gameport.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h gameport.h guest2host.lo: guest2host.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h guest2host.h harddrv.lo: harddrv.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h harddrv.h hdimage.h \ cdrom.h hdimage.lo: hdimage.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h vmware3.h \ vmware4.h vvfat.h ioapic.lo: ioapic.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ioapic.h iodebug.lo: iodebug.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h keyboard.lo: keyboard.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../gui/keymap.h \ keyboard.h scancodes.h ne2k.lo: ne2k.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h ne2k.h eth.h parallel.lo: parallel.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h parallel.h pci2isa.lo: pci2isa.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h pci2isa.h pci.lo: pci.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h pcidev.lo: pcidev.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci_ide.lo: pci_ide.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h pci_ide.h pcipnic.lo: pcipnic.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pcivga.lo: pcivga.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h pcivga.h pic.lo: pic.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pic.h pit82c54.lo: pit82c54.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pit82c54.h pit_wrap.lo: pit_wrap.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pit_wrap.h pit82c54.h \ virt_timer.h speaker.h sb16.lo: sb16.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h sb16.h soundmod.h \ soundlnx.h soundwin.h soundosx.h scancodes.lo: scancodes.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h scancodes.h scsi_device.lo: scsi_device.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h cdrom.h \ scsi_device.h serial.lo: serial.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h serial.h serial_raw.lo: serial_raw.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h slowdown_timer.lo: slowdown_timer.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h slowdown_timer.h soundlnx.lo: soundlnx.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h soundmod.h soundlnx.h soundmod.lo: soundmod.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h soundmod.h soundlnx.h \ soundosx.h soundwin.h soundosx.lo: soundosx.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h soundmod.h soundosx.h soundwin.lo: soundwin.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h soundmod.h soundwin.h speaker.lo: speaker.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h speaker.h svga_cirrus.lo: svga_cirrus.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h vga.h svga_cirrus.h unmapped.lo: unmapped.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h unmapped.h usb_common.lo: usb_common.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h \ usb_hid.h usb_hub.h usb_msd.h usb_printer.h usb_hid.lo: usb_hid.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h \ usb_hid.h usb_hub.lo: usb_hub.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h \ usb_hub.h usb_msd.lo: usb_msd.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h cdrom.h \ hdimage.h scsi_device.h usb_msd.h usb_ohci.lo: usb_ohci.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h usb_common.h \ usb_ohci.h usb_printer.lo: usb_printer.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h usb_common.h \ usb_printer.h usb_uhci.lo: usb_uhci.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h pci.h usb_common.h \ usb_uhci.h vga.lo: vga.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h vga.h virt_timer.lo: virt_timer.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h virt_timer.h vmware3.lo: vmware3.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h vmware3.h vmware4.lo: vmware4.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h vmware4.h vvfat.lo: vvfat.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h hdimage.h vvfat.h --- a/memory/Makefile.in +++ b/memory/Makefile.in @@ -70,7 +70,7 @@ dist-clean: clean memory.o: memory.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../cpu/cpu.h ../cpu/model_specific.h ../cpu/crregs.h \ ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -79,7 +79,7 @@ memory.o: memory.@CPP_SUFFIX@ ../bochs.h misc_mem.o: misc_mem.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../param_names.h ../cpu/cpu.h \ ../cpu/model_specific.h ../cpu/crregs.h ../cpu/descriptor.h \ ../cpu/instr.h ../cpu/ia_opcodes.h ../cpu/lazy_flags.h ../cpu/icache.h \ --- a/fpu/Makefile.in +++ b/fpu/Makefile.in @@ -77,7 +77,7 @@ f2xm1.o: f2xm1.@CPP_SUFFIX@ softfloatx80 ferr.o: ferr.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../cpu/cpu.h ../cpu/model_specific.h ../cpu/crregs.h \ ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -91,7 +91,7 @@ fprem.o: fprem.@CPP_SUFFIX@ softfloatx80 fpu_arith.o: fpu_arith.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../cpu/cpu.h ../cpu/model_specific.h \ ../cpu/crregs.h ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -101,7 +101,7 @@ fpu_arith.o: fpu_arith.@CPP_SUFFIX@ ../b fpu.o: fpu.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ - ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ + ../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../cpu/cpu.h ../cpu/model_specific.h ../cpu/crregs.h \ ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -111,7 +111,7 @@ fpu.o: fpu.@CPP_SUFFIX@ ../bochs.h ../co fpu_compare.o: fpu_compare.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../cpu/cpu.h ../cpu/model_specific.h \ ../cpu/crregs.h ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -121,7 +121,7 @@ fpu_compare.o: fpu_compare.@CPP_SUFFIX@ fpu_const.o: fpu_const.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../cpu/cpu.h ../cpu/model_specific.h \ ../cpu/crregs.h ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -131,7 +131,7 @@ fpu_const.o: fpu_const.@CPP_SUFFIX@ ../b fpu_load_store.o: fpu_load_store.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../cpu/cpu.h ../cpu/model_specific.h \ ../cpu/crregs.h ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -141,7 +141,7 @@ fpu_load_store.o: fpu_load_store.@CPP_SU fpu_misc.o: fpu_misc.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../cpu/cpu.h ../cpu/model_specific.h \ ../cpu/crregs.h ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ @@ -154,7 +154,7 @@ fpu_tags.o: fpu_tags.@CPP_SUFFIX@ ../con fpu_trans.o: fpu_trans.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \ ../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \ - ../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \ + ../pc_system.h ../plugin.h ../extplugin.h ../gui/gui.h \ ../instrument/stubs/instrument.h ../cpu/cpu.h ../cpu/model_specific.h \ ../cpu/crregs.h ../cpu/descriptor.h ../cpu/instr.h ../cpu/ia_opcodes.h \ ../cpu/lazy_flags.h ../cpu/icache.h ../cpu/apic.h ../cpu/i387.h \ debian/patches/local-paths.patch0000644000000000000000000000114611714224746014057 0ustar Author: Robert Millan --- doc/man/bochs.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/doc/man/bochs.1 +++ b/doc/man/bochs.1 @@ -57,8 +57,8 @@ Example: .SH LICENSE This program is distributed under the terms of the GNU Lesser General Public License as published by the Free -Software Foundation. See the COPYING file located in -/usr/local/share/doc/bochs/ for details on the license and +Software Foundation. See the LGPL file located in +/usr/share/common-licenses/ for details on the license and the lack of warranty. .\"SKIP_SECTION" .SH AVAILABILITY debian/patches/build-fix-SHELL.patch0000644000000000000000000000625011714224746014401 0ustar Author: Guillem Jover --- Makefile.in | 2 +- bios/Makefile.in | 2 +- bx_debug/Makefile.in | 2 +- cpu/Makefile.in | 2 +- disasm/Makefile.in | 2 +- fpu/Makefile.in | 2 +- gui/Makefile.in | 2 +- instrument/example0/Makefile.in | 2 +- instrument/example1/Makefile.in | 2 +- instrument/example2/Makefile.in | 2 +- instrument/stubs/Makefile.in | 2 +- iodev/Makefile.in | 2 +- memory/Makefile.in | 2 +- misc/Makefile.in | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) --- a/bios/Makefile.in +++ b/bios/Makefile.in @@ -28,7 +28,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/disasm/Makefile.in +++ b/disasm/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ top_builddir = .. top_srcdir = @top_srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/fpu/Makefile.in +++ b/fpu/Makefile.in @@ -21,7 +21,7 @@ VPATH = @srcdir@ top_builddir = .. top_srcdir = @top_srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/memory/Makefile.in +++ b/memory/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ top_builddir = .. top_srcdir = @top_srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/bx_debug/Makefile.in +++ b/bx_debug/Makefile.in @@ -23,7 +23,7 @@ VPATH = @srcdir@ top_builddir = .. top_srcdir = @top_srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/cpu/Makefile.in +++ b/cpu/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ top_builddir = .. top_srcdir = @top_srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/gui/Makefile.in +++ b/gui/Makefile.in @@ -34,7 +34,7 @@ sharedir = $(datarootdir)/bochs top_builddir = .. top_srcdir = @top_srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/iodev/Makefile.in +++ b/iodev/Makefile.in @@ -34,7 +34,7 @@ sharedir = $(datarootdir)/bochs top_builddir = .. top_srcdir = @top_srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/Makefile.in +++ b/Makefile.in @@ -79,7 +79,7 @@ RC_CMD=@RC_CMD@ srcdir = @srcdir@ VPATH = @srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -24,7 +24,7 @@ @SUFFIX_LINE@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/instrument/example0/Makefile.in +++ b/instrument/example0/Makefile.in @@ -20,7 +20,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/instrument/example1/Makefile.in +++ b/instrument/example1/Makefile.in @@ -21,7 +21,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/instrument/example2/Makefile.in +++ b/instrument/example2/Makefile.in @@ -21,7 +21,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ --- a/instrument/stubs/Makefile.in +++ b/instrument/stubs/Makefile.in @@ -21,7 +21,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ debian/README.Debian0000644000000000000000000000407511714175710011241 0ustar bochs for Debian ---------------- In order to use Bochs you need to follow these steps: - Gunzip the sample bochsrc file (in examples/bochsrc.gz) into ~/.bochsrc. - Take a look at ~/.bochsrc and adapt it to your needs. In particular you need to set the "boot:" parameter. The default is to use /dev/cdrom for boot. If you want to start from floppy or hard disk you'll need to change that. - Now invoke bochs from command line or from the menu entry. Upstream documentation ---------------------- It's in the bochs-doc package. Start with index.html. sb16ctrl -------- The sb16ctrl utility can be used to query the emulated SB16 device from WITHIN the emulator. You can compile it with: gcc sb16ctrl.c -o sb16ctrl Add -static if you're not certain that the libc version of the guest and the system where you compile are the same. If your guest OS is debian-based there's a "sb16ctrl-bochs" package you can use. amd64 / x86-64 support ---------------------- You can find an image of Linux, the kernel, for x86-64 in . The site contains an x86-64 toolchain, cpu specification and other resources. Bochs as init ------------- By telling your kernel to use /etc/bochs-init/init.sh as init, you can turn your system into a Bochs-only environment. This may be useful for simulating that you have an i386-based PC on different hardware platforms. It is mainly targeted at embedded systems or some such. If your kernel is Linux (which is the most likely), you need to pass "init=/etc/bochs-init/init.sh" as a kernel parameter. Beware that Bochs is not particularly dessigned to be secure from local attacks. This will let any user with physical access to the system to run Bochs. Don't use this feature if you're concerned about local security. EtherBoot support ----------------- To be able to use EtherBoot within Bochs you can read the following info: The pseudo NIC is now enabled by default, so there is no need to rebuild the package. debian/README.plugins0000644000000000000000000000167712153140354011537 0ustar Bochs supports several user interface plugins, the following is the current list: - wx - sdl - x - rfb - term In this document we will refer with '%ui%' to any of those plugins. In Debian those are split in independent packages, having installed the bochs-%ui% package we could use it in one of the following ways: 1) Run it only once, using command line parameters. $ bochs -q 'config_interface:textconfig display_library:%ui%' 2) To make %ui% the default. Edit '.bochsrc', change the 'config_interface' and 'display_library' settings to: config_interface: textconfig display_library: %ui% Run it: $ bochs 3) Use an %ui% config file occasionaly. Copy your '.bochsrc' file: $ cp .bochsrc .bochsrc.%ui% Edit '.bochsrc.%ui%', change the 'config_interface' and 'display_library' settings to: config_interface: textconfig display_library: %ui% Run bochs with the '-f' switch: $ bochs -f .bochsrc.%ui% debian/launcher0000644000000000000000000000025411532330411010704 0ustar #!/bin/sh # # Wrapper script for Bochs. set -e # this allows use of a GUEST variable in bochsrc : ${GUEST:=guest} # now we run bochs GUEST=$GUEST exec bochs-bin -q "$@" debian/sb16ctrl-bochs.manpages0000644000000000000000000000002211403506737013437 0ustar debian/sb16ctrl.1 debian/bochs-svga.install0000644000000000000000000000004511403506737012617 0ustar usr/lib/bochs/plugins/libbx_svga.so* debian/sb16ctrl-bochs.install0000644000000000000000000000002111403506737013311 0ustar usr/bin/sb16ctrl debian/bochs-sdl.install0000644000000000000000000000004411403506737012440 0ustar usr/lib/bochs/plugins/libbx_sdl.so* debian/rules0000755000000000000000000001313612153140403010243 0ustar #!/usr/bin/make -f # # Copyright © 1997-1999 Joey Hess # Copyright © 2002-2004 Robert Millan # Copyright © 2004-2012 Guillem Jover # tmpdir := $(CURDIR)/debian/tmp pkg_bochs := $(CURDIR)/debian/bochs DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) conf_gnu_type += --build $(DEB_HOST_GNU_TYPE) else conf_gnu_type += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif WFLAGS = -Wall CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) CFLAGS = $(WFLAGS) $(shell dpkg-buildflags --get CFLAGS) CXXFLAGS = $(WFLAGS) $(shell dpkg-buildflags --get CXXFLAGS) LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) sb16 := dummy cdrom := cdrom ifeq ($(DEB_HOST_ARCH_OS),linux) kernel := linux conf_arch_args += --enable-pcidev eth := eth0 sb16 := linux com := ttyS0 endif ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) kernel := fbsd eth := xl0 sb16 := freebsd com := cuua0 cdrom := acd0 endif ifeq ($(DEB_HOST_ARCH_OS),hurd) com := com0 endif ifneq (,$(strip $(eth))) conf_arch_args += --enable-ne2000 --enable-pnic bochs_add_files += usr/lib/bochs/plugins/libbx_ne2k.so* endif clean: dh_testdir dh_testroot [ ! -f bios/Makefile ] || $(MAKE) -C bios bios-clean rm -f bios/VGABIOS-* rm -f misc/sb16/sb16ctrl [ ! -f Makefile ] || $(MAKE) dist-clean rm -f bxversion.rc rm -f ltdl.* ltdlconf.* rm -f ltmain.sh rm -f aclocal.m4 rm -f config.sub config.guess rm -f configure dh_clean configure: configure.in dh_testdir libtoolize -c # XXX: Make extra sure we link against the system shared library. rm -rf libltdl aclocal autoconf config.status: configure dh_testdir -test -r /usr/share/misc/config.sub && \ cp -fu /usr/share/misc/config.sub config.sub -test -r /usr/share/misc/config.guess && \ cp -fu /usr/share/misc/config.guess config.guess # Note: We disable docbook support here as a cheap way to avoid # building it in build-arch, and only in build-indep. This works # because configure only disables entering the directory. CPPFLAGS="$(CPPFLAGS)" \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" \ LDFLAGS="$(LDFLAGS)" \ ./configure \ $(conf_gnu_type) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --with-x11 \ --with-rfb \ --with-term \ --with-sdl \ --with-wx \ --disable-docbook \ --enable-cdrom \ --enable-vbe \ --enable-acpi \ --enable-pci \ --enable-usb \ --enable-usb-ohci \ --enable-a20-pin \ --enable-cpu-level=6 \ --enable-x86-64 \ --enable-fpu \ --enable-gdb-stub \ --enable-disasm \ --enable-idle-hack \ --enable-all-optimizations \ --enable-repeat-speedups \ --enable-plugins \ --enable-compressed-hd \ --enable-sb16=$(sb16) \ $(conf_arch_args) build: build-arch build-arch: config.status dh_testdir $(MAKE) ifeq ($(DEB_HOST_ARCH_CPU),i386) $(CC) misc/sb16/sb16ctrl.c -o misc/sb16/sb16ctrl endif build-indep: config.status dh_testdir ifeq (,$(findstring $(DEB_HOST_ARCH_CPU),i386 amd64)) $(error "build-indep will only succeed on any-i386 or any-amd64") endif # bochsbios $(MAKE) -C bios # bochs-doc $(MAKE) -C doc/docbook USE_JADE=1 install: build dh_testdir dh_testroot dh_prep dh_installdirs -s # Hack to keep install target happy touch bios/VGABIOS-fake $(MAKE) install DESTDIR=$(tmpdir) # misc cleanup rm -f \ $(tmpdir)/usr/share/bochs/install-x11-fonts \ $(tmpdir)/usr/share/bochs/test-x11-fonts \ $(tmpdir)/usr/share/man/man1/bochs-dlx.1.gz \ $(tmpdir)/usr/share/doc/bochs/COPYING.gz \ $(tmpdir)/usr/bin/bochs-docs # bochs cat $(tmpdir)/usr/share/doc/bochs/bochsrc-sample.txt \ | sed \ -e "s/#kernel#/$(kernel)/g" \ -e "s/#eth#/$(eth)/g" \ -e "s/#com#/$(com)/g" \ -e "s/#cdrom#/$(cdrom)/g" \ | gzip -c9 \ > $(pkg_bochs)/usr/share/doc/bochs/examples/bochsrc.gz rm -f $(tmpdir)/usr/share/doc/bochs/bochsrc-sample.txt mv $(tmpdir)/usr/bin/bochs \ $(tmpdir)/usr/bin/bochs-bin install -m755 debian/launcher \ $(tmpdir)/usr/bin/bochs cp -a debian/etc debian/tmp/ chmod 755 $(tmpdir)/etc/bochs-init/init.sh ifeq ($(DEB_HOST_ARCH_CPU),i386) cp misc/sb16/sb16ctrl \ $(tmpdir)/usr/bin/ endif install-indep: build-indep dh_testdir dh_testroot dh_prep dh_installdirs -i # bochsbios mkdir -p \ $(tmpdir)/usr/share/bochs/ cp bios/BIOS* \ $(tmpdir)/usr/share/bochs/ # bochs-doc $(MAKE) -C doc/docbook install DESTDIR=$(tmpdir) cp /usr/share/sgml/docbook/stylesheet/dsssl/modular/images/note.gif \ $(tmpdir)/usr/share/doc/bochs/images/ binary-indep: install-indep dh_testdir -i dh_testroot -i dh_install -i --sourcedir=$(tmpdir) dh_installdocs -i dh_installexamples -i dh_installchangelogs -i CHANGES dh_link -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i binary-arch: install dh_testdir -s dh_testroot -s dh_install -s -Nbochs --sourcedir=$(tmpdir) # bochs should be last dh_install -pbochs --sourcedir=$(tmpdir) $(bochs_add_files) dh_installdocs -s dh_installexamples -s dh_installmenu -s dh_installman -s dh_installchangelogs -s CHANGES dh_link -s dh_strip -s dh_compress -s dh_fixperms -s dh_installdeb -s dh_shlibdeps -s dh_gencontrol -s dh_md5sums -s dh_builddeb -s binary: binary-indep binary-arch .PHONY: build build-arch build-indep clean install install-indep .PHONY: binary-indep binary-arch binary debian/bochs.docs0000644000000000000000000000006511714213256011141 0ustar README README.rfb TESTFORM.txt debian/README.plugins debian/bochs.links0000644000000000000000000000017411403506737011336 0ustar usr/share/man/man1/bochs.1 usr/share/man/man1/bochs-bin.1 usr/share/vgabios/vgabios.bin usr/share/bochs/VGABIOS-lgpl-latest debian/etc/0000755000000000000000000000000011161535260007741 5ustar debian/etc/bochs-init/0000755000000000000000000000000011532330411011771 5ustar debian/etc/bochs-init/init.sh0000755000000000000000000000056111532330411013275 0ustar #!/bin/sh mount / -o rw,remount export PATH=/usr/X11R6/bin:$PATH while true do echo -n " - Run [B]ochs - Run [S]hell - [R]eboot Choose an option: " read REPLY case $REPLY in B|b) startx $(which bochs-bin) -qf /etc/bochs-init/bochsrc ;; S|s) login ;; R|r) sync mount / -o ro,remount reboot ;; esac done debian/etc/bochs-init/bochsrc0000644000000000000000000000305011403506737013352 0ustar config_interface: textconfig display_library: sdl romimage: file=/usr/share/bochs/BIOS-bochs-latest, address=0xf0000 megs: 32 vgaromimage: file=/usr/share/vgabios/vgabios.bin floppya: 1_44=/dev/fd0, status=inserted ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 ata1: enabled=0, ioaddr1=0x170, ioaddr2=0x370, irq=15 ata2: enabled=0, ioaddr1=0x1e8, ioaddr2=0x3e0, irq=11 ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x360, irq=9 #ata0-master: type=disk, path="", mode=flat, cylinders=1024, heads=16, spt=63 ata0-slave: type=cdrom, path="/dev/cdrom", status=inserted boot: cdrom ips: 1000000 floppy_bootsig_check: disabled=0 log: /dev/stdout panic: action=ask error: action=report info: action=report debug: action=ignore debugger_log: - com1: enabled=1, dev=/dev/ttyS0 parport1: enabled=1, file="/dev/lp0" sb16: midimode=1, midi=/dev/midi00, wavemode=1, wave=/dev/dsp, loglevel=2, log=/dev/stdout, dmatimer=600000 vga_update_interval: 300000 keyboard_serial_delay: 250 keyboard_paste_delay: 100000 floppy_command_delay: 500 mouse: enabled=1 private_colormap: enabled=0 #ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0 #keyboard_mapping: enabled=0, map=/usr/share/bochs/keymaps/x11-pc-de.map #keyboard_type: mf #user_shortcut: keys=ctrlaltdel #magic_break: enabled=1 #cmosimage: cmos.img #load32bitOSImage: os=nullkernel, path=../kernel.img, iolog=../vga_io.log #load32bitOSImage: os=linux, path=../linux.img, iolog=../vga_io.log, initrd=../initrd.img #i440fxsupport: enabled=1 usb1: enabled=1, ioaddr=0xFF80, irq=10 #text_snapshot_check: enable debian/bochs-term.install0000644000000000000000000000004511403506737012626 0ustar usr/lib/bochs/plugins/libbx_term.so* debian/control0000644000000000000000000001074412153140327010575 0ustar Source: bochs Section: misc Priority: extra Maintainer: Debian QA Group Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake, libtool, libltdl-dev, libz-dev, libncurses5-dev, libaa1-dev, libsdl1.2-dev, libx11-dev, libxpm-dev, libice-dev, libsm-dev, libwxgtk2.8-dev, libgtk2.0-dev, libasound2-dev [linux-any] Build-Depends-Indep: iasl, bcc (>= 0.16.3-2), bin86 (>= 0.16.3-2), docbook-dsssl, gcc-multilib [any-amd64] Homepage: http://bochs.sourceforge.net/ Vcs-Browser: http://git.hadrons.org/?p=debian/pkgs/bochs.git Vcs-Git: git://git.hadrons.org/git/debian/pkgs/bochs.git Standards-Version: 3.9.2 Package: bochs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, bochs-wx | bochs-gui, bochsbios (= ${source:Version}), vgabios (>= 0.5c-1) Recommends: bximage | createdisk Suggests: bochs-doc, debootstrap, grub-rescue-pc, gcc | c-compiler, libc-dev Description: IA-32 PC emulator Bochs is a highly portable free IA-32 (x86) PC emulator written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. . Bochs is capable of running most operating systems inside the emulation including GNU, GNU/Linux, *BSD, FreeDOS, MSDOS and Windows 95/NT. Package: bochs-doc Architecture: all Section: doc Depends: ${misc:Depends} Description: Bochs upstream documentation This package contains the HTML documentation of the Bochs project. . The documentation is divided into three parts: . * User Guide * Development Guide * Documentation Guide Package: bochsbios Architecture: all Depends: ${misc:Depends} Replaces: bochs (<< 2.0) Description: BIOS for the Bochs emulator Bochs is a highly portable free IA-32 (x86) PC emulator written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. . This package contains the BIOS of the Bochs project. Package: bochs-wx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, bochs (= ${binary:Version}) Replaces: bochs (<< 2.0rel-1) Provides: bochs-gui Description: WxWindows plugin for Bochs Bochs is a highly portable free IA-32 (x86) PC emulator written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. . This package contains a WxWindows GUI plugin for Bochs. Package: bochs-sdl Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, bochs (= ${binary:Version}) Replaces: bochs (<< 2.0rel-1) Provides: bochs-gui Description: SDL plugin for Bochs Bochs is a highly portable free IA-32 (x86) PC emulator written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. . This package contains an SDL GUI plugin for Bochs. . Use Scroll-Lock key for full screen. Package: bochs-term Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, bochs (= ${binary:Version}) Replaces: bochs (<< 2.0rel-1), bochs-curses Provides: bochs-gui Description: Terminal (ncurses-based) plugin for Bochs Bochs is a highly portable free IA-32 (x86) PC emulator written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. . This package contains a Terminal (ncurses-based) GUI plugin for Bochs. Package: bochs-x Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, bochs (= ${binary:Version}) Replaces: bochs (<< 2.0rel-1) Provides: bochs-gui Description: X11 plugin for Bochs Bochs is a highly portable free IA-32 (x86) PC emulator written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. . This package contains an X11 GUI plugin for Bochs. Package: bximage Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Disk Image Creation Tool for Bochs This tool is part of the Bochs project. Its purpose is to generate disk images that are used to allocate the guest operating system in Bochs environment. Package: sb16ctrl-bochs Architecture: any-i386 Replaces: sb16ctrl Depends: ${shlibs:Depends}, ${misc:Depends} Description: control utility for Bochs emulated SB16 card You can use this utility to perform some query operations on the Bochs emulated SB16 card. It needs to be installed in your Debian-based guest OS. . The sb16ctrl utility contained in this package can only be used from inside the Bochs emulator. DO NOT TRY IT ON REAL HARDWARE. debian/tarball.sh0000755000000000000000000000430511714224747011161 0ustar #!/bin/bash # # tarball.sh # # Copyright © 2004, 2007-2012 Guillem Jover # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # set -e set -u action=$1 shift get_version() { local d=$1 eval $(grep '^VERSION=' $d/configure.in | sed -e 's/\.\(cvs\|svn\)//' ) echo $VERSION } echo "-> getting the source." case "$action" in snapshot) echo " -> making a svn snapshot." snapshot_dir="bochs-snapshot" if [ -d $snapshot_dir ]; then svn up $snapshot_dir else SVNROOT="https://bochs.svn.sourceforge.net/svnroot/bochs" svn co $SVNROOT/trunk/bochs $snapshot_dir fi version="$(get_version $snapshot_dir)+$(date +%Y%m%d)" ;; tarball) echo " -> unpacking upstream tarball." upstream_dir="bochs-tarball" upstream_tarball=$1 mkdir $upstream_dir cd $upstream_dir tar xzf ../$upstream_tarball --strip 1 cd .. version=$(get_version $upstream_dir) ;; esac tarball=bochs_$version.orig.tar.gz tree=bochs-$version echo "-> filling the working tree." case "$action" in snapshot) svn export $snapshot_dir $tree ;; tarball) mv $upstream_dir $tree ;; esac if ! [ -e $tree/bochs.h ] then echo "error: no bochs tree available." exit 1 fi echo "-> fixing permissions." find $tree -type f -name '*.cc' -o -name '*.h' -o -name '*.inc' \ -o -name 'Makefile.in' -o -name 'patch.*' -o -name '*.diff' \ -o -name 'todo' -o -name '*.txt' \ -o -name '*.def' -o -name '*.rc' -o -name '*.rc.in' -o -name '*.r' \ -o -name '*.data' -o -name '*.ico' -o -name '*.xpm' \ | xargs chmod -x echo "-> removing cruft." # Clean up non-free files rm -f $tree/bios/VGABIOS-elpin-* # Clean up binaries w/o source rm -f $tree/bios/BIOS-* rm -f $tree/bios/VGABIOS-* rm -f $tree/patches/beos-gui-fabo.capture-filter # Clean up generated cruft, to always build from source rm -f $tree/bios/acpi-dsdt.hex rm -f $tree/misc/sb16/sb16ctrl.exe echo "-> creating new tarball." tar czf $tarball $tree echo "-> cleaning working tree." rm -rf $tree debian/bochs.postinst0000644000000000000000000000240511532330411012063 0ustar #! /bin/sh # postinst script for bochs # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `configure' # * `abort-upgrade' # * `abort-remove' `in-favour' # # * `abort-deconfigure' `in-favour' # `removing' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package # # quoting from the policy: # Any necessary prompting should almost always be confined to the # post-installation script, and should be protected with a conditional # so that unnecessary prompting doesn't happen if a package's # installation fails and the `postinst' is called with `abort-upgrade', # `abort-remove' or `abort-deconfigure'. case "$1" in configure) DEVICE=/dev/net/tun if [ ! -e /dev/.devfsd ] && [ ! -c $DEVICE ]; then cd /dev ./MAKEDEV tun || true fi ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/bochs-x.install0000644000000000000000000000004211403506737012123 0ustar usr/lib/bochs/plugins/libbx_x.so* debian/bochs.menu0000644000000000000000000000016511403506737011162 0ustar ?package(bochs): \ section="Applications/Emulators" \ needs="x11" \ title="Bochs" \ command="/usr/bin/bochs" debian/bochsbios.dirs0000644000000000000000000000002011403506737012022 0ustar usr/share/bochs debian/bximage.dirs0000644000000000000000000000003311403506737011467 0ustar usr/bin usr/share/man/man1