From 6e68a4e23210a118d8973c75c3198a8150287bc5 Mon Sep 17 00:00:00 2001 From: Daniel Gimpelevich Date: Fri, 3 Oct 2003 20:58:23 +0000 Subject: [PATCH] *** empty log message *** --- bochs/.bochsrc | 8 ++-- bochs/build/macosx/bochs.applescript | 2 +- bochs/doc/docbook/user/user.dbk | 10 ++--- bochs/doc/man/bochsrc.5 | 4 +- bochs/gui/carbon.cc | 58 ++++++++++++++-------------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bochs/.bochsrc b/bochs/.bochsrc index ff8fa6f5f..0bcf15b5f 100644 --- a/bochs/.bochsrc +++ b/bochs/.bochsrc @@ -159,13 +159,13 @@ floppyb: 1_44=b.img, status=inserted # Examples: # ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 # ata1: enabled=1, ioaddr1=0x170, ioaddr2=0x370, irq=15 -# ata2: enabled=1, ioaddr1=0x1e8, ioaddr2=0x3e8, irq=11 -# ata3: enabled=1, ioaddr1=0x168, ioaddr2=0x368, irq=9 +# ata2: enabled=1, ioaddr1=0x1e8, ioaddr2=0x3e0, irq=11 +# ata3: enabled=1, ioaddr1=0x168, ioaddr2=0x360, irq=9 #======================================================================= ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 ata1: enabled=0, ioaddr1=0x170, ioaddr2=0x370, irq=15 -ata2: enabled=0, ioaddr1=0x1e8, ioaddr2=0x3e8, irq=11 -ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x368, irq=9 +ata2: enabled=0, ioaddr1=0x1e8, ioaddr2=0x3e0, irq=11 +ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x360, irq=9 #======================================================================= # ATA[0-3]-MASTER, ATA[0-3]-SLAVE diff --git a/bochs/build/macosx/bochs.applescript b/bochs/build/macosx/bochs.applescript index 5fdd19398..de469fcd8 100644 --- a/bochs/build/macosx/bochs.applescript +++ b/bochs/build/macosx/bochs.applescript @@ -12,7 +12,7 @@ on run --Use the script's directory as the current directory tell application "Terminal" activate - do script "cd " & script_path & ";exec " & (POSIX path of bochs_app) & bochs_path + do script "cd '" & script_path & "';exec '" & (POSIX path of bochs_app) & bochs_path&"'" -- Wait for Terminal to change the name first, then change it to ours delay 1 set AppleScript's text item delimiters to "/" diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk index 1b35fb786..0d4cbecc6 100644 --- a/bochs/doc/docbook/user/user.dbk +++ b/bochs/doc/docbook/user/user.dbk @@ -1,7 +1,7 @@