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

Merge branch 'c&t_69000' of ssh://github.com/Cacodemon345/86box into c&t_69000

Browse Source
This commit is contained in:
Cacodemon345
2024-01-30 13:41:42 +06:00
parent 0d427c8138 f313e420d3
commit 10ff2dcc6a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sio/sio_fdc37c669.c
View File

@@ -305,7 +305,7 @@ fdc37c669_reset(void *priv)
dev->regs[0x21] = 0x3c;
dev->regs[0x22] = 0x3d;
if (dev->id == 1) {
if (dev->id != 1) {
fdc_reset(dev->fdc);
fdc37c669_fdc_handler(dev);
}

3
src/video/vid_c&t_69000.c
View File

@@ -43,6 +43,7 @@ typedef struct chips_69000_t {
uint8_t pci_line_interrupt;
uint8_t pci_rom_enable;
uint8_t read_write_bank;
uint8_t slot;
atomic_bool engine_active;
atomic_bool quit;
thread_t *accel_thread;
@@ -1271,7 +1272,7 @@ chips_69000_init(const device_t *info)
video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_sis);
svga_init(info, &chips->svga, chips, 1 << 21, /*2048kb*/
NULL,
chips_69000_recalctimings,
chips_69000_in, chips_69000_out,
NULL,
NULL);