Merge pull request #3887 from jriwanek-forks/morefixes

More compile fixes with logging turned on
This commit is contained in:
Miran Grča
2023-12-15 23:55:42 +01:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -2297,7 +2297,7 @@ ide_callback(void *priv)
case WIN_WRITE: case WIN_WRITE:
case WIN_WRITE_NORETRY: case WIN_WRITE_NORETRY:
#ifdef ENABLE_IDE_LOG #ifdef ENABLE_IDE_LOG
off64_t s = ide_get_sector(ide); off64_t sector = ide_get_sector(ide);
#endif #endif
if (ide->type == IDE_ATAPI) if (ide->type == IDE_ATAPI)
err = ABRT_ERR; err = ABRT_ERR;
@@ -2317,7 +2317,7 @@ ide_callback(void *priv)
ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 0); ui_sb_update_icon(SB_HDD | hdd[ide->hdd_num].bus, 0);
} }
} }
ide_log("Write: %02X, %i, %08X, %" PRIi64 "\n", err, ide->hdd_num, ide->lba_addr, s); ide_log("Write: %02X, %i, %08X, %" PRIi64 "\n", err, ide->hdd_num, ide->lba_addr, sector);
break; break;
case WIN_WRITE_DMA: case WIN_WRITE_DMA:

View File

@@ -121,7 +121,7 @@ compaq_cga_poll(void *priv)
if (self->cga.displine < self->cga.firstline) { if (self->cga.displine < self->cga.firstline) {
self->cga.firstline = self->cga.displine; self->cga.firstline = self->cga.displine;
video_wait_for_buffer(); video_wait_for_buffer();
compaq_cga_log("Firstline %i\n", firstline); compaq_cga_log("Firstline %i\n", self->cga.firstline);
} }
self->cga.lastline = self->cga.displine; self->cga.lastline = self->cga.displine;