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

Fixed compiling pcidev without plugins per Frank Cornelis's latest patch.

Browse Source
This commit is contained in:
Daniel Gimpelevich 2004-01-24 18:04:18 +00:00
parent aa934c0bd2
commit 06d6d03e5b
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bochs/doc/docbook/user/user.dbk
View File

@ -1,7 +1,7 @@
<!-- <!--
================================================================ ================================================================
doc/docbook/user/user.dbk doc/docbook/user/user.dbk
$Id: user.dbk,v 1.141 2004-01-17 20:50:45 danielg4 Exp $ $Id: user.dbk,v 1.142 2004-01-24 18:03:00 danielg4 Exp $
This is the top level file for the Bochs Users Manual. This is the top level file for the Bochs Users Manual.
================================================================ ================================================================
@ -3587,6 +3587,31 @@ Enables limited i440fx PCI chipset support.
</para> </para>
</section> </section>
<section><title>pcidev</title>
<para>
Examples:
<screen>
pcidev: vendor=0xbabe, device=0x2bad
</screen>
Enables the mapping of a host PCI hardware device within the virtual PCI
subsystem of the Bochs x86 emulator. The arguments
<varname>vendor</varname> and <varname>device</varname>
should contain the PCI vendor ID respectively the PCI
device ID of the host PCI device you want to map within Bochs.
</para>
<note>
<para>
The PCI device mapping is still in a very early stage of development and thus it is very experimental.
This feature requires Linux as a host operating system.
</para>
</note>
<para>
Besides the <varname>pcidev</varname> config line you will need to load
a pcidev kernel module within your Linux host OS. This kernel module is
located in the <constant>bochs/host/linux/pcidev/</constant> directory.
</para>
</section>
<section><title>usb1</title> <section><title>usb1</title>
<para> <para>
Examples: Examples:
@ -9530,7 +9555,7 @@ linux-$ ./bximage
======================================================================== ========================================================================
bximage bximage
Disk Image Creation Tool for Bochs Disk Image Creation Tool for Bochs
$Id: user.dbk,v 1.141 2004-01-17 20:50:45 danielg4 Exp $ $Id: user.dbk,v 1.142 2004-01-24 18:03:00 danielg4 Exp $
======================================================================== ========================================================================
Do you want to create a floppy disk image or a hard disk image? Do you want to create a floppy disk image or a hard disk image?

8
bochs/plugin.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: plugin.h,v 1.22 2004-01-15 02:08:34 danielg4 Exp $ // $Id: plugin.h,v 1.23 2004-01-24 18:04:18 danielg4 Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// This file provides macros and types needed for plugins. It is based on // This file provides macros and types needed for plugins. It is based on
@ -75,6 +75,12 @@ extern "C" {
#define PLUG_load_plugin(name,type) {lib##name##_LTX_plugin_init(NULL,type,0,NULL);} #define PLUG_load_plugin(name,type) {lib##name##_LTX_plugin_init(NULL,type,0,NULL);}
#define DEV_register_ioread_handler(b,c,d,e,f) bx_devices.register_io_read_handler(b,c,d,e,f) #define DEV_register_ioread_handler(b,c,d,e,f) bx_devices.register_io_read_handler(b,c,d,e,f)
#define DEV_register_iowrite_handler(b,c,d,e,f) bx_devices.register_io_write_handler(b,c,d,e,f) #define DEV_register_iowrite_handler(b,c,d,e,f) bx_devices.register_io_write_handler(b,c,d,e,f)
#define DEV_unregister_ioread_handler(b,c,d,e) bx_devices.unregister_io_read_handler(b,c,d,e)
#define DEV_unregister_iowrite_handler(b,c,d,e) bx_devices.unregister_io_write_handler(b,c,d,e)
#define DEV_register_ioread_handler_range(b,c,d,e,f,g) bx_devices.register_io_read_handler_range(b,c,d,e,f,g)
#define DEV_register_iowrite_handler_range(b,c,d,e,f,g) bx_devices.register_io_write_handler_range(b,c,d,e,f,g)
#define DEV_unregister_ioread_handler_range(b,c,d,e,f) bx_devices.unregister_io_read_handler_range(b,c,d,e,f)
#define DEV_unregister_iowrite_handler_range(b,c,d,e,f) bx_devices.unregister_io_write_handler_range(b,c,d,e,f)
#define DEV_register_default_ioread_handler(b,c,d,e) bx_devices.register_default_io_read_handler(b,c,d,e) #define DEV_register_default_ioread_handler(b,c,d,e) bx_devices.register_default_io_read_handler(b,c,d,e)
#define DEV_register_default_iowrite_handler(b,c,d,e) bx_devices.register_default_io_write_handler(b,c,d,e) #define DEV_register_default_iowrite_handler(b,c,d,e) bx_devices.register_default_io_write_handler(b,c,d,e)
#define DEV_register_irq(b,c) bx_devices.register_irq(b,c) #define DEV_register_irq(b,c) bx_devices.register_irq(b,c)