From 61f83f2a3d396882be381c07f673051bad709401 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Thu, 14 Dec 2023 17:18:14 -0500 Subject: [PATCH 1/2] Better variable name in hdc_ide --- src/disk/hdc_ide.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index 725c31996..522f1ee66 100644 --- a/src/disk/hdc_ide.c +++ b/src/disk/hdc_ide.c @@ -2297,7 +2297,7 @@ ide_callback(void *priv) case WIN_WRITE: case WIN_WRITE_NORETRY: #ifdef ENABLE_IDE_LOG - off64_t s = ide_get_sector(ide); + off64_t sector = ide_get_sector(ide); #endif if (ide->type == IDE_ATAPI) err = ABRT_ERR; @@ -2317,7 +2317,7 @@ ide_callback(void *priv) 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; case WIN_WRITE_DMA: From 86e07aa598af975ec04e241c19943281b100d7a7 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Thu, 14 Dec 2023 20:42:52 -0500 Subject: [PATCH 2/2] Fix compile error with logging enabled in vid_compaq_cga --- src/video/vid_compaq_cga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video/vid_compaq_cga.c b/src/video/vid_compaq_cga.c index 4753ec223..430c7a64d 100644 --- a/src/video/vid_compaq_cga.c +++ b/src/video/vid_compaq_cga.c @@ -121,7 +121,7 @@ compaq_cga_poll(void *priv) if (self->cga.displine < self->cga.firstline) { self->cga.firstline = self->cga.displine; 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;