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

Merge remote-tracking branch 'origin/master' into cdrom_changes

Browse Source
This commit is contained in:
OBattler
2025-03-10 16:57:56 +01:00
parent 77f945ec59 262b49f987
commit a386bd015f
57 changed files with 4887 additions and 2284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/disk/hdc.c
View File

@@ -72,7 +72,9 @@ static const struct {
{ &ide_isa_device },
{ &ide_isa_2ch_device },
{ &xtide_at_device },
{ &xtide_at_2ch_device },
{ &xtide_at_ps2_device },
{ &xtide_at_ps2_2ch_device },
{ &xta_wdxt150_device },
{ &xtide_acculogic_device },
{ &xtide_device },

173
src/disk/hdc_xtide.c
View File

@@ -41,11 +41,13 @@
#include <86box/mem.h>
#include <86box/rom.h>
#include <86box/timer.h>
#include <86box/nvr.h>
#include <86box/device.h>
#include <86box/hdc.h>
#include <86box/hdc_ide.h>
#include <86box/plat_unused.h>
#define ROM_PATH_TINY "roms/hdd/xtide/ide_tiny.bin"
#define ROM_PATH_XT "roms/hdd/xtide/ide_xt.bin"
#define ROM_PATH_XTP "roms/hdd/xtide/ide_xtp.bin"
#define ROM_PATH_AT "roms/hdd/xtide/ide_at.bin"
@@ -57,6 +59,7 @@ typedef struct xtide_t {
void *ide_board;
uint8_t data_high;
rom_t bios_rom;
char nvr_path[64];
} xtide_t;
static void
@@ -136,14 +139,26 @@ xtide_init(const device_t *info)
rom_init(&xtide->bios_rom,
device_get_bios_file(info, device_get_config_bios("bios"), 0),
0xc8000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
device_get_config_hex20("bios_addr"), 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
xtide->ide_board = ide_xtide_init();
io_sethandler(0x0300, 16,
io_sethandler(device_get_config_hex16("base"), 16,
xtide_read, NULL, NULL,
xtide_write, NULL, NULL, xtide);
uint8_t rom_writes_enabled = device_get_config_int("rom_writes_enabled");
if (rom_writes_enabled) {
mem_mapping_set_write_handler(&xtide->bios_rom.mapping, rom_write, rom_writew, rom_writel);
sprintf(xtide->nvr_path, "xtide_%i.nvr", device_get_instance());
FILE *fp = nvr_fopen(xtide->nvr_path, "rb");
if (fp != NULL) {
fread(xtide->bios_rom.rom, 1, 0x2000, fp);
fclose(fp);
}
}
return xtide;
}
@@ -156,7 +171,10 @@ xtide_at_init(const device_t *info)
device_get_bios_file(info, device_get_config_bios("bios"), 0),
0xc8000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
device_add(&ide_isa_2ch_device);
if (info->local == 1)
device_add(&ide_isa_2ch_device);
else
device_add(&ide_isa_device);
return xtide;
}
@@ -189,6 +207,14 @@ xtide_close(void *priv)
{
xtide_t *xtide = (xtide_t *) priv;
if (xtide->nvr_path[0] != 0x00) {
FILE *fp = nvr_fopen(xtide->nvr_path, "wb");
if (fp != NULL) {
fwrite(xtide->bios_rom.rom, 1, 0x2000, fp);
fclose(fp);
}
}
free(xtide);
ide_xtide_close();
@@ -202,7 +228,10 @@ xtide_at_ps2_init(UNUSED(const device_t *info))
rom_init(&xtide->bios_rom, ROM_PATH_PS2AT,
0xc8000, 0x2000, 0x1fff, 0, MEM_MAPPING_EXTERNAL);
device_add(&ide_isa_2ch_device);
if (info->local == 1)
device_add(&ide_isa_2ch_device);
else
device_add(&ide_isa_device);
return xtide;
}
@@ -221,8 +250,104 @@ xtide_at_close(void *priv)
free(xtide);
}
// clang-format off
static const device_config_t xtide_config[] = {
// clang-format off
{
.name = "base",
.description = "Address",
.type = CONFIG_HEX16,
.default_string = NULL,
.default_int = 0x300,
.file_filter = NULL,
.spinner = { 0 },
.selection = {
{ .description = "200H", .value = 0x200 },
{ .description = "210H", .value = 0x210 },
{ .description = "220H", .value = 0x220 },
{ .description = "230H", .value = 0x230 },
{ .description = "240H", .value = 0x240 },
{ .description = "250H", .value = 0x250 },
{ .description = "260H", .value = 0x260 },
{ .description = "270H", .value = 0x270 },
{ .description = "280H", .value = 0x280 },
{ .description = "290H", .value = 0x290 },
{ .description = "2A0H", .value = 0x2a0 },
{ .description = "2B0H", .value = 0x2b0 },
{ .description = "2C0H", .value = 0x2c0 },
{ .description = "2D0H", .value = 0x2d0 },
{ .description = "2E0H", .value = 0x2e0 },
{ .description = "2F0H", .value = 0x2f0 },
{ .description = "300H", .value = 0x300 },
{ .description = "310H", .value = 0x310 },
{ .description = "320H", .value = 0x320 },
{ .description = "330H", .value = 0x330 },
{ .description = "340H", .value = 0x340 },
{ .description = "350H", .value = 0x350 },
{ .description = "360H", .value = 0x360 },
{ .description = "370H", .value = 0x370 },
{ .description = "380H", .value = 0x380 },
{ .description = "390H", .value = 0x390 },
{ .description = "3A0H", .value = 0x3a0 },
{ .description = "3B0H", .value = 0x3b0 },
{ .description = "3C0H", .value = 0x3c0 },
{ .description = "3D0H", .value = 0x3d0 },
{ .description = "3E0H", .value = 0x3e0 },
{ .description = "3F0H", .value = 0x3f0 },
{ NULL }
},
.bios = { { 0 } }
},
{
.name = "rom_writes_enabled",
.description = "Enable BIOS extension ROM Writes",
.type = CONFIG_BINARY,
.default_string = NULL,
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
.selection = { { 0 } },
.bios = { { 0 } }
},
{
.name = "bios_addr",
.description = "BIOS Address",
.type = CONFIG_HEX20,
.default_string = NULL,
.default_int = 0xd0000,
.file_filter = NULL,
.spinner = { 0 },
.selection = {
{ .description = "Disabled", .value = 0x00000 },
#if 0
// Supported on XT IDE Deluxe By Monotech
{ .description = "C000H", .value = 0xc0000 },
{ .description = "C200H", .value = 0xc2000 },
{ .description = "C400H", .value = 0xc4000 },
{ .description = "C600H", .value = 0xc6000 },
#endif
{ .description = "C800H", .value = 0xc8000 },
{ .description = "CA00H", .value = 0xca000 },
{ .description = "CC00H", .value = 0xcc000 },
{ .description = "CE00H", .value = 0xce000 },
{ .description = "D000H", .value = 0xd0000 },
{ .description = "D200H", .value = 0xd2000 },
{ .description = "D400H", .value = 0xd4000 },
{ .description = "D600H", .value = 0xd6000 },
{ .description = "D800H", .value = 0xd8000 },
{ .description = "DA00H", .value = 0xda000 },
{ .description = "DC00H", .value = 0xdc000 },
{ .description = "DE00H", .value = 0xde000 },
#if 0
// Supported on VCFed rev 2
{ .description = "E000H", .value = 0xe0000 },
{ .description = "E400H", .value = 0xe4000 },
{ .description = "E800H", .value = 0xe8000 },
{ .description = "EC00H", .value = 0xec000 },
#endif
{ .description = "" }
},
.bios = { { 0 } }
},
{
.name = "bios",
.description = "BIOS Revision",
@@ -255,11 +380,9 @@ static const device_config_t xtide_config[] = {
},
},
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format on
};
static const device_config_t xtide_at_config[] = {
// clang-format off
{
.name = "bios",
.description = "BIOS Revision",
@@ -292,8 +415,8 @@ static const device_config_t xtide_at_config[] = {
},
},
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format on
};
// clang-format on
const device_t xtide_device = {
.name = "PC/XT XTIDE",
@@ -310,10 +433,24 @@ const device_t xtide_device = {
};
const device_t xtide_at_device = {
.name = "PC/AT XTIDE (Primary Only)",
.internal_name = "xtide_at_1ch",
.flags = DEVICE_ISA16,
.local = 0,
.init = xtide_at_init,
.close = xtide_at_close,
.reset = NULL,
.available = NULL,
.speed_changed = NULL,
.force_redraw = NULL,
.config = xtide_at_config
};
const device_t xtide_at_2ch_device = {
.name = "PC/AT XTIDE",
.internal_name = "xtide_at",
.flags = DEVICE_ISA16,
.local = 0,
.local = 1,
.init = xtide_at_init,
.close = xtide_at_close,
.reset = NULL,
@@ -338,8 +475,8 @@ const device_t xtide_acculogic_device = {
};
const device_t xtide_at_ps2_device = {
.name = "PS/2 AT XTIDE (1.1.5)",
.internal_name = "xtide_at_ps2",
.name = "PS/2 AT XTIDE (1.1.5) (Primary Only)",
.internal_name = "xtide_at_ps2_1ch",
.flags = DEVICE_ISA16,
.local = 0,
.init = xtide_at_ps2_init,
@@ -350,3 +487,17 @@ const device_t xtide_at_ps2_device = {
.force_redraw = NULL,
.config = NULL
};
const device_t xtide_at_ps2_2ch_device = {
.name = "PS/2 AT XTIDE (1.1.5)",
.internal_name = "xtide_at_ps2",
.flags = DEVICE_ISA16,
.local = 1,
.init = xtide_at_ps2_init,
.close = xtide_at_close,
.reset = NULL,
.available = xtide_at_ps2_available,
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};