diff --git a/bochs/.bochsrc b/bochs/.bochsrc index 995f6b26b..e0380993f 100644 --- a/bochs/.bochsrc +++ b/bochs/.bochsrc @@ -97,13 +97,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=12 -# ata3: enabled=1, ioaddr1=0x168, ioaddr2=0x368, irq=11 +# ata2: enabled=1, ioaddr1=0x1e8, ioaddr2=0x3e8, irq=11 +# ata3: enabled=1, ioaddr1=0x168, ioaddr2=0x368, 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=12 -ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x368, irq=11 +ata2: enabled=0, ioaddr1=0x1e8, ioaddr2=0x3e8, irq=11 +ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x368, irq=9 #======================================================================= # ATA[0-3]-MASTER, ATA[0-3]-SLAVE diff --git a/bochs/main.cc b/bochs/main.cc index e104aa854..81c814bab 100644 --- a/bochs/main.cc +++ b/bochs/main.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: main.cc,v 1.145 2002-09-24 09:50:16 cbothamy Exp $ +// $Id: main.cc,v 1.146 2002-09-24 22:49:52 cbothamy Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -437,7 +437,7 @@ void bx_init_options () 0x1f0, 0x170, 0x1e8, 0x168 }; Bit8u ata_default_irq[BX_MAX_ATA_CHANNEL] = { - 14, 15, 12, 11 + 14, 15, 11, 9 }; bx_list_c *ata[BX_MAX_ATA_CHANNEL];