From e9d785283bbe5da29db993f2edd4faef771eb467 Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 26 Sep 2019 10:02:43 +0200 Subject: [PATCH] Removed the SCSI_CHINON stuff that was not supposed to be committed in the first place. --- src/cdrom/cdrom.c | 5 ++--- src/cdrom/cdrom.h | 5 ++--- src/config.c | 21 ++++++--------------- src/disk/hdd.c | 13 +++---------- src/win/win_settings.c | 22 +++++----------------- src/win/win_stbar.c | 6 +++--- 6 files changed, 21 insertions(+), 51 deletions(-) diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c index 3bd86f710..1947b1573 100644 --- a/src/cdrom/cdrom.c +++ b/src/cdrom/cdrom.c @@ -8,11 +8,11 @@ * * Generic CD-ROM drive core. * - * Version: @(#)cdrom.c 1.0.7 2018/10/30 + * Version: @(#)cdrom.c 1.0.8 2019/09/26 * * Author: Miran Grca, * - * Copyright 2018 Miran Grca. + * Copyright 2018,2019 Miran Grca. */ #include #include @@ -1006,7 +1006,6 @@ cdrom_hard_reset(void) switch(dev->bus_type) { case CDROM_BUS_ATAPI: case CDROM_BUS_SCSI: - case CDROM_BUS_SCSI_CHINON: scsi_cdrom_drive_reset(i); break; diff --git a/src/cdrom/cdrom.h b/src/cdrom/cdrom.h index b38868135..ec141a5f9 100644 --- a/src/cdrom/cdrom.h +++ b/src/cdrom/cdrom.h @@ -8,11 +8,11 @@ * * Generic CD-ROM drive core header. * - * Version: @(#)cdrom.h 1.0.17 2018/10/28 + * Version: @(#)cdrom.h 1.0.18 2019/09/26 * * Author: Miran Grca, * - * Copyright 2016,2017 Miran Grca. + * Copyright 2016-2019 Miran Grca. */ #ifndef EMU_CDROM_H #define EMU_CDROM_H @@ -58,7 +58,6 @@ enum { CDROM_BUS_DISABLED = 0, CDROM_BUS_ATAPI = 4, CDROM_BUS_SCSI, - CDROM_BUS_SCSI_CHINON, CDROM_BUS_USB }; diff --git a/src/config.c b/src/config.c index 9cb5e5c0b..d434b86e1 100644 --- a/src/config.c +++ b/src/config.c @@ -8,7 +8,7 @@ * * Configuration file handler. * - * Version: @(#)config.c 1.0.61 2019/03/03 + * Version: @(#)config.c 1.0.62 2019/09/26 * * Authors: Sarah Walker, * Miran Grca, @@ -1078,11 +1078,8 @@ load_other_removable_devices(void) if (cdrom[c].ide_channel > 7) cdrom[c].ide_channel = 7; } else { - if (cdrom[c].bus_type == CDROM_BUS_SCSI_CHINON) - sprintf(temp, "cdrom_%02i_scsi_id_chinon", c+1); - else - sprintf(temp, "cdrom_%02i_scsi_id", c+1); - if (cdrom[c].bus_type == CDROM_BUS_SCSI || cdrom[c].bus_type == CDROM_BUS_SCSI_CHINON) { + sprintf(temp, "cdrom_%02i_scsi_id", c+1); + if (cdrom[c].bus_type == CDROM_BUS_SCSI) { cdrom[c].scsi_device_id = config_get_int(cat, temp, c+2); if (cdrom[c].scsi_device_id > 15) @@ -1133,9 +1130,6 @@ load_other_removable_devices(void) sprintf(temp, "cdrom_%02i_scsi_id", c+1); config_delete_var(cat, temp); - - sprintf(temp, "cdrom_%02i_scsi_id_chinon", c+1); - config_delete_var(cat, temp); sprintf(temp, "cdrom_%02i_image_path", c+1); config_delete_var(cat, temp); @@ -1840,13 +1834,10 @@ save_other_removable_devices(void) cdrom[c].ide_channel & 1); config_set_string(cat, temp, tmp2); } + + sprintf(temp, "cdrom_%02i_scsi_id", c + 1); - if (cdrom[c].bus_type == CDROM_BUS_SCSI_CHINON) - sprintf(temp, "cdrom_%02i_scsi_id_chinon", c + 1); - else - sprintf(temp, "cdrom_%02i_scsi_id", c + 1); - - if (cdrom[c].bus_type != CDROM_BUS_SCSI && cdrom[c].bus_type != CDROM_BUS_SCSI_CHINON) { + if (cdrom[c].bus_type != CDROM_BUS_SCSI && cdrom[c].bus_type) { config_delete_var(cat, temp); } else { config_set_int(cat, temp, cdrom[c].scsi_device_id); diff --git a/src/disk/hdd.c b/src/disk/hdd.c index 46bd9e262..97bbf3ddb 100644 --- a/src/disk/hdd.c +++ b/src/disk/hdd.c @@ -8,13 +8,13 @@ * * Common code to handle all sorts of hard disk images. * - * Version: @(#)hdd.c 1.0.9 2018/05/25 + * Version: @(#)hdd.c 1.0.10 2019/09/26 * * Authors: Miran Grca, * Fred N. van Kempen, * - * Copyright 2016-2018 Miran Grca. - * Copyright 2017,2018 Fred N. van Kempen. + * Copyright 2016-2019 Miran Grca. + * Copyright 2017-2019 Fred N. van Kempen. */ #include #include @@ -93,9 +93,6 @@ no_cdrom: if (! strcmp(str, "scsi")) return(HDD_BUS_SCSI); - if (! strcmp(str, "scsi_chinon")) - return(CDROM_BUS_SCSI_CHINON); - if (! strcmp(str, "usb")) ui_msgbox(MBX_ERROR, (wchar_t *)IDS_4110); @@ -132,10 +129,6 @@ hdd_bus_to_string(int bus, int cdrom) case HDD_BUS_SCSI: s = "scsi"; break; - - case CDROM_BUS_SCSI_CHINON: - s = "scsi_chinon"; - break; } return(s); diff --git a/src/win/win_settings.c b/src/win/win_settings.c index d19daa2f7..989931bd7 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -8,7 +8,7 @@ * * Windows 86Box Settings dialog handler. * - * Version: @(#)win_settings.c 1.0.55 2019/03/03 + * Version: @(#)win_settings.c 1.0.56 2019/09/26 * * Authors: Miran Grca, * David Hrdlička, @@ -286,7 +286,7 @@ win_settings_init(void) for (i = 0; i < CDROM_NUM; i++) { if (cdrom[i].bus_type == CDROM_BUS_ATAPI) ide_tracking |= (2 << (cdrom[i].ide_channel << 3)); - else if (cdrom[i].bus_type == CDROM_BUS_SCSI || cdrom[i].bus_type == CDROM_BUS_SCSI_CHINON) + else if (cdrom[i].bus_type == CDROM_BUS_SCSI) scsi_tracking[cdrom[i].scsi_device_id >> 3] |= (1 << ((cdrom[i].scsi_device_id & 0x07) << 3)); } memcpy(temp_zip_drives, zip_drives, ZIP_NUM * sizeof(zip_drive_t)); @@ -3457,7 +3457,6 @@ win_settings_cdrom_drives_recalc_list(HWND hwndList) lvI.iImage = 1; break; case CDROM_BUS_SCSI: - case CDROM_BUS_SCSI_CHINON: wsprintf(szText, plat_get_string(fsid), temp_cdrom[i].scsi_device_id); lvI.pszText = szText; lvI.iImage = 1; @@ -3720,7 +3719,6 @@ win_settings_cdrom_drives_update_item(HWND hwndList, int i) lvI.iImage = 1; break; case CDROM_BUS_SCSI: - case CDROM_BUS_SCSI_CHINON: wsprintf(szText, plat_get_string(fsid), temp_cdrom[i].scsi_device_id); lvI.pszText = szText; lvI.iImage = 1; @@ -3801,7 +3799,7 @@ cdrom_add_locations(HWND hdlg) lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR)); h = GetDlgItem(hdlg, IDC_COMBO_CD_BUS); - for (i = CDROM_BUS_DISABLED; i <= CDROM_BUS_SCSI_CHINON; i++) { + for (i = CDROM_BUS_DISABLED; i <= CDROM_BUS_SCSI; i++) { if ((i == CDROM_BUS_DISABLED) || (i >= CDROM_BUS_ATAPI)) SendMessage(h, CB_ADDSTRING, 0, win_get_string(combo_id_to_string_id(i))); } @@ -3883,7 +3881,6 @@ static void cdrom_recalc_location_controls(HWND hdlg, int assign_id) SendMessage(h, CB_SETCURSEL, temp_cdrom[lv1_current_sel].ide_channel, 0); break; case CDROM_BUS_SCSI: /* SCSI */ - case CDROM_BUS_SCSI_CHINON: h = GetDlgItem(hdlg, IDT_1741); ShowWindow(h, SW_SHOW); EnableWindow(h, TRUE); @@ -3999,7 +3996,7 @@ cdrom_track(uint8_t id) { if (temp_cdrom[id].bus_type == CDROM_BUS_ATAPI) ide_tracking |= (2 << (temp_cdrom[id].ide_channel << 3)); - else if (temp_cdrom[id].bus_type == CDROM_BUS_SCSI || temp_cdrom[id].bus_type == CDROM_BUS_SCSI_CHINON) + else if (temp_cdrom[id].bus_type == CDROM_BUS_SCSI) scsi_tracking[temp_cdrom[id].scsi_device_id >> 3] |= (1 << (temp_cdrom[id].scsi_device_id & 0x07)); } @@ -4009,7 +4006,7 @@ cdrom_untrack(uint8_t id) { if (temp_cdrom[id].bus_type == CDROM_BUS_ATAPI) ide_tracking &= ~(2 << (temp_cdrom[id].ide_channel << 3)); - else if (temp_cdrom[id].bus_type == CDROM_BUS_SCSI || temp_cdrom[id].bus_type == CDROM_BUS_SCSI_CHINON) + else if (temp_cdrom[id].bus_type == CDROM_BUS_SCSI) scsi_tracking[temp_cdrom[id].scsi_device_id >> 3] &= ~(1 << (temp_cdrom[id].scsi_device_id & 0x07)); } @@ -4178,9 +4175,6 @@ win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam case CDROM_BUS_SCSI: b = 2; break; - case CDROM_BUS_SCSI_CHINON: - b = 3; - break; } SendMessage(h, CB_SETCURSEL, b, 0); @@ -4248,9 +4242,6 @@ win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam case CDROM_BUS_SCSI: b = 2; break; - case CDROM_BUS_SCSI_CHINON: - b = 3; - break; } SendMessage(h, CB_SETCURSEL, b, 0); @@ -4313,9 +4304,6 @@ win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam case 2: b2 = CDROM_BUS_SCSI; break; - case 3: - b2 = CDROM_BUS_SCSI_CHINON; - break; } if (b2 == temp_cdrom[lv1_current_sel].bus_type) break; diff --git a/src/win/win_stbar.c b/src/win/win_stbar.c index f3a8b15e4..398ee5020 100644 --- a/src/win/win_stbar.c +++ b/src/win/win_stbar.c @@ -8,7 +8,7 @@ * * Implement the application's Status Bar. * - * Version: @(#)win_stbar.c 1.0.25 2019/03/15 + * Version: @(#)win_stbar.c 1.0.26 2019/09/26 * * Authors: Miran Grca, * Fred N. van Kempen, @@ -552,7 +552,7 @@ ui_sb_update_panes(void) !(hdint || !memcmp(hdc_name, "ide", 3))) continue; - if ((cdrom[i].bus_type == CDROM_BUS_SCSI || cdrom[i].bus_type == CDROM_BUS_SCSI_CHINON) && + if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && (scsi_card_current == 0)) continue; if (cdrom[i].bus_type != 0) @@ -615,7 +615,7 @@ ui_sb_update_panes(void) !(hdint || !memcmp(hdc_name, "ide", 3))) { continue; } - if ((cdrom[i].bus_type == CDROM_BUS_SCSI || cdrom[i].bus_type == CDROM_BUS_SCSI_CHINON) && (scsi_card_current == 0)) + if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && (scsi_card_current == 0)) continue; if (cdrom[i].bus_type != 0) { edge += SB_ICON_WIDTH;