Even more cleanups. Also renamed hdd/ to disk/ as that makes more sense. Machines with an Internal HDC (usually IDE) can now also select an alternative one instead.

This commit is contained in:
waltje
2017-10-02 02:15:35 -04:00
parent f6620a45d0
commit 63c532d940
39 changed files with 942 additions and 976 deletions

View File

@@ -12,7 +12,7 @@
* word 0 - base address
* word 1 - bits 1 - 15 = byte count, bit 31 = end of transfer
*
* Version: @(#)piix.c 1.0.4 2017/09/30
* Version: @(#)piix.c 1.0.5 2017/10/01
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -30,8 +30,8 @@
#include "keyboard_at.h"
#include "mem.h"
#include "pci.h"
#include "hdd/hdc.h"
#include "hdd/hdc_ide.h"
#include "disk/hdc.h"
#include "disk/hdc_ide.h"
#include "piix.h"
@@ -612,7 +612,9 @@ void piix_bus_master_set_irq(int channel)
piix_busmaster[channel & 0x0F].status |= (channel >> 4);
}
/* static int reset_reg = 0;
#if 0
static int reset_reg = 0;
static uint8_t rc_read(uint16_t port, void *priv)
{
@@ -625,7 +627,7 @@ static void rc_write(uint16_t port, uint8_t val, void *priv)
{
if (reset_reg & 2)
{
resetpchard();
pc_reset_hard();
}
else
{
@@ -637,12 +639,13 @@ static void rc_write(uint16_t port, uint8_t val, void *priv)
{
piix_reset();
}
resetide();
ide_reset();
softresetx86();
}
}
reset_reg = val;
} */
}
#endif
void piix_reset(void)
{