From 8e5151d652da2c52356f847802a0345c7c5200a0 Mon Sep 17 00:00:00 2001 From: OBattler Date: Fri, 2 Mar 2018 21:58:42 +0100 Subject: [PATCH] Fixed some whoopsies. --- src/cpu/cpu.h | 3 ++- src/disk/hdc_ide.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index d07ed7d05..38f18242c 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -8,7 +8,7 @@ * * CPU type handler. * - * Version: @(#)cpu.h 1.0.8 2018/03/02 + * Version: @(#)cpu.h 1.0.9 2018/03/02 * * Authors: Sarah Walker, * leilei, @@ -463,6 +463,7 @@ extern void x87_dumpregs(void); extern void x87_reset(void); extern int cpu_effective; +extern void cpu_dynamic_switch(int new_cpu); #endif /*EMU_CPU_H*/ diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index 77ec2d8ad..5408cbfb2 100644 --- a/src/disk/hdc_ide.c +++ b/src/disk/hdc_ide.c @@ -9,7 +9,7 @@ * Implementation of the IDE emulation for hard disks and ATAPI * CD-ROM devices. * - * Version: @(#)hdc_ide.c 1.0.29 2018/02/27 + * Version: @(#)hdc_ide.c 1.0.30 2018/03/02 * * Authors: Sarah Walker, * Miran Grca, @@ -1157,11 +1157,11 @@ void writeide(int ide_board, uint16_t addr, uint8_t val) timer_process(); if (ide_drive_is_zip(ide)) { - zip[atapi_zip_drives[ide->channel]].callback = 40000LL * TIMER_USEC /*100LL*IDE_TIME*/; + zip[atapi_zip_drives[ide->channel]].callback = 100LL*IDE_TIME; } if (ide_drive_is_cdrom(ide)) { - cdrom[atapi_cdrom_drives[ide->channel]].callback = 40000LL * TIMER_USEC /*100LL*IDE_TIME*/; + cdrom[atapi_cdrom_drives[ide->channel]].callback = 100LL*IDE_TIME; } idecallback[ide_board]=40000LL * TIMER_USEC /*100LL*IDE_TIME*/; timer_update_outstanding();