claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Added Magneto-Optical disk emulation, though the UI settings for it are to be done later.

Browse Source
This commit is contained in:
TC1995
2020-04-01 19:04:53 +02:00
parent c0df76e9ff
commit 254e43fb64
17 changed files with 2636 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/win/86Box.rc
View File

@@ -646,6 +646,8 @@ END
33 ICON DISCARDABLE "win/icons/cdrom_active.ico"
48 ICON DISCARDABLE "win/icons/zip.ico"
49 ICON DISCARDABLE "win/icons/zip_active.ico"
56 ICON DISCARDABLE "win/icons/mo.ico"
57 ICON DISCARDABLE "win/icons/mo_active.ico"
64 ICON DISCARDABLE "win/icons/hard_disk.ico"
65 ICON DISCARDABLE "win/icons/hard_disk_active.ico"
80 ICON DISCARDABLE "win/icons/network.ico"
@@ -658,6 +660,8 @@ END
161 ICON DISCARDABLE "win/icons/cdrom_empty_active.ico"
176 ICON DISCARDABLE "win/icons/zip_empty.ico"
177 ICON DISCARDABLE "win/icons/zip_empty_active.ico"
183 ICON DISCARDABLE "win/icons/mo_empty.ico"
184 ICON DISCARDABLE "win/icons/mo_empty_active.ico"
240 ICON DISCARDABLE "win/icons/machine.ico"
241 ICON DISCARDABLE "win/icons/display.ico"
242 ICON DISCARDABLE "win/icons/input_devices.ico"
@@ -669,6 +673,7 @@ END
248 ICON DISCARDABLE "win/icons/floppy_disabled.ico"
249 ICON DISCARDABLE "win/icons/cdrom_disabled.ico"
250 ICON DISCARDABLE "win/icons/zip_disabled.ico"
251 ICON DISCARDABLE "win/icons/mo_disabled.ico"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -910,6 +915,8 @@ BEGIN
IDS_2120 "Unable to initialize SDL, SDL2.dll is required"
IDS_2121 "Are you sure you want to hard reset the emulated machine?"
IDS_2122 "Are you sure you want to quit 86Box?"
IDS_2124 "MO %i (%03i): %ls"
IDS_2125 "MO images (*.IM?)\0*.IM?\0All files (*.*)\0*.*\0"
END
STRINGTABLE DISCARDABLE

4
src/win/Makefile.mingw
View File

@@ -630,6 +630,8 @@ CDROMOBJ := cdrom.o \
ZIPOBJ := zip.o
MOOBJ := mo.o
ifeq ($(USB), y)
USBOBJ := usb.o
endif
@@ -726,7 +728,7 @@ else
endif
OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
$(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
$(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(MOOBJ) $(HDDOBJ) \
$(USBOBJ) $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \
$(PLATOBJ) $(UIOBJ) $(D2DOBJ) $(FSYNTHOBJ) $(MUNTOBJ) \
$(DEVBROBJ) $(DISCORDOBJ)

BIN
src/win/icons/mo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/win/icons/mo_active.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/win/icons/mo_disabled.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/win/icons/mo_empty.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/win/icons/mo_empty_active.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

41
src/win/win_cdrom.c
View File

@@ -6,7 +6,7 @@
*
* This file is part of the 86Box distribution.
*
* Handle the platform-side of CDROM drives.
* Handle the platform-side of CDROM/ZIP/MO drives.
*
*
*
@@ -31,6 +31,7 @@
#include <86box/hdd.h>
#include <86box/scsi_device.h>
#include <86box/cdrom.h>
#include <86box/mo.h>
#include <86box/zip.h>
#include <86box/scsi_disk.h>
#include <86box/plat.h>
@@ -57,6 +58,44 @@ plat_cdrom_ui_update(uint8_t id, uint8_t reload)
ui_sb_update_tip(SB_CDROM|id);
}
void
mo_eject(uint8_t id)
{
mo_t *dev = (mo_t *) mo_drives[id].priv;
mo_disk_close(dev);
if (mo_drives[id].bus_type) {
/* Signal disk change to the emulated machine. */
mo_insert(dev);
}
ui_sb_update_icon_state(SB_MO | id, 1);
ui_sb_enable_menu_item(SB_MO|id, IDM_MO_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
ui_sb_enable_menu_item(SB_MO|id, IDM_MO_RELOAD | id, MF_BYCOMMAND | MF_ENABLED);
ui_sb_update_tip(SB_MO | id);
config_save();
}
void
mo_reload(uint8_t id)
{
mo_t *dev = (mo_t *) mo_drives[id].priv;
mo_disk_reload(dev);
if (wcslen(mo_drives[id].image_path) == 0) {
ui_sb_enable_menu_item(SB_MO|id, IDM_MO_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
ui_sb_update_icon_state(SB_MO|id, 1);
} else {
ui_sb_enable_menu_item(SB_MO|id, IDM_MO_EJECT | id, MF_BYCOMMAND | MF_ENABLED);
ui_sb_update_icon_state(SB_MO|id, 0);
}
ui_sb_enable_menu_item(SB_MO|id, IDM_MO_RELOAD | id, MF_BYCOMMAND | MF_GRAYED);
ui_sb_update_tip(SB_MO|id);
config_save();
}
void
zip_eject(uint8_t id)

127
src/win/win_stbar.c
View File

@@ -42,6 +42,7 @@
#include <86box/scsi_device.h>
#include <86box/cdrom.h>
#include <86box/zip.h>
#include <86box/mo.h>
#include <86box/cdrom_image.h>
#include <86box/scsi_disk.h>
#include <86box/network.h>
@@ -191,6 +192,31 @@ StatusBarCreateZIPSubmenu(HMENU m, int id)
}
}
static void
StatusBarCreateMOSubmenu(HMENU m, int id)
{
AppendMenu(m, MF_STRING, IDM_MO_IMAGE_NEW | id,
plat_get_string(IDS_2096));
AppendMenu(m, MF_SEPARATOR, 0, 0);
AppendMenu(m, MF_STRING, IDM_MO_IMAGE_EXISTING | id,
plat_get_string(IDS_2097));
AppendMenu(m, MF_STRING, IDM_MO_IMAGE_EXISTING_WP | id,
plat_get_string(IDS_2098));
AppendMenu(m, MF_SEPARATOR, 0, 0);
AppendMenu(m, MF_STRING, IDM_MO_EJECT | id,
plat_get_string(IDS_2093));
AppendMenu(m, MF_STRING, IDM_MO_RELOAD | id,
plat_get_string(IDS_2090));
if (mo_drives[id].image_path[0] == 0x0000) {
EnableMenuItem(m, IDM_MO_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(m, IDM_MO_RELOAD | id, MF_BYCOMMAND | MF_ENABLED);
} else {
EnableMenuItem(m, IDM_MO_EJECT | id, MF_BYCOMMAND | MF_ENABLED);
EnableMenuItem(m, IDM_MO_RELOAD | id, MF_BYCOMMAND | MF_GRAYED);
}
}
void
ui_sb_timer_callback(int pane)
@@ -336,6 +362,33 @@ StatusBarCreateZIPTip(int part)
wcscpy(sbTips[part], tempTip);
}
static void
StatusBarCreateMOTip(int part)
{
WCHAR tempTip[512];
WCHAR *szText;
int id;
int drive = sb_part_meanings[part] & 0xf;
int bus = mo_drives[drive].bus_type;
id = IDS_5377 + (bus - 1);
szText = plat_get_string(id);
if (wcslen(mo_drives[drive].image_path) == 0) {
_swprintf(tempTip, plat_get_string(IDS_2124),
drive+1, szText, plat_get_string(IDS_2057));
} else {
_swprintf(tempTip, plat_get_string(IDS_2124),
drive+1, szText, mo_drives[drive].image_path);
}
if (sbTips[part] != NULL) {
free(sbTips[part]);
sbTips[part] = NULL;
}
sbTips[part] = (WCHAR *)malloc((wcslen(tempTip) << 1) + 2);
wcscpy(sbTips[part], tempTip);
}
static void
StatusBarCreateDiskTip(int part)
@@ -409,6 +462,10 @@ ui_sb_update_tip(int meaning)
StatusBarCreateZIPTip(part);
break;
case SB_MO:
StatusBarCreateMOTip(part);
break;
case SB_HDD:
StatusBarCreateDiskTip(part);
break;
@@ -641,6 +698,21 @@ ui_sb_update_panes(void)
sb_parts++;
}
}
for (i=0; i<MO_NUM; i++) {
/* Could be Internal or External IDE.. */
if ((mo_drives[i].bus_type == MO_BUS_ATAPI) &&
!(hdint || !memcmp(hdc_name, "ide", 3)))
continue;
if ((mo_drives[i].bus_type == MO_BUS_SCSI) && (scsi_card_current == 0))
continue;
if (mo_drives[i].bus_type != 0) {
edge += SB_ICON_WIDTH;
iStatusWidths[sb_parts] = edge;
sb_part_meanings[sb_parts] = SB_MO | i;
sb_map[SB_MO | i] = sb_parts;
sb_parts++;
}
}
if (c_mfm && (hdint || !memcmp(hdc_name, "st506", 5))) {
edge += SB_ICON_WIDTH;
iStatusWidths[sb_parts] = edge;
@@ -731,6 +803,15 @@ ui_sb_update_panes(void)
EnableMenuItem(sb_menu_handles[i], IDM_ZIP_EJECT | (sb_part_meanings[i] & 0xf), MF_BYCOMMAND | ((sb_part_icons[i] & 128) ? MF_GRAYED : MF_ENABLED));
StatusBarCreateZIPTip(i);
break;
case SB_MO: /* Magneto-Optical disk */
sb_part_icons[i] = (wcslen(mo_drives[sb_part_meanings[i] & 0xf].image_path) == 0) ? 128 : 0;
sb_part_icons[i] |= 56;
sb_menu_handles[i] = StatusBarCreatePopupMenu(i);
StatusBarCreateMOSubmenu(sb_menu_handles[i], sb_part_meanings[i] & 0xf);
EnableMenuItem(sb_menu_handles[i], IDM_MO_EJECT | (sb_part_meanings[i] & 0xf), MF_BYCOMMAND | ((sb_part_icons[i] & 128) ? MF_GRAYED : MF_ENABLED));
StatusBarCreateMOTip(i);
break;
case SB_HDD: /* Hard disk */
sb_part_icons[i] = 64;
@@ -813,6 +894,24 @@ ui_sb_mount_zip_img(uint8_t id, int part, uint8_t wp, wchar_t *file_name)
config_save();
}
void
ui_sb_mount_mo_img(uint8_t id, int part, uint8_t wp, wchar_t *file_name)
{
mo_t *dev = (mo_t *) mo_drives[id].priv;
mo_disk_close(dev);
mo_drives[id].read_only = wp;
mo_load(dev, file_name);
mo_insert(dev);
if (sb_ready) {
ui_sb_update_icon_state(SB_MO | id, wcslen(mo_drives[id].image_path) ? 0 : 1);
EnableMenuItem(sb_menu_handles[part], IDM_MO_EJECT | id, MF_BYCOMMAND | (wcslen(zip_drives[id].image_path) ? MF_ENABLED : MF_GRAYED));
EnableMenuItem(sb_menu_handles[part], IDM_MO_RELOAD | id, MF_BYCOMMAND | (wcslen(zip_drives[id].image_path) ? MF_GRAYED : MF_ENABLED));
ui_sb_update_tip(SB_MO | id);
}
config_save();
}
/* Handle messages for the Status Bar window. */
#if defined(__amd64__) || defined(__aarch64__)
@@ -980,6 +1079,34 @@ StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
zip_reload(id);
break;
case IDM_MO_IMAGE_NEW:
id = item_params & 0x0003;
part = sb_map[SB_MO | id];
NewFloppyDialogCreate(hwnd, id | 0x80, part); /* NewZIPDialogCreate */
break;
case IDM_MO_IMAGE_EXISTING:
case IDM_MO_IMAGE_EXISTING_WP:
id = item_params & 0x0003;
part = sb_map[SB_MO | id];
if ((part == 0xff) || (sb_menu_handles == NULL))
break;
ret = file_dlg_w_st(hwnd, IDS_2125, mo_drives[id].image_path, 0);
if (! ret)
ui_sb_mount_mo_img(id, part, (item_id == IDM_MO_IMAGE_EXISTING_WP) ? 1 : 0, wopenfilestring);
break;
case IDM_MO_EJECT:
id = item_params & 0x0003;
mo_eject(id);
break;
case IDM_MO_RELOAD:
id = item_params & 0x0003;
mo_reload(id);
break;
default:
break;
}