From 12d3ac437765692d83f3c6b468b022533c5d403a Mon Sep 17 00:00:00 2001 From: SarahW Date: Wed, 6 Dec 2017 22:14:51 +0000 Subject: [PATCH] Fix PIIX IDE bus mastering initialisation. Ubuntu 10.04 boots again. --- src/ide.c | 1 - src/model.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ide.c b/src/ide.c index 50de0ee..a9cacd9 100644 --- a/src/ide.c +++ b/src/ide.c @@ -2870,7 +2870,6 @@ static void *ide_init() { ide_pri_enable(); ide_sec_enable(); - ide_bus_master_read_sector = ide_bus_master_write_sector = NULL; timer_add(ide_callback_pri, &idecallback[0], &idecallback[0], NULL); timer_add(ide_callback_sec, &idecallback[1], &idecallback[1], NULL); diff --git a/src/model.c b/src/model.c index e8784a4..3a11c05 100644 --- a/src/model.c +++ b/src/model.c @@ -538,6 +538,7 @@ void model_init() { pclog("Initting as %s\n", model_getname()); AMSTRAD = AT = PCI = TANDY = 0; + ide_set_bus_master(NULL, NULL, NULL); io_init(); models[model].init();