From 55831f8e5a971304858c167f78f8a7774700fd34 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Tue, 10 Jul 2018 09:39:20 +0300 Subject: [PATCH] Moved CD led flickering to generic CD scsi handler. --- a2091.cpp | 2 -- ide.cpp | 3 --- ncr9x_scsi.cpp | 3 --- ncr_scsi.cpp | 6 ------ scsi.cpp | 3 +++ 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/a2091.cpp b/a2091.cpp index 2938fa69..79deb919 100644 --- a/a2091.cpp +++ b/a2091.cpp @@ -1620,8 +1620,6 @@ void wdscsi_put (struct wd_chip_state *wd, struct wd_state *wds, uae_u8 d) } else { wd_execute(wds, wds->scsis[wd->wdregs[WD_DESTINATION_ID] & 7], 0, d); } - if (wd->scsi && wd->scsi->cd_emu_unit >= 0) - gui_flicker_led (LED_CD, wd->scsi->id, 1); } incsasr (wd, 1); } diff --git a/ide.cpp b/ide.cpp index 1c2e2ac6..0d53615f 100644 --- a/ide.cpp +++ b/ide.cpp @@ -1130,9 +1130,6 @@ static void ide_do_command (struct ide_hdf *ide, uae_u8 cmd) if (ide->atapi) { - if (ide->scsi->device_type == UAEDEV_CD) { - gui_flicker_led(LED_CD, ide->uae_unitnum, 1); - } ide->atapi_drdy = true; if (cmd == 0x00) { /* nop */ ide_interrupt (ide); diff --git a/ncr9x_scsi.cpp b/ncr9x_scsi.cpp index 73ecc686..2e1f3780 100644 --- a/ncr9x_scsi.cpp +++ b/ncr9x_scsi.cpp @@ -673,9 +673,6 @@ int32_t scsiesp_req_enqueue(SCSIRequest *req) { struct scsi_data *sd = (struct scsi_data*)req->dev->handle; - if (sd->device_type == UAEDEV_CD) - gui_flicker_led (LED_CD, sd->uae_unitnum, 1); - sd->data_len = 0; scsi_start_transfer(sd); scsi_emulate_analyze(sd); diff --git a/ncr_scsi.cpp b/ncr_scsi.cpp index 37233003..f632c37f 100644 --- a/ncr_scsi.cpp +++ b/ncr_scsi.cpp @@ -233,9 +233,6 @@ int32_t scsi_req_enqueue(SCSIRequest *req) { struct scsi_data *sd = (struct scsi_data*)req->dev->handle; - if (sd->device_type == UAEDEV_CD) - gui_flicker_led (LED_CD, sd->uae_unitnum, 1); - sd->data_len = 0; scsi_start_transfer(sd); scsi_emulate_analyze(sd); @@ -329,9 +326,6 @@ int32_t scsi710_req_enqueue(SCSIRequest *req) { struct scsi_data *sd = (struct scsi_data*)req->dev->handle; - if (sd->device_type == UAEDEV_CD) - gui_flicker_led (LED_CD, sd->uae_unitnum, 1); - sd->data_len = 0; scsi_start_transfer (sd); scsi_emulate_analyze (sd); diff --git a/scsi.cpp b/scsi.cpp index 5b42bf70..bce77aca 100644 --- a/scsi.cpp +++ b/scsi.cpp @@ -25,6 +25,7 @@ #include "cia.h" #include "devices.h" #include "flashrom.h" +#include "gui.h" #define SCSI_EMU_DEBUG 0 #define RAW_SCSI_DEBUG 0 @@ -416,6 +417,8 @@ void scsi_emulate_cmd(struct scsi_data *sd) copyreply(sd); } } + gui_flicker_led(LED_CD, sd->uae_unitnum, 1); + } else if (sd->device_type == UAEDEV_HDF && sd->nativescsiunit < 0) { -- 2.47.3