Partial C-Ltd Kronos emulation.

diff --git a/expansion.cpp b/expansion.cpp
index bd07875151d971cca05b09852318766663851eeb..4d1f46dec7de0e07d60a20cacb82229c9c112b3c 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -5142,16 +5142,15 @@ const struct expansionromtype expansionroms[] = {
                NULL, 0,
                false, EXPANSIONTYPE_SASI | EXPANSIONTYPE_SCSI
        },
-#if 0
        {
                _T("kronos"), _T("Kronos"), _T("C-Ltd"),
-               NULL, kronos_init, kronos_add_scsi_unit, ROMTYPE_KRONOS, 0, 0, 2, false,
+               NULL, kronos_init, NULL, kronos_add_scsi_unit, ROMTYPE_KRONOS, 0, 0, BOARD_AUTOCONFIG_Z2, false,
                NULL, 0,
                false, EXPANSIONTYPE_SCSI,
-               0, 0, 0,
-               { 0xd1, 4, 0x00, 0x00, 0x03, 0xec, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 },
+               0, 0, 0, false, NULL,
+               false, 0, NULL,
+               { 0xd1, 0x04, 0x40, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 },
        },
-#endif
        {
                _T("hda506"), _T("HDA-506"), _T("Spirit Technology"),
                NULL, hda506_init, NULL, hda506_add_scsi_unit, ROMTYPE_HDA506 | ROMTYPE_NOT, 0, 0, BOARD_AUTOCONFIG_Z2, true,

diff --git a/rommgr.cpp b/rommgr.cpp
index 6074b2a06e3f17714eaf9d4f1abca7dccf5d52da..a361c86dd209727e4ce337d605adfca8f00cd89d 100644 (file)
--- a/rommgr.cpp
+++ b/rommgr.cpp
@@ -578,6 +578,8 @@ static struct romdata roms[] = {
        ALTROMPN(224, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x20c2cbb6, 0xb83d7406, 0x6c335a77, 0x0acb30d6, 0xff79a00f, 0x629a6953)
        { _T("Xetec FastTrak"), 1, 42, 1, 42, _T("FASTTRACK\0"), 32768, 227, 0, 0, ROMTYPE_FASTTRAK, 0, 0, NULL,
        0xc5ae45d4, 0x8d682bc1,0x72bd2d35,0x4ba2db5c,0x9f6745a4,0x8937782c, NULL, NULL },
+       { _T("C-Ltd Kronos"), 1, 0, 1, 0, _T("KRONOS\0"), 8192, 235, 0, 0, ROMTYPE_KRONOS, 0, 0, NULL,
+       0x9366d357, 0x7113add0,0x4c782ed7,0xa56a74ba,0x3378d55c,0x5605eaf6, NULL, NULL },
 
        { _T("CyberStorm MK I 68040"), 0, 0, 0, 0, _T("CSMKI\0"), 32768, 95, 0, 0, ROMTYPE_CB_CSMK1, 0, 0, NULL,
          0, 0, 0, 0, 0, 0, NULL, _T("cyberstormmk1_040.rom") },

diff --git a/scsi.cpp b/scsi.cpp
index d8f493f6e39888db0885f8db92500694dc383dff..2fcf336589c6b262a25075b7deeecbacd5da008f 100644 (file)
--- a/scsi.cpp
+++ b/scsi.cpp
@@ -24,6 +24,7 @@
 #include "gayle.h"
 #include "cia.h"
 #include "devices.h"
+#include "flashrom.h"
 
 #define SCSI_EMU_DEBUG 0
 #define RAW_SCSI_DEBUG 0
@@ -848,6 +849,7 @@ struct soft_scsi
        int databuffer_size;
        int db_read_index;
        int db_write_index;
+       void *eeprom;
 
        // sasi
        bool active_select;
@@ -871,6 +873,7 @@ static void soft_scsi_free_unit(struct soft_scsi *s)
                free_scsi (rs->device[j]);
                rs->device[j] = NULL;
        }
+       eeprom93xx_free(s->eeprom);
        xfree(s->databufferptr);
        xfree(s->rom);
        if (s->self_ptr)
@@ -2632,6 +2635,16 @@ static int fasttrak_reg(struct soft_scsi *ncr, uaecptr addr)
        return -1;
 }
 
+static int kronos_reg(uaecptr addr)
+{
+       if (addr >= 0x10)
+               return -1;
+       if (!(addr & 1))
+               return -1;
+       addr >>= 1;
+       return addr & 7;
+}
+
 static uae_u8 read_684xx_dma(struct soft_scsi *ncr, uaecptr addr)
 {
        uae_u8 val = 0;
@@ -3112,8 +3125,13 @@ static uae_u32 ncr80_bget2(struct soft_scsi *ncr, uaecptr addr, int size)
                if (addr < sizeof ncr->acmemory)
                        v = ncr->acmemory[addr];
                if (ncr->configured) {
-                       if (addr == 0x40 || addr == 0x41) {
+                       reg = kronos_reg(addr);
+                       if (reg >= 0) {
+                               v = ncr5380_bget(ncr, reg);
+                       } else if (addr == 0x40) {
                                v = 0;
+                               if (eeprom93xx_read(ncr->eeprom))
+                                       v |= 1 << 6;
                        }
                }
                if (addr & 0x8000) {
@@ -3534,8 +3552,11 @@ static void ncr80_bput2(struct soft_scsi *ncr, uaecptr addr, uae_u32 val, int si
 
        } else if (ncr->type == NCR5380_KRONOS) {
 
-               if (addr == 0x60 || addr == 0x61) {
-                       ;
+               reg = kronos_reg(addr);
+               if (reg >= 0) {
+                       ncr5380_bput(ncr, reg, val);
+               } else if (addr == 0x60) {
+                       eeprom93xx_write(ncr->eeprom, (val & 0x40) != 0, (val & 0x10) != 0, (val & 0x20) != 0);
                }
 
        } else if (ncr->type == NCR5380_ROCHARD) {
@@ -4188,8 +4209,16 @@ void add500_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romconfi
        generic_soft_scsi_add(ch, ci, rc, NCR5380_ADD500, 65536, 32768, ROMTYPE_ADD500);
 }
 
+static uae_u8 kronos_eeprom[32] =
+{
+       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 7 << 5, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
 bool kronos_init(struct autoconfig_info *aci)
 {
+       const struct expansionromtype *ert = get_device_expansion_rom(ROMTYPE_KRONOS);
+       aci->autoconfigp = ert->autoconfig;
        if (!aci->doinit)
                return true;
 
@@ -4200,6 +4229,21 @@ bool kronos_init(struct autoconfig_info *aci)
        scsi->databuffer_size = 1024;
        scsi->databufferptr = xcalloc(uae_u8, scsi->databuffer_size);
 
+       uae_u16 sum = 0, xor = 0;
+       for (int i = 0; i < 16 - 2; i++) {
+               uae_u16 v = (kronos_eeprom[i * 2 + 0] << 8) | (kronos_eeprom[i * 2 + 1]);
+               sum += v;
+               xor ^= v;
+       }
+       sum = 0 - sum;
+       kronos_eeprom[14 * 2 + 0] = sum >> 8;
+       kronos_eeprom[14 * 2 + 1] = (uae_u8)sum;
+       xor ^= sum;
+       kronos_eeprom[15 * 2 + 0] = xor >> 8;
+       kronos_eeprom[15 * 2 + 1] = (uae_u8)xor;
+
+       scsi->eeprom = eeprom93xx_new(kronos_eeprom, 16, NULL);
+
        load_rom_rc(aci->rc, ROMTYPE_KRONOS, 4096, 0, scsi->rom, 32768, LOADROM_EVENONLY_ODDONE | LOADROM_FILL);
        aci->addrbank = scsi->bank;
        return true;