Fix PIIX IDE bus mastering initialisation. Ubuntu 10.04 boots again.
This commit is contained in:
parent
c3a127f01c
commit
12d3ac4377
2 changed files with 1 additions and 1 deletions
|
|
@ -2870,7 +2870,6 @@ static void *ide_init()
|
||||||
{
|
{
|
||||||
ide_pri_enable();
|
ide_pri_enable();
|
||||||
ide_sec_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_pri, &idecallback[0], &idecallback[0], NULL);
|
||||||
timer_add(ide_callback_sec, &idecallback[1], &idecallback[1], NULL);
|
timer_add(ide_callback_sec, &idecallback[1], &idecallback[1], NULL);
|
||||||
|
|
|
||||||
|
|
@ -538,6 +538,7 @@ void model_init()
|
||||||
{
|
{
|
||||||
pclog("Initting as %s\n", model_getname());
|
pclog("Initting as %s\n", model_getname());
|
||||||
AMSTRAD = AT = PCI = TANDY = 0;
|
AMSTRAD = AT = PCI = TANDY = 0;
|
||||||
|
ide_set_bus_master(NULL, NULL, NULL);
|
||||||
io_init();
|
io_init();
|
||||||
|
|
||||||
models[model].init();
|
models[model].init();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue