diff --git a/src/chipset/intel_82335.c b/src/chipset/intel_82335.c new file mode 100644 index 000000000..d07b9cf01 --- /dev/null +++ b/src/chipset/intel_82335.c @@ -0,0 +1,232 @@ +/* + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. + * + * This file is part of the 86Box distribution. + * + * Implementation of the Intel 82335(KU82335) chipset. + * + * Copyright 2020 Tiseno100 + * + */ + +#include +#include +#include +#include +#include +#include +#define HAVE_STDARG_H +#include <86box/86box.h> +#include "cpu.h" +#include <86box/timer.h> +#include <86box/io.h> +#include <86box/device.h> +#include <86box/keyboard.h> +#include <86box/mem.h> +#include <86box/fdd.h> +#include <86box/fdc.h> +#include <86box/chipset.h> + + +#include +#include +#include +#include +#include +#include +#define HAVE_STDARG_H +#include <86box/86box.h> +#include "cpu.h" +#include <86box/timer.h> +#include <86box/io.h> +#include <86box/device.h> +#include <86box/keyboard.h> +#include <86box/mem.h> +#include <86box/fdd.h> +#include <86box/fdc.h> +#include <86box/port_92.h> +#include <86box/chipset.h> + +#define enabled_shadow (MEM_READ_INTERNAL | MEM_WRITE_INTERNAL) +#define disabled_shadow (MEM_READ_EXTANY | MEM_WRITE_EXTANY) + +#define rw_shadow (MEM_READ_INTERNAL | MEM_WRITE_INTERNAL) +#define ro_shadow (MEM_READ_INTERNAL | MEM_WRITE_DISABLED) + +typedef struct +{ + + uint16_t + reg_22, reg_24, reg_26, reg_28, reg_2a, reg_2c, reg_2e; + +} intel_82335_t; + +#ifdef ENABLE_INTEL_82335_LOG +int intel_82335_do_log = ENABLE_INTEL_82335_LOG; +static void +intel_82335_log(const char *fmt, ...) +{ + va_list ap; + + if (intel_82335_do_log) { + va_start(ap, fmt); + pclog_ex(fmt, ap); + va_end(ap); + } +} +#else +#define intel_82335_log(fmt, ...) +#endif + +static void +intel_82335_write(uint16_t addr, uint16_t val, void *priv) +{ + intel_82335_t *dev = (intel_82335_t *) priv; + + uint32_t base, i; + + intel_82335_log("Register %02x: Write %04x\n", addr, val); + + switch (addr) { + + case 0x22: + dev->reg_22 = val; + + if (!(dev->reg_2c & 0x01)) + { + mem_set_mem_state_both(0xa0000, 0x20000, (dev->reg_22 & (0x04 << 8)) ? enabled_shadow : disabled_shadow); + mem_set_mem_state_both(0xc0000, 0x20000, (dev->reg_22 & (0x02 << 8)) ? enabled_shadow : disabled_shadow); + mem_set_mem_state_both(0xe0000, 0x20000, (dev->reg_22 & 0x01) ? enabled_shadow : disabled_shadow); + } + break; + + case 0x24: + dev->reg_24 = val; + break; + + case 0x26: + dev->reg_26 = val; + break; + + case 0x28: + dev->reg_28 = val; + break; + + case 0x2a: + dev->reg_2a = val; + break; + + case 0x2c: + dev->reg_2c = val; + break; + + case 0x2e: + dev->reg_2e = val; + + if(dev->reg_2c & 0x01) + { + for(i=0; i<8; i++) + { + base = 0xc0000 + (i << 15); + mem_set_mem_state_both(base, 0x8000, (dev->reg_2e & (1 << (i+8))) ? ((dev->reg_2e & (1 << i)) ? ro_shadow : rw_shadow) : disabled_shadow); + } + break; + } + + } +} + + +static uint16_t +intel_82335_read(uint16_t addr, void *priv) +{ + intel_82335_t *dev = (intel_82335_t *) priv; + + intel_82335_log("Register %02x: Reading\n", addr); + + switch (addr) { + case 0x22: + return dev->reg_22; + break; + case 0x24: + return dev->reg_24; + break; + case 0x26: + return dev->reg_26; + break; + case 0x28: + return dev->reg_28; + break; + case 0x2a: + return dev->reg_2a; + break; + case 0x2c: + return dev->reg_2c; + break; + case 0x2e: + return dev->reg_2e; + break; + default: + return 0xff; + break; + } +} + + +static void +intel_82335_close(void *priv) +{ + intel_82335_t *dev = (intel_82335_t *) priv; + + free(dev); +} + + +static void * +intel_82335_init(const device_t *info) +{ + intel_82335_t *dev = (intel_82335_t *) malloc(sizeof(intel_82335_t)); + memset(dev, 0, sizeof(intel_82335_t)); + + device_add(&port_92_device); + + dev->reg_22 = 0x00; + dev->reg_24 = 0x00; + dev->reg_26 = 0x00; + dev->reg_28 = 0xf9; + dev->reg_2a = 0x00; + dev->reg_2c = 0x00; + dev->reg_2e = 0x00; + + /* Memory Configuration */ + io_sethandler(0x0022, 0x0001, NULL, intel_82335_read, NULL, NULL, intel_82335_write, NULL, dev); + + /* Roll Comparison */ + io_sethandler(0x0024, 0x0001, NULL, intel_82335_read, NULL, NULL, intel_82335_write, NULL, dev); + io_sethandler(0x0026, 0x0001, NULL, intel_82335_read, NULL, NULL, intel_82335_write, NULL, dev); + + /* Address Range Comparison */ + io_sethandler(0x0028, 0x0001, NULL, intel_82335_read, NULL, NULL, intel_82335_write, NULL, dev); + io_sethandler(0x002a, 0x0001, NULL, intel_82335_read, NULL, NULL, intel_82335_write, NULL, dev); + + /* Granuality Enable */ + io_sethandler(0x002c, 0x0001, NULL, intel_82335_read, NULL, NULL, intel_82335_write, NULL, dev); + + /* Extended Granuality */ + io_sethandler(0x002e, 0x0001, NULL, intel_82335_read, NULL, NULL, intel_82335_write, NULL, dev); + + return dev; +} + + +const device_t intel_82335_device = { + "Intel 82335", + 0, + 0, + intel_82335_init, intel_82335_close, NULL, + NULL, NULL, NULL, + NULL +}; diff --git a/src/include/86box/chipset.h b/src/include/86box/chipset.h index 36be94044..87549ca2e 100644 --- a/src/include/86box/chipset.h +++ b/src/include/86box/chipset.h @@ -45,7 +45,7 @@ extern const device_t headland_ht18b_device; extern const device_t headland_ht18c_device; /* Intel */ -extern const device_t i82335_device; +extern const device_t intel_82335_device; extern const device_t i420ex_device; extern const device_t i420tx_device; extern const device_t i420zx_device; diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c index 41f0650b0..46e4487d7 100644 --- a/src/machine/m_at_286_386sx.c +++ b/src/machine/m_at_286_386sx.c @@ -222,7 +222,6 @@ machine_at_px286_init(const machine_t *model) return ret; } - int machine_at_goldstar386_init(const machine_t *model) { @@ -440,7 +439,7 @@ machine_at_shuttle386sx_init(const machine_t *model) machine_at_common_init(model); - device_add(&i82335_device); + device_add(&intel_82335_device); device_add(&keyboard_at_ami_device); device_add(&fdc_at_device); @@ -462,7 +461,7 @@ machine_at_adi386sx_init(const machine_t *model) machine_at_common_init(model); - device_add(&i82335_device); + device_add(&intel_82335_device); device_add(&keyboard_at_ami_device); device_add(&fdc_at_device); diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 80516ca58..c667e9091 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -625,7 +625,7 @@ CPUOBJ := cpu.o cpu_table.o \ x86seg.o x87.o x87_timings.o \ $(DYNARECOBJ) -CHIPSETOBJ := acc2168.o cs8230.o ali1429.o headland.o i82335.o cs4031.o \ +CHIPSETOBJ := acc2168.o cs8230.o ali1429.o headland.o intel_82335.o cs4031.o \ intel_420ex.o intel_4x0.o intel_sio.o intel_piix.o ioapic.o \ neat.o opti495.o opti895.o opti5x7.o scamp.o scat.o via_vt82c49x.o via_vt82c505.o \ sis_85c310.o sis_85c471.o sis_85c496.o opti283.o opti291.o umc491.o \