From 1f86e5c24cf1b34b52f53f2824f796f8bbc61375 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sat, 9 Aug 2003 17:52:35 +0000
Subject: [PATCH] - usb1 line added in sample bochsrc - USB added in the
 features, bochsrc and configure options sections - description of the special
 bochsrc option '#include' added

---
 bochs/.bochsrc                  |  3 ++-
 bochs/doc/docbook/user/user.dbk | 41 +++++++++++++++++++++++++++++----
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/bochs/.bochsrc b/bochs/.bochsrc
index 600e173fb..3edf48159 100644
--- a/bochs/.bochsrc
+++ b/bochs/.bochsrc
@@ -656,7 +656,8 @@ keyboard_mapping: enabled=0, map=
 
 #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=0
+#i440fxsupport: enabled=1
+#usb1: enabled=1, ioaddr=0xFF40, irq=9
 
 #=======================================================================
 # for Macintosh, use the style of pathnames in the following
diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk
index ae563f252..492bceef8 100644
--- a/bochs/doc/docbook/user/user.dbk
+++ b/bochs/doc/docbook/user/user.dbk
@@ -1,7 +1,7 @@
 <!--
 ================================================================
 doc/docbook/user/user.dbk
-$Id: user.dbk,v 1.124 2003-08-09 11:42:22 vruppert Exp $
+$Id: user.dbk,v 1.125 2003-08-09 17:52:35 vruppert Exp $
 
 This is the top level file for the Bochs Users Manual.
 ================================================================
@@ -435,7 +435,14 @@ currently work with.
     <entry>PCI</entry>
     <entry>incomplete</entry>
     <entry>The Host-to-PCI bridge, and Primary Memory Controller are available.
-    However, PCI-to-IDE, PCI-to-USB, or other PCI cards are not implemented yet.
+    However, PCI-to-IDE or other PCI cards are not implemented yet.
+    </entry>
+  </row>
+  <row>
+    <entry>USB</entry>
+    <entry>incomplete</entry>
+    <entry>The USB root hub is available, USB devices with access to real hardware
+    are not implemented yet.
     </entry>
   </row>
   <row>
@@ -2060,6 +2067,12 @@ turn it off.
       <entry>Enable limited i440FX PCI support.  This is not complete.
           Don't use this option yet.</entry>
     </row>
+    <row>
+      <entry>--enable-usb</entry>
+      <entry>no</entry>
+      <entry>Enable limited i440FX PCI USB support. This is not complete.
+          Don't use this option yet.</entry>
+    </row>
     <row>
       <entry>--enable-4meg-pages</entry>
       <entry>no</entry>
@@ -2714,6 +2727,16 @@ On MacOSX, the share directory is the directory where the application is
 located.
 </para>
 
+<para>
+Starting with version 2.0, you can can use #include in the bochsrc to read the
+configuration from other files. Now it is possible to put platform or
+installation defaults in a global config file (e.g. location of rom images).
+Put this on top of your config file if the global configuration is stored in /etc:
+<screen>
+ #include /etc/bochsrc
+</screen>
+</para>
+
 <para>
 The section below lists all the supported bochsrc options.
 </para>
@@ -3487,6 +3510,16 @@ Enables limited i440fx PCI chipset support.
 </para>
 </section>
 
+<section><title>usb1</title>
+<para>
+Examples:
+<screen>
+  usb1: enabled=1, ioaddr=0xFF40, irq=9
+</screen>
+Enables limited i440fx PCI USB root hub.
+</para>
+</section>
+
 <section><title>time0</title>
 <para>
 Examples:
@@ -6136,7 +6169,7 @@ $ ./bxcommit
 ========================================================================
                                bxcommit
               Undoable Disk Image Commit Tool for Bochs
-      $Id: user.dbk,v 1.124 2003-08-09 11:42:22 vruppert Exp $
+      $Id: user.dbk,v 1.125 2003-08-09 17:52:35 vruppert Exp $
 ========================================================================
 
 What is the flat image name?
@@ -8599,7 +8632,7 @@ linux-$ ./bximage
 ========================================================================
                                 bximage
                   Disk Image Creation Tool for Bochs
-        $Id: user.dbk,v 1.124 2003-08-09 11:42:22 vruppert Exp $
+        $Id: user.dbk,v 1.125 2003-08-09 17:52:35 vruppert Exp $
 ========================================================================
 
 Do you want to create a floppy disk image or a hard disk image?