From af215531f21c96e0433b8f4600b0b29174e17563 Mon Sep 17 00:00:00 2001 From: Christophe Bothamy Date: Sun, 22 Sep 2002 23:47:34 +0000 Subject: [PATCH] - fixed compile problem with --enable-repeat-speedups --- bochs/iodev/harddrv.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc index 4f8bf1660..111a1d6d5 100644 --- a/bochs/iodev/harddrv.cc +++ b/bochs/iodev/harddrv.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: harddrv.cc,v 1.73 2002-09-22 20:56:12 cbothamy Exp $ +// $Id: harddrv.cc,v 1.74 2002-09-22 23:47:34 cbothamy Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -162,7 +162,7 @@ bx_hard_drive_c::init(bx_devices_c *d, bx_cmos_c *cmos) char string[5]; BX_HD_THIS devices = d; - BX_DEBUG(("Init $Id: harddrv.cc,v 1.73 2002-09-22 20:56:12 cbothamy Exp $")); + BX_DEBUG(("Init $Id: harddrv.cc,v 1.74 2002-09-22 23:47:34 cbothamy Exp $")); for (channel=0; channelget() == 1) { @@ -509,7 +509,7 @@ bx_hard_drive_c::read(Bit32u address, unsigned io_len) unsigned transferLen, quantumsMax; quantumsMax = - (512 - BX_SELECTED_CONTROLLER.buffer_index) / io_len; + (512 - BX_SELECTED_CONTROLLER(channel).buffer_index) / io_len; if ( quantumsMax == 0) BX_PANIC(("IO read(1f0): not enough space for read")); BX_HD_THIS devices->bulkIOQuantumsTransferred = @@ -518,10 +518,10 @@ if ( quantumsMax == 0) BX_HD_THIS devices->bulkIOQuantumsTransferred = quantumsMax; transferLen = io_len * BX_HD_THIS devices->bulkIOQuantumsTransferred; memcpy((Bit8u*) BX_HD_THIS devices->bulkIOHostAddr, - &BX_SELECTED_CONTROLLER.buffer[BX_SELECTED_CONTROLLER.buffer_index], + &BX_SELECTED_CONTROLLER(channel).buffer[BX_SELECTED_CONTROLLER(channel).buffer_index], transferLen); BX_HD_THIS devices->bulkIOHostAddr += transferLen; - BX_SELECTED_CONTROLLER.buffer_index += transferLen; + BX_SELECTED_CONTROLLER(channel).buffer_index += transferLen; value32 = 0; // Value returned not important; } else @@ -998,7 +998,7 @@ BX_DEBUG(("IO write to %04x = %02x", (unsigned) address, (unsigned) value)); unsigned transferLen, quantumsMax; quantumsMax = - (512 - BX_SELECTED_CONTROLLER.buffer_index) / io_len; + (512 - BX_SELECTED_CONTROLLER(channel).buffer_index) / io_len; if ( quantumsMax == 0) BX_PANIC(("IO write(1f0): not enough space for write")); BX_HD_THIS devices->bulkIOQuantumsTransferred = @@ -1007,11 +1007,11 @@ if ( quantumsMax == 0) BX_HD_THIS devices->bulkIOQuantumsTransferred = quantumsMax; transferLen = io_len * BX_HD_THIS devices->bulkIOQuantumsTransferred; memcpy( - &BX_SELECTED_CONTROLLER.buffer[BX_SELECTED_CONTROLLER.buffer_index], + &BX_SELECTED_CONTROLLER(channel).buffer[BX_SELECTED_CONTROLLER(channel).buffer_index], (Bit8u*) BX_HD_THIS devices->bulkIOHostAddr, transferLen); BX_HD_THIS devices->bulkIOHostAddr += transferLen; - BX_SELECTED_CONTROLLER.buffer_index += transferLen; + BX_SELECTED_CONTROLLER(channel).buffer_index += transferLen; } else #endif