mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed VS2013 compilation error and GCC warning

Browse Source 
Still TODO: make HD seek latency variable
This commit is contained in:
Volker Ruppert 2014-02-23 08:49:44 +00:00
parent 648221d419
commit c0fc06b433
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/iodev/harddrv.cc
View File

@ -3458,15 +3458,17 @@ void bx_hard_drive_c::lba48_transform(controller_t *controller, bx_bool lba48)
void bx_hard_drive_c::start_seek(Bit8u channel) void bx_hard_drive_c::start_seek(Bit8u channel)
{ {
float fSeekTime; Bit64s new_pos, prev_pos, max_pos;
Bit32u seek_time, new_pos, prev_pos, max_pos; Bit32u seek_time;
double fSeekTime;
if (BX_SELECTED_IS_CD(channel)) { if (BX_SELECTED_IS_CD(channel)) {
max_pos = BX_SELECTED_DRIVE(channel).cdrom.max_lba; max_pos = BX_SELECTED_DRIVE(channel).cdrom.max_lba;
prev_pos = BX_SELECTED_DRIVE(channel).cdrom.curr_lba; prev_pos = BX_SELECTED_DRIVE(channel).cdrom.curr_lba;
new_pos = BX_SELECTED_DRIVE(channel).cdrom.next_lba; new_pos = BX_SELECTED_DRIVE(channel).cdrom.next_lba;
fSeekTime = 80000.0 * (float)abs(new_pos - prev_pos + 1) / (max_pos + 1); fSeekTime = 80000.0 * (double)(abs((int)(new_pos - prev_pos + 1)) / (max_pos + 1));
} else { } else {
max_pos = (BX_SELECTED_DRIVE(channel).hdimage->hd_size / 512) - 1;
// TODO: make HD seek latency variable // TODO: make HD seek latency variable
fSeekTime = 5000.0; fSeekTime = 5000.0;
} }