80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Add secondary XT and AT fdc types

Browse Source 
(Currently unused)
This commit is contained in:
Jasmine Iwanek
2022-10-27 12:19:51 -04:00
parent 952148de3c
commit b2e70ff4f3
2 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/floppy/fdc.c
View File

@@ -94,6 +94,22 @@ fdc_log(const char *fmt, ...)
# define fdc_log(fmt, ...)
#endif
/*
const device_t fdc_none_device = {
.name = "None",
.internal_name = "none",
.flags = 0,
.local = 0,
.init = NULL,
.close = NULL,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
*/
const device_t fdc_internal_device = {
.name = "Internal",
.internal_name = "internal",
@@ -112,9 +128,9 @@ typedef const struct {
const device_t *device;
} fdc_cards_t;
/* All emulated machines have at least one integrated FDC controller */
static fdc_cards_t fdc_cards[] = {
// clang-format off
// { &fdc_none_device },
{ &fdc_internal_device },
{ &fdc_b215_device },
{ &fdc_pii151b_device },
@@ -2275,7 +2291,11 @@ fdc_reset(void *priv)
fdc->max_track = (fdc->flags & FDC_FLAG_MORE_TRACKS) ? 85 : 79;
fdc_remove(fdc);
fdc_set_base(fdc, (fdc->flags & FDC_FLAG_PCJR) ? FDC_PRIMARY_PCJR_ADDR : FDC_PRIMARY_ADDR);
if (fdc->flags & FDC_FLAG_SEC) {
fdc_set_base(fdc, FDC_SECONDARY_ADDR);
} else {
fdc_set_base(fdc, (fdc->flags & FDC_FLAG_PCJR) ? FDC_PRIMARY_PCJR_ADDR : FDC_PRIMARY_ADDR);
}
current_drive = 0;
@@ -2304,10 +2324,15 @@ fdc_init(const device_t *info)
fdc->flags = info->local;
fdc->irq = FDC_PRIMARY_IRQ;
if (fdc->flags & FDC_FLAG_SEC)
fdc->irq = FDC_SECONDARY_IRQ;
else
fdc->irq = FDC_PRIMARY_IRQ;
if (fdc->flags & FDC_FLAG_PCJR)
timer_add(&fdc->watchdog_timer, fdc_watchdog_poll, fdc, 0);
else if (fdc->flags & FDC_FLAG_SEC)
fdc->dma_ch = FDC_SECONDARY_DMA;
else
fdc->dma_ch = FDC_PRIMARY_DMA;
@@ -2347,6 +2372,20 @@ const device_t fdc_xt_device = {
.config = NULL
};
const device_t fdc_xt_sec_device = {
.name = "PC/XT Floppy Drive Controller (Secondary)",
.internal_name = "fdc_xt",
.flags = FDC_FLAG_SEC,
.local = 0,
.init = fdc_init,
.close = fdc_close,
.reset = fdc_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t fdc_xt_t1x00_device = {
.name = "PC/XT Floppy Drive Controller (Toshiba)",
.internal_name = "fdc_xt_t1x00",
@@ -2417,6 +2456,20 @@ const device_t fdc_at_device = {
.config = NULL
};
const device_t fdc_at_sec_device = {
.name = "PC/AT Floppy Drive Controller (Secondary)",
.internal_name = "fdc_at_sec",
.flags = 0,
.local = FDC_FLAG_AT | FDC_FLAG_SEC,
.init = fdc_init,
.close = fdc_close,
.reset = fdc_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t fdc_at_actlow_device = {
.name = "PC/AT Floppy Drive Controller (Active low)",
.internal_name = "fdc_at_actlow",

3
src/include/86box/fdc.h
View File

@@ -52,6 +52,7 @@ extern int fdc_type;
#define FDC_FLAG_AMSTRAD 0x200 /* Non-AT Amstrad machines */
#define FDC_FLAG_UMC 0x400 /* UMC UM8398 */
#define FDC_FLAG_ALI 0x800 /* ALi M512x / M1543C */
#define FDC_FLAG_SEC 0x1000 /* Is Secondary */
typedef struct {
uint8_t dor, stat, command, processed_cmd, dat, st0, swap, dtl;
@@ -185,11 +186,13 @@ extern uint8_t fdc_get_current_drive(void);
#ifdef EMU_DEVICE_H
extern const device_t fdc_xt_device;
extern const device_t fdc_xt_sec_device;
extern const device_t fdc_xt_t1x00_device;
extern const device_t fdc_xt_tandy_device;
extern const device_t fdc_xt_amstrad_device;
extern const device_t fdc_pcjr_device;
extern const device_t fdc_at_device;
extern const device_t fdc_at_sec_device;
extern const device_t fdc_at_actlow_device;
extern const device_t fdc_at_ps1_device;
extern const device_t fdc_at_smc_device;