summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/intelfsh.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/intelfsh.cpp')
-rw-r--r--src/devices/machine/intelfsh.cpp610
1 files changed, 255 insertions, 355 deletions
diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp
index 2252d2804f7..d4a417567e1 100644
--- a/src/devices/machine/intelfsh.cpp
+++ b/src/devices/machine/intelfsh.cpp
@@ -38,7 +38,10 @@ enum
FM_ERASEAMD4, // part 4 of AMD erase sequence
FM_BYTEPROGRAM,
FM_BANKSELECT,
- FM_WRITEPAGEATMEL
+ FM_WRITEPAGEATMEL,
+ FM_WRITEBUFFER1, // part 1 of write to buffer sequence
+ FM_WRITEBUFFER2, // part 2 of write to buffer sequence
+ FM_FAST_RESET,
};
@@ -67,6 +70,7 @@ enum
MFG_SYNCMOS = 0x40,
MFG_TI = 0x97,
MFG_TI_OLD = 0x01,
+ MFG_TOSHIBA = 0x98,
MFG_WINBOND_NEX = 0xef,
MFG_WINBOND = 0xda
};
@@ -78,49 +82,56 @@ enum
//**************************************************************************
// device type definition
-DEFINE_DEVICE_TYPE(INTEL_28F016S5, intel_28f016s5_device, "intel_28f016s5", "Intel 28F016S5 Flash")
-DEFINE_DEVICE_TYPE(SHARP_LH28F016S, sharp_lh28f016s_device, "sharp_lh28f016s", "Sharp LH28F016S Flash")
-DEFINE_DEVICE_TYPE(SHARP_LH28F016S_16BIT, sharp_lh28f016s_16bit_device, "sharp_lh28f016s_16bit", "Sharp LH28F016S Flash (16-bit)")
-DEFINE_DEVICE_TYPE(ATMEL_29C010, atmel_29c010_device, "atmel_29c010", "Atmel 29C010 Flash")
-DEFINE_DEVICE_TYPE(AMD_29F010, amd_29f010_device, "amd_29f010", "AMD 29F010 Flash")
-DEFINE_DEVICE_TYPE(AMD_29F040, amd_29f040_device, "amd_29f040", "AMD 29F040 Flash")
-DEFINE_DEVICE_TYPE(AMD_29F080, amd_29f080_device, "amd_29f080", "AMD 29F080 Flash")
-DEFINE_DEVICE_TYPE(AMD_29F400T, amd_29f400t_device, "amd_29f400t", "AMD 29F400T Flash")
-DEFINE_DEVICE_TYPE(AMD_29F800T, amd_29f800t_device, "amd_29f800t", "AMD 29F800T Flash")
-DEFINE_DEVICE_TYPE(AMD_29F800B_16BIT, amd_29f800b_16bit_device, "amd_29f800b_16bit", "AMD 29F800B Flash (16-bit)")
-DEFINE_DEVICE_TYPE(AMD_29LV200T, amd_29lv200t_device, "amd_29lv200t", "AMD 29LV200T Flash")
-DEFINE_DEVICE_TYPE(FUJITSU_29F160TE, fujitsu_29f160te_device, "mbm29f160te", "Fujitsu MBM29F160TE Flash")
-DEFINE_DEVICE_TYPE(FUJITSU_29F016A, fujitsu_29f016a_device, "mbm29f016a", "Fujitsu MBM29F016A Flash")
-DEFINE_DEVICE_TYPE(FUJITSU_29DL164BD, fujitsu_29dl164bd_device, "mbm29dl164bd", "Fujitsu MBM29DL164BD Flash")
-DEFINE_DEVICE_TYPE(FUJITSU_29LV002TC, fujitsu_29lv002tc_device, "mbm29lv002tc", "Fujitsu MBM29LV002TC Flash")
-DEFINE_DEVICE_TYPE(FUJITSU_29LV800B, fujitsu_29lv800b_device, "mbm29lv800b", "Fujitsu MBM29LV800B Flash")
-DEFINE_DEVICE_TYPE(INTEL_E28F400B, intel_e28f400b_device, "intel_e28f400b", "Intel E28F400B Flash")
-DEFINE_DEVICE_TYPE(MACRONIX_29L001MC, macronix_29l001mc_device, "macronix_29l001mc", "Macronix 29L001MC Flash")
-DEFINE_DEVICE_TYPE(MACRONIX_29LV160TMC, macronix_29lv160tmc_device, "macronix_29lv160tmc", "Macronix 29LV160TMC Flash")
-DEFINE_DEVICE_TYPE(TMS_29F040, tms_29f040_device, "tms_29f040", "Texas Instruments 29F040 Flash")
-
-DEFINE_DEVICE_TYPE(PANASONIC_MN63F805MNP, panasonic_mn63f805mnp_device, "panasonic_mn63f805mnp", "Panasonic MN63F805MNP Flash")
-DEFINE_DEVICE_TYPE(SANYO_LE26FV10N1TS, sanyo_le26fv10n1ts_device, "sanyo_le26fv10n1ts", "Sanyo LE26FV10N1TS Flash")
-DEFINE_DEVICE_TYPE(SST_28SF040, sst_28sf040_device, "sst_28sf040", "SST 28SF040 Flash")
-DEFINE_DEVICE_TYPE(SST_39SF040, sst_39sf040_device, "sst_39sf040", "SST 39SF040 Flash")
-DEFINE_DEVICE_TYPE(SST_39VF020, sst_39vf020_device, "sst_39vf020", "SST 39VF020 Flash")
-DEFINE_DEVICE_TYPE(SST_49LF020, sst_49lf020_device, "sst_49lf020", "SST 49LF020 Flash")
-
-DEFINE_DEVICE_TYPE(SHARP_LH28F400, sharp_lh28f400_device, "sharp_lh28f400", "Sharp LH28F400 Flash")
-DEFINE_DEVICE_TYPE(INTEL_E28F008SA, intel_e28f008sa_device, "intel_e28f008sa", "Intel E28F008SA Flash")
-DEFINE_DEVICE_TYPE(INTEL_TE28F160, intel_te28f160_device, "intel_te28f160", "Intel TE28F160 Flash")
-DEFINE_DEVICE_TYPE(SHARP_LH28F160S3, sharp_lh28f160s3_device, "sharp_lh28f160s3", "Sharp LH28F160S3 Flash")
-DEFINE_DEVICE_TYPE(INTEL_TE28F320, intel_te28f320_device, "intel_te28f320", "Intel TE28F320 Flash")
-DEFINE_DEVICE_TYPE(SHARP_LH28F320BF, sharp_lh28f320bf_device, "sharp_lh28f320bf", "Sharp LH28F320BFHE-PBTL Flash")
-DEFINE_DEVICE_TYPE(INTEL_28F320J3D, intel_28f320j3d_device, "intel_28f320j3d", "Intel 28F320J3D Flash")
-DEFINE_DEVICE_TYPE(SPANSION_S29GL064S, spansion_s29gl064s_device, "spansion_s29gl064s", "Spansion / Cypress S29GL064S Flash" )
-DEFINE_DEVICE_TYPE(INTEL_28F320J5, intel_28f320j5_device, "intel_28f320j5", "Intel 28F320J5 Flash")
-
-DEFINE_DEVICE_TYPE(SST_39VF400A, sst_39vf400a_device, "sst_39vf400a", "SST 39VF400A Flash")
-
-DEFINE_DEVICE_TYPE(ATMEL_49F4096, atmel_49f4096_device, "atmel_49f4096", "Atmel AT49F4096 Flash")
-
-DEFINE_DEVICE_TYPE(CAT28F020, cat28f020_device, "cat28f020", "CSI CAT28F020 Flash")
+DEFINE_DEVICE_TYPE(INTEL_28F016S5, intel_28f016s5_device, "intel_28f016s5", "Intel 28F016S5 Flash")
+DEFINE_DEVICE_TYPE(SHARP_LH28F016S, sharp_lh28f016s_device, "sharp_lh28f016s", "Sharp LH28F016S Flash")
+DEFINE_DEVICE_TYPE(SHARP_LH28F016S_16BIT, sharp_lh28f016s_16bit_device, "sharp_lh28f016s_16bit", "Sharp LH28F016S Flash (16-bit)")
+DEFINE_DEVICE_TYPE(ATMEL_29C010, atmel_29c010_device, "atmel_29c010", "Atmel 29C010 Flash")
+DEFINE_DEVICE_TYPE(AMD_29F010, amd_29f010_device, "amd_29f010", "AMD 29F010 Flash")
+DEFINE_DEVICE_TYPE(AMD_29F040, amd_29f040_device, "amd_29f040", "AMD 29F040 Flash")
+DEFINE_DEVICE_TYPE(AMD_29F080, amd_29f080_device, "amd_29f080", "AMD 29F080 Flash")
+DEFINE_DEVICE_TYPE(AMD_29F400T, amd_29f400t_device, "amd_29f400t", "AMD 29F400T Flash")
+DEFINE_DEVICE_TYPE(AMD_29F800T, amd_29f800t_device, "amd_29f800t", "AMD 29F800T Flash")
+DEFINE_DEVICE_TYPE(AMD_29F800B_16BIT, amd_29f800b_16bit_device, "amd_29f800b_16bit", "AMD 29F800B Flash (16-bit)")
+DEFINE_DEVICE_TYPE(AMD_29LV200T, amd_29lv200t_device, "amd_29lv200t", "AMD 29LV200T Flash")
+DEFINE_DEVICE_TYPE(FUJITSU_29F160TE, fujitsu_29f160te_device, "mbm29f160te", "Fujitsu MBM29F160TE Flash")
+DEFINE_DEVICE_TYPE(FUJITSU_29F160TE_16BIT, fujitsu_29f160te_16bit_device, "mbm29f160te_16bit", "Fujitsu MBM29F160TE Flash (16-bit)")
+DEFINE_DEVICE_TYPE(FUJITSU_29F016A, fujitsu_29f016a_device, "mbm29f016a", "Fujitsu MBM29F016A Flash")
+DEFINE_DEVICE_TYPE(FUJITSU_29DL164BD, fujitsu_29dl164bd_device, "mbm29dl164bd", "Fujitsu MBM29DL164BD Flash")
+DEFINE_DEVICE_TYPE(FUJITSU_29LV002TC, fujitsu_29lv002tc_device, "mbm29lv002tc", "Fujitsu MBM29LV002TC Flash")
+DEFINE_DEVICE_TYPE(FUJITSU_29LV800B, fujitsu_29lv800b_device, "mbm29lv800b", "Fujitsu MBM29LV800B Flash")
+DEFINE_DEVICE_TYPE(INTEL_E28F400B, intel_e28f400b_device, "intel_e28f400b", "Intel E28F400B Flash")
+DEFINE_DEVICE_TYPE(MACRONIX_29F008TC, macronix_29f008tc_device, "macronix_29f008tc", "Macronix 29F008TC Flash")
+DEFINE_DEVICE_TYPE(MACRONIX_29F1610MC, macronix_29f1610mc_device, "macronix_29f1610mc", "Macronix 29F1610MC Flash")
+DEFINE_DEVICE_TYPE(MACRONIX_29F1610MC_16BIT, macronix_29f1610mc_16bit_device, "macronix_29f1610mc_16bit", "Macronix 29F1610MC Flash (16-bit)")
+DEFINE_DEVICE_TYPE(MACRONIX_29L001MC, macronix_29l001mc_device, "macronix_29l001mc", "Macronix 29L001MC Flash")
+DEFINE_DEVICE_TYPE(MACRONIX_29LV160TMC, macronix_29lv160tmc_device, "macronix_29lv160tmc", "Macronix 29LV160TMC Flash")
+DEFINE_DEVICE_TYPE(TMS_29F040, tms_29f040_device, "tms_29f040", "Texas Instruments 29F040 Flash")
+
+DEFINE_DEVICE_TYPE(PANASONIC_MN63F805MNP, panasonic_mn63f805mnp_device, "panasonic_mn63f805mnp", "Panasonic MN63F805MNP Flash")
+DEFINE_DEVICE_TYPE(SANYO_LE26FV10N1TS, sanyo_le26fv10n1ts_device, "sanyo_le26fv10n1ts", "Sanyo LE26FV10N1TS Flash")
+DEFINE_DEVICE_TYPE(SST_28SF040, sst_28sf040_device, "sst_28sf040", "SST 28SF040 Flash")
+DEFINE_DEVICE_TYPE(SST_39SF040, sst_39sf040_device, "sst_39sf040", "SST 39SF040 Flash")
+DEFINE_DEVICE_TYPE(SST_39VF020, sst_39vf020_device, "sst_39vf020", "SST 39VF020 Flash")
+DEFINE_DEVICE_TYPE(SST_49LF020, sst_49lf020_device, "sst_49lf020", "SST 49LF020 Flash")
+
+DEFINE_DEVICE_TYPE(SHARP_LH28F400, sharp_lh28f400_device, "sharp_lh28f400", "Sharp LH28F400 Flash")
+DEFINE_DEVICE_TYPE(INTEL_E28F008SA, intel_e28f008sa_device, "intel_e28f008sa", "Intel E28F008SA Flash")
+DEFINE_DEVICE_TYPE(INTEL_TE28F160, intel_te28f160_device, "intel_te28f160", "Intel TE28F160 Flash")
+DEFINE_DEVICE_TYPE(SHARP_LH28F160S3, sharp_lh28f160s3_device, "sharp_lh28f160s3", "Sharp LH28F160S3 Flash")
+DEFINE_DEVICE_TYPE(INTEL_TE28F320, intel_te28f320_device, "intel_te28f320", "Intel TE28F320 Flash")
+DEFINE_DEVICE_TYPE(SHARP_LH28F320BF, sharp_lh28f320bf_device, "sharp_lh28f320bf", "Sharp LH28F320BFHE-PBTL Flash")
+DEFINE_DEVICE_TYPE(INTEL_28F320J3D, intel_28f320j3d_device, "intel_28f320j3d", "Intel 28F320J3D Flash")
+DEFINE_DEVICE_TYPE(SPANSION_S29GL064S, spansion_s29gl064s_device, "spansion_s29gl064s", "Spansion / Cypress S29GL064S Flash")
+DEFINE_DEVICE_TYPE(INTEL_28F320J5, intel_28f320j5_device, "intel_28f320j5", "Intel 28F320J5 Flash")
+DEFINE_DEVICE_TYPE(INTEL_28F640J5, intel_28f640j5_device, "intel_28f640j5", "Intel 28F640J5 Flash")
+
+DEFINE_DEVICE_TYPE(SST_39VF400A, sst_39vf400a_device, "sst_39vf400a", "SST 39VF400A Flash")
+
+DEFINE_DEVICE_TYPE(ATMEL_49F4096, atmel_49f4096_device, "atmel_49f4096", "Atmel AT49F4096 Flash")
+
+DEFINE_DEVICE_TYPE(CAT28F020, cat28f020_device, "cat28f020", "CSI CAT28F020 Flash")
+
+DEFINE_DEVICE_TYPE(TC58FVT800, tc58fvt800_device, "tc58fvt800", "Toshiba TC58FVT800 Flash")
@@ -132,16 +143,15 @@ DEFINE_DEVICE_TYPE(CAT28F020, cat28f020_device, "cat28f0
// intelfsh_device - constructor
//-------------------------------------------------
-intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant)
+intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t bits, uint32_t size, uint8_t maker_id, uint16_t device_id)
: device_t(mconfig, type, tag, owner, clock),
device_nvram_interface(mconfig, *this),
m_region(*this, DEVICE_SELF),
- m_type(variant),
- m_size(0),
- m_bits(8),
+ m_size(size),
+ m_bits(bits),
m_addrmask(0),
- m_device_id(0),
- m_maker_id(0),
+ m_device_id(device_id),
+ m_maker_id(maker_id),
m_sector_is_4k(false),
m_sector_is_16k(false),
m_top_boot_sector(false),
@@ -151,377 +161,160 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type
m_flash_mode(FM_NORMAL),
m_flash_master_lock(false),
m_timer(nullptr),
- m_bank(0)
+ m_bank(0),
+ m_fast_mode(false)
{
- switch( variant )
- {
- case FLASH_INTEL_28F016S5:
- case FLASH_SHARP_LH28F016S:
- m_bits = 8;
- m_size = 0x200000;
- m_maker_id = MFG_INTEL;
- m_device_id = 0xaa;
- break;
- case FLASH_SHARP_LH28F016S_16BIT:
- m_bits = 16;
- m_size = 0x200000;
- m_maker_id = MFG_INTEL;
- m_device_id = 0xaa;
- break;
- case FLASH_ATMEL_29C010:
- m_bits = 8;
- m_size = 0x20000;
- m_page_size = 0x80;
- m_maker_id = MFG_ATMEL;
- m_device_id = 0xd5;
- break;
- case FLASH_ATMEL_49F4096:
- m_bits = 16;
- m_size = 0x80000;
- m_maker_id = MFG_ATMEL;
- m_device_id = 0x92;
- m_sector_is_16k = true;
- break;
- case FLASH_AMD_29F010:
- m_bits = 8;
- m_size = 0x20000;
- m_maker_id = MFG_AMD;
- m_device_id = 0x20;
- break;
- case FLASH_AMD_29F040:
- m_bits = 8;
- m_size = 0x80000;
- m_maker_id = MFG_AMD;
- m_device_id = 0xa4;
- break;
- case FLASH_AMD_29F080:
- m_bits = 8;
- m_size = 0x100000;
- m_addrmask = 0x7ff;
- m_maker_id = MFG_AMD;
- m_device_id = 0xd5;
- break;
- case FLASH_AMD_29F400T:
- m_bits = 8;
- m_size = 0x80000;
- m_maker_id = MFG_AMD;
- m_device_id = 0x23;
- m_top_boot_sector = true;
- break;
- case FLASH_AMD_29F800T:
- m_bits = 8;
- m_size = 0x100000;
- m_maker_id = MFG_AMD;
- m_device_id = 0xda;
- m_top_boot_sector = true;
- break;
- case FLASH_AMD_29F800B_16BIT:
- m_bits = 16;
- m_size = 0x100000;
- m_maker_id = MFG_AMD;
- m_device_id = 0x2258;
- m_top_boot_sector = false;
- break;
- case FLASH_AMD_29LV200T:
- m_bits = 8;
- m_size = 0x40000;
- m_maker_id = MFG_AMD;
- m_device_id = 0x3b;
- break;
- case FLASH_CAT28F020:
- m_bits = 8;
- m_size = 0x40000;
- m_maker_id = MFG_CATALYST;
- m_device_id = 0xbd;
- break;
- case FLASH_INTEL_28F320J3D:
- m_bits = 16;
- m_size = 0x400000;
- m_maker_id = MFG_INTEL;
- m_device_id = 0x16;
- m_sector_is_4k = true;
- break;
- case FLASH_SPANSION_S29GL064S: // senbbs
- m_bits = 16;
- m_size = 0x800000;
- m_maker_id = MFG_SPANSION;
- m_device_id = 0x227e;
- m_sector_is_4k = false;
- break;
- case FLASH_INTEL_28F320J5: // funkball
- m_bits = 16;
- m_size = 0x400000;
- m_maker_id = MFG_INTEL;
- m_device_id = 0x14;
-// m_sector_is_4k = true; 128kb?
- break;
- case FLASH_SST_39SF040:
- m_bits = 8;
- m_size = 0x80000;
- m_maker_id = MFG_SST;
- m_device_id = 0xb7;
- m_sector_is_4k = true;
- break;
- case FLASH_SST_39VF020:
- m_bits = 8;
- m_size = 0x40000;
- m_maker_id = MFG_SST;
- m_device_id = 0xd6;
- m_sector_is_4k = true;
- break;
- case FLASH_SST_49LF020:
- m_bits = 8;
- m_size = 0x40000;
- m_maker_id = MFG_SST;
- m_device_id = 0x61;
- m_sector_is_4k = true;
- break;
- case FLASH_SST_39VF400A:
- m_bits = 16;
- m_size = 0x80000;
- m_maker_id = MFG_SST;
- m_device_id = 0xd6;
- m_sector_is_4k = true;
- break;
- case FLASH_SHARP_LH28F400:
- m_bits = 16;
- m_size = 0x80000;
- m_maker_id = MFG_SHARP;
- m_device_id = 0xed;
- break;
- case FLASH_INTEL_E28F400B:
- m_bits = 16;
- m_size = 0x80000;
- m_maker_id = MFG_INTEL;
- m_device_id = 0x4471;
- break;
- case FLASH_FUJITSU_29F160TE:
- m_bits = 8;
- m_size = 0x200000;
- m_maker_id = MFG_FUJITSU;
- m_device_id = 0xd2;
- m_top_boot_sector = true;
- break;
- case FLASH_FUJITSU_29F016A:
- m_bits = 8;
- m_size = 0x200000;
- m_maker_id = MFG_FUJITSU;
- m_device_id = 0xad;
- break;
- case FLASH_FUJITSU_29DL164BD:
- m_bits = 8;
- m_size = 0x200000;
- m_maker_id = MFG_FUJITSU;
- m_device_id = 0x35;
- break;
- case FLASH_FUJITSU_29LV002TC:
- m_bits = 8;
- m_size = 0x40000;
- m_maker_id = MFG_FUJITSU;
- m_device_id = 0x40;
- break;
- case FLASH_FUJITSU_29LV800B:
- m_bits = 16;
- m_size = 0x100000;
- m_maker_id = MFG_FUJITSU;
- m_device_id = 0x225b;
- m_bot_boot_sector = true;
- break;
- case FLASH_INTEL_E28F008SA:
- m_bits = 8;
- m_size = 0x100000;
- m_maker_id = MFG_INTEL;
- m_device_id = 0xa2;
- break;
- case FLASH_INTEL_TE28F160:
- case FLASH_SHARP_LH28F160S3:
- m_bits = 16;
- m_size = 0x200000;
- m_maker_id = MFG_SHARP;
- m_device_id = 0xd0;
- break;
- case FLASH_INTEL_TE28F320:
- m_bits = 16;
- m_size = 0x400000;
- m_maker_id = MFG_INTEL;
- m_device_id = 0x8896;
- break;
- case FLASH_SHARP_LH28F320BF:
- m_bits = 16;
- m_size = 0x400000;
- m_maker_id = MFG_SHARP;
- m_device_id = 0xb5;
- break;
- case FLASH_MACRONIX_29L001MC:
- m_bits = 8;
- m_size = 0x20000;
- m_maker_id = MFG_MACRONIX;
- m_device_id = 0x51;
- break;
- case FLASH_MACRONIX_29LV160TMC:
- m_bits = 8;
- m_size = 0x20000;
- m_maker_id = MFG_MACRONIX;
- m_device_id = 0x49;
- m_sector_is_16k = true;
- break;
- case FLASH_PANASONIC_MN63F805MNP:
- m_bits = 8;
- m_size = 0x10000;
- m_maker_id = MFG_PANASONIC;
- m_device_id = 0x1b;
- m_sector_is_4k = true;
- break;
- case FLASH_SANYO_LE26FV10N1TS:
- m_bits = 8;
- m_size = 0x20000;
- m_maker_id = MFG_SANYO;
- m_device_id = 0x13;
- m_sector_is_4k = true;
- break;
- case FLASH_SST_28SF040:
- m_bits = 8;
- m_size = 0x80000;
- m_maker_id = MFG_SST;
- m_device_id = 0x04;
- break;
- case FLASH_TMS_29F040:
- m_bits = 8;
- m_addrmask = 0x7fff;
- m_size = 0x80000;
- m_maker_id = MFG_AMD;
- m_device_id = 0xa4;
- break;
- }
-
- int addrbits;
- for (addrbits = 24; addrbits > 0; addrbits--)
- if ((m_size & (1 << addrbits)) != 0)
- break;
+ assert(bits == 8 || bits == 16);
+ assert(size != 0);
}
-intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant)
- : intelfsh_device(mconfig, type, tag, owner, clock, variant) { }
+intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t size, uint8_t maker_id, uint16_t device_id)
+ : intelfsh_device(mconfig, type, tag, owner, clock, 8, size, maker_id, device_id) { }
-intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant)
- : intelfsh_device(mconfig, type, tag, owner, clock, variant) { }
+intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t size, uint8_t maker_id, uint16_t device_id)
+ : intelfsh_device(mconfig, type, tag, owner, clock, 16, size, maker_id, device_id) { }
intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, INTEL_28F016S5, tag, owner, clock, FLASH_INTEL_28F016S5) { }
+ : intelfsh8_device(mconfig, INTEL_28F016S5, tag, owner, clock, 0x200000, MFG_INTEL, 0xaa) { }
fujitsu_29f160te_device::fujitsu_29f160te_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, FUJITSU_29F160TE, tag, owner, clock, FLASH_FUJITSU_29F160TE) { }
+ : intelfsh8_device(mconfig, FUJITSU_29F160TE, tag, owner, clock, 0x200000, MFG_FUJITSU, 0xd2) { m_top_boot_sector = true; }
+
+fujitsu_29f160te_16bit_device::fujitsu_29f160te_16bit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : intelfsh16_device(mconfig, FUJITSU_29F160TE_16BIT, tag, owner, clock, 0x200000, MFG_FUJITSU, 0xd2) { m_top_boot_sector = true; m_sector_is_4k = true; }
fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, FUJITSU_29F016A, tag, owner, clock, FLASH_FUJITSU_29F016A) { }
+ : intelfsh8_device(mconfig, FUJITSU_29F016A, tag, owner, clock, 0x200000, MFG_FUJITSU, 0xad) { }
fujitsu_29dl164bd_device::fujitsu_29dl164bd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, FUJITSU_29DL164BD, tag, owner, clock, FLASH_FUJITSU_29DL164BD) { }
+ : intelfsh8_device(mconfig, FUJITSU_29DL164BD, tag, owner, clock, 0x200000, MFG_FUJITSU, 0x35) { }
fujitsu_29lv002tc_device::fujitsu_29lv002tc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, FUJITSU_29LV002TC, tag, owner, clock, FLASH_FUJITSU_29LV002TC) { }
+ : intelfsh8_device(mconfig, FUJITSU_29LV002TC, tag, owner, clock, 0x40000, MFG_FUJITSU, 0x40) { }
fujitsu_29lv800b_device::fujitsu_29lv800b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, FUJITSU_29LV800B, tag, owner, clock, FLASH_FUJITSU_29LV800B) { }
+ : intelfsh16_device(mconfig, FUJITSU_29LV800B, tag, owner, clock, 0x100000, MFG_FUJITSU, 0x225b) { m_bot_boot_sector = true; }
sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, SHARP_LH28F016S, tag, owner, clock, FLASH_SHARP_LH28F016S) { }
+ : intelfsh8_device(mconfig, SHARP_LH28F016S, tag, owner, clock, 0x200000, MFG_INTEL, 0xaa) { }
sharp_lh28f016s_16bit_device::sharp_lh28f016s_16bit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, SHARP_LH28F016S_16BIT, tag, owner, clock, FLASH_SHARP_LH28F016S_16BIT) { }
+ : intelfsh16_device(mconfig, SHARP_LH28F016S_16BIT, tag, owner, clock, 0x200000, MFG_INTEL, 0xaa) { }
atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, ATMEL_29C010, tag, owner, clock, FLASH_ATMEL_29C010) { }
+ : intelfsh8_device(mconfig, ATMEL_29C010, tag, owner, clock, 0x20000, MFG_ATMEL, 0xd5) { m_page_size = 0x80; }
atmel_49f4096_device::atmel_49f4096_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, ATMEL_49F4096, tag, owner, clock, FLASH_ATMEL_49F4096) { }
+ : intelfsh16_device(mconfig, ATMEL_49F4096, tag, owner, clock, 0x80000, MFG_ATMEL, 0x92) { m_sector_is_16k = true; }
amd_29f010_device::amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, AMD_29F010, tag, owner, clock, FLASH_AMD_29F010) { }
+ : intelfsh8_device(mconfig, AMD_29F010, tag, owner, clock, 0x20000, MFG_AMD, 0x20) { }
amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, AMD_29F040, tag, owner, clock, FLASH_AMD_29F040) { }
+ : intelfsh8_device(mconfig, AMD_29F040, tag, owner, clock, 0x80000, MFG_AMD, 0xa4) { }
amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, AMD_29F080, tag, owner, clock, FLASH_AMD_29F080) { }
+ : intelfsh8_device(mconfig, AMD_29F080, tag, owner, clock, 0x100000, MFG_AMD, 0xd5) { m_addrmask = 0x7ff; }
amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, AMD_29F400T, tag, owner, clock, FLASH_AMD_29F400T) { }
+ : intelfsh8_device(mconfig, AMD_29F400T, tag, owner, clock, 0x80000, MFG_AMD, 0x23) { m_top_boot_sector = true; }
amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, AMD_29F800T, tag, owner, clock, FLASH_AMD_29F800T) { }
+ : intelfsh8_device(mconfig, AMD_29F800T, tag, owner, clock, 0x100000, MFG_AMD, 0xda) { m_top_boot_sector = true; }
amd_29f800b_16bit_device::amd_29f800b_16bit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, AMD_29F800B_16BIT, tag, owner, clock, FLASH_AMD_29F800B_16BIT) { }
+ : intelfsh16_device(mconfig, AMD_29F800B_16BIT, tag, owner, clock, 0x100000, MFG_AMD, 0x2258) { m_top_boot_sector = false; }
amd_29lv200t_device::amd_29lv200t_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, AMD_29LV200T, tag, owner, clock, FLASH_AMD_29LV200T) { }
+ : intelfsh8_device(mconfig, AMD_29LV200T, tag, owner, clock, 0x40000, MFG_AMD, 0x3b) { }
cat28f020_device::cat28f020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, CAT28F020, tag, owner, clock, FLASH_CAT28F020) { }
+ : intelfsh8_device(mconfig, CAT28F020, tag, owner, clock, 0x40000, MFG_CATALYST, 0xbd) { }
intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, INTEL_E28F008SA, tag, owner, clock, FLASH_INTEL_E28F008SA) { }
+ : intelfsh8_device(mconfig, INTEL_E28F008SA, tag, owner, clock, 0x100000, MFG_INTEL, 0xa2) { }
+
+macronix_29f008tc_device::macronix_29f008tc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : intelfsh8_device(mconfig, MACRONIX_29F008TC, tag, owner, clock, 0x100000, MFG_MACRONIX, 0x81) { m_sector_is_4k = true; }
+
+macronix_29f1610mc_device::macronix_29f1610mc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : intelfsh8_device(mconfig, MACRONIX_29F1610MC, tag, owner, clock, 0x200000, MFG_MACRONIX, 0xfa) { }
+
+macronix_29f1610mc_16bit_device::macronix_29f1610mc_16bit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : intelfsh16_device(mconfig, MACRONIX_29F1610MC_16BIT, tag, owner, clock, 0x100000, MFG_MACRONIX, 0xfa) { }
macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, MACRONIX_29L001MC, tag, owner, clock, FLASH_MACRONIX_29L001MC) { }
+ : intelfsh8_device(mconfig, MACRONIX_29L001MC, tag, owner, clock, 0x20000, MFG_MACRONIX, 0x51) { }
macronix_29lv160tmc_device::macronix_29lv160tmc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, MACRONIX_29LV160TMC, tag, owner, clock, FLASH_MACRONIX_29LV160TMC) { }
+ : intelfsh8_device(mconfig, MACRONIX_29LV160TMC, tag, owner, clock, 0x20000, MFG_MACRONIX, 0x49) { m_sector_is_16k = true; }
panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, PANASONIC_MN63F805MNP, tag, owner, clock, FLASH_PANASONIC_MN63F805MNP) { }
+ : intelfsh8_device(mconfig, PANASONIC_MN63F805MNP, tag, owner, clock, 0x10000, MFG_PANASONIC, 0x1b) { m_sector_is_4k = true; }
sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, SANYO_LE26FV10N1TS, tag, owner, clock, FLASH_SANYO_LE26FV10N1TS) { }
+ : intelfsh8_device(mconfig, SANYO_LE26FV10N1TS, tag, owner, clock, 0x20000, MFG_SANYO, 0x13) { m_sector_is_4k = true; }
sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, SST_28SF040, tag, owner, clock, FLASH_SST_28SF040) { }
+ : intelfsh8_device(mconfig, SST_28SF040, tag, owner, clock, 0x80000, MFG_SST, 0x04) { }
sst_39sf040_device::sst_39sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, SST_39SF040, tag, owner, clock, FLASH_SST_39SF040) { }
+ : intelfsh8_device(mconfig, SST_39SF040, tag, owner, clock, 0x80000, MFG_SST, 0xb7) { m_addrmask = 0x7fff; }
sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, SST_39VF020, tag, owner, clock, FLASH_SST_39VF020) { }
+ : intelfsh8_device(mconfig, SST_39VF020, tag, owner, clock, 0x40000, MFG_SST, 0xd6) { m_sector_is_4k = true; }
sst_49lf020_device::sst_49lf020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, SST_49LF020, tag, owner, clock, FLASH_SST_49LF020) { }
+ : intelfsh8_device(mconfig, SST_49LF020, tag, owner, clock, 0x40000, MFG_SST, 0x61) { m_sector_is_4k = true; }
sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, SHARP_LH28F400, tag, owner, clock, FLASH_SHARP_LH28F400) { }
+ : intelfsh16_device(mconfig, SHARP_LH28F400, tag, owner, clock, 0x80000, MFG_SHARP, 0xed) { }
intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, INTEL_TE28F160, tag, owner, clock, FLASH_INTEL_TE28F160) { }
+ : intelfsh16_device(mconfig, INTEL_TE28F160, tag, owner, clock, 0x200000, MFG_SHARP, 0xd0) { }
sharp_lh28f160s3_device::sharp_lh28f160s3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, SHARP_LH28F160S3, tag, owner, clock, FLASH_SHARP_LH28F160S3) { }
+ : intelfsh16_device(mconfig, SHARP_LH28F160S3, tag, owner, clock, 0x200000, MFG_SHARP, 0xd0) { }
intel_te28f320_device::intel_te28f320_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, INTEL_TE28F320, tag, owner, clock, FLASH_INTEL_TE28F320) { }
+ : intelfsh16_device(mconfig, INTEL_TE28F320, tag, owner, clock, 0x400000, MFG_INTEL, 0x8896) { }
spansion_s29gl064s_device::spansion_s29gl064s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, SPANSION_S29GL064S, tag, owner, clock, FLASH_SPANSION_S29GL064S) { }
+ : intelfsh16_device(mconfig, SPANSION_S29GL064S, tag, owner, clock, 0x800000, MFG_SPANSION, 0x227e)
+{
+ // senbbs
+ m_sector_is_4k = false;
+}
intel_e28f400b_device::intel_e28f400b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, INTEL_E28F400B, tag, owner, clock, FLASH_INTEL_E28F400B) { }
+ : intelfsh16_device(mconfig, INTEL_E28F400B, tag, owner, clock, 0x80000, MFG_INTEL, 0x4471) { }
sharp_lh28f320bf_device::sharp_lh28f320bf_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, SHARP_LH28F320BF, tag, owner, clock, FLASH_SHARP_LH28F320BF) { }
+ : intelfsh16_device(mconfig, SHARP_LH28F320BF, tag, owner, clock, 0x400000, MFG_SHARP, 0xb5) { }
intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, INTEL_28F320J3D, tag, owner, clock, FLASH_INTEL_28F320J3D) { }
+ : intelfsh16_device(mconfig, INTEL_28F320J3D, tag, owner, clock, 0x400000, MFG_INTEL, 0x16) { m_sector_is_4k = true; }
intel_28f320j5_device::intel_28f320j5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, INTEL_28F320J5, tag, owner, clock, FLASH_INTEL_28F320J5) { }
+ : intelfsh16_device(mconfig, INTEL_28F320J5, tag, owner, clock, 0x400000, MFG_INTEL, 0x14)
+{
+ // funkball
+// m_sector_is_4k = true; 128kb?
+}
+intel_28f640j5_device::intel_28f640j5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : intelfsh16_device(mconfig, INTEL_28F640J5, tag, owner, clock, 0x800000, MFG_INTEL, 0x15) { }
sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh16_device(mconfig, SST_39VF400A, tag, owner, clock, FLASH_SST_39VF400A) { }
+ : intelfsh16_device(mconfig, SST_39VF400A, tag, owner, clock, 0x80000, MFG_SST, 0xd6) { m_sector_is_4k = true; }
tms_29f040_device::tms_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : intelfsh8_device(mconfig, TMS_29F040, tag, owner, clock, FLASH_TMS_29F040) { }
+ : intelfsh8_device(mconfig, TMS_29F040, tag, owner, clock, 0x80000, MFG_AMD, 0xa4) { m_addrmask = 0x7fff; }
+
+tc58fvt800_device::tc58fvt800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : intelfsh16_device(mconfig, TC58FVT800, tag, owner, clock, 0x100000, MFG_TOSHIBA, 0x4f) { m_top_boot_sector = true; }
//-------------------------------------------------
// device_start - device-specific startup
@@ -530,20 +323,30 @@ tms_29f040_device::tms_29f040_device(const machine_config &mconfig, const char *
void intelfsh_device::device_start()
{
m_data = std::make_unique<uint8_t []>(m_size);
- m_timer = timer_alloc();
+ m_timer = timer_alloc(FUNC(intelfsh_device::delay_tick), this);
save_item( NAME(m_status) );
save_item( NAME(m_flash_mode) );
save_item( NAME(m_flash_master_lock) );
+ save_item( NAME(m_fast_mode) );
save_pointer( &m_data[0], "m_data", m_size);
}
+//-------------------------------------------------
+// is_ready - emulates the *Busy/Ready pin on some
+// flash devices.
+//-------------------------------------------------
+
+bool intelfsh_device::is_ready()
+{
+ return (m_status & 0x80) ? true : false;
+}
//-------------------------------------------------
-// device_timer - handler timer events
+// delay_tick - handle delayed commands/events
//-------------------------------------------------
-void intelfsh_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+TIMER_CALLBACK_MEMBER(intelfsh_device::delay_tick)
{
switch( m_flash_mode )
{
@@ -553,6 +356,7 @@ void intelfsh_device::device_timer(emu_timer &timer, device_timer_id id, int par
case FM_ERASEAMD4:
m_flash_mode = FM_NORMAL;
+ m_status = 0x80;
break;
}
}
@@ -598,9 +402,10 @@ void intelfsh_device::nvram_default()
// .nv file
//-------------------------------------------------
-void intelfsh_device::nvram_read(emu_file &file)
+bool intelfsh_device::nvram_read(util::read_stream &file)
{
- file.read(&m_data[0], m_size);
+ auto const [err, actual] = read(file, &m_data[0], m_size);
+ return !err && (actual == m_size);
}
@@ -609,9 +414,10 @@ void intelfsh_device::nvram_read(emu_file &file)
// .nv file
//-------------------------------------------------
-void intelfsh_device::nvram_write(emu_file &file)
+bool intelfsh_device::nvram_write(util::write_stream &file)
{
- file.write(&m_data[0], m_size);
+ auto const [err, actual] = write(file, &m_data[0], m_size);
+ return !err;
}
@@ -639,8 +445,12 @@ uint32_t intelfsh_device::read_full(uint32_t address)
}
break;
case FM_READSTATUS:
+ case FM_WRITEBUFFER2:
data = m_status;
break;
+ case FM_WRITEBUFFER1:
+ data = 0x80; // extended status register for write buffer flag
+ break;
case FM_READAMDID3:
if ((m_maker_id == MFG_FUJITSU && m_device_id == 0x35) || (m_maker_id == MFG_AMD && m_device_id == 0x3b))
{
@@ -753,15 +563,18 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
case 0xff: // reset chip mode
m_flash_mode = FM_NORMAL;
break;
- case 0x90: // read ID
- m_flash_mode = FM_READID;
+ case 0x90:
+ if ( m_fast_mode && m_maker_id == MFG_FUJITSU ) // reset from fast mode (when fast mode is enabled)
+ m_flash_mode = FM_FAST_RESET;
+ else // read ID
+ m_flash_mode = FM_READID;
break;
case 0x40:
case 0x10: // program
m_flash_mode = FM_WRITEPART1;
break;
case 0x50: // clear status reg
- if ((m_type == FLASH_SST_49LF020) && (m_flash_mode == FM_NORMAL))
+ if ((m_maker_id == MFG_SST && m_device_id == 0x61) && (m_flash_mode == FM_NORMAL))
logerror("Invalid flash mode byte %x\n", data & 0xff);
else
{
@@ -770,7 +583,7 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
}
break;
case 0x20: // block erase
- if (m_type == FLASH_SST_49LF020)
+ if (m_maker_id == MFG_SST && m_device_id == 0x61)
logerror("Unknown flash mode byte %x\n", data & 0xff);
else
m_flash_mode = FM_CLEARPART1;
@@ -781,6 +594,12 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
case 0x70: // read status
m_flash_mode = FM_READSTATUS;
break;
+ case 0xa0: // fast program (fast mode must be enabled)
+ if ( m_fast_mode && m_maker_id == MFG_FUJITSU )
+ m_flash_mode = FM_BYTEPROGRAM;
+ else
+ logerror( "%s: Unknown flash mode byte %x\n", machine().describe_context(), data & 0xff );
+ break;
case 0xaa: // AMD ID select part 1
if( ( address & 0xfff ) == 0x555 )
{
@@ -791,8 +610,15 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
m_flash_mode = FM_READAMDID1;
}
break;
+ case 0xe8:
+ // Write to buffer (Intel StrataFlash series)
+ if ( m_maker_id == MFG_INTEL && m_device_id >= 0x14 && m_device_id <= 0x16 )
+ m_flash_mode = FM_WRITEBUFFER1;
+ else
+ logerror( "%s: Unknown flash mode byte %x\n", machine().describe_context(), data & 0xff );
+ break;
default:
- logerror( "Unknown flash mode byte %x\n", data & 0xff );
+ logerror( "%s: Unknown flash mode byte %x\n", machine().describe_context(), data & 0xff );
break;
}
break;
@@ -851,7 +677,7 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
}
else if( ( address & 0xffff ) == 0x5555 && ( data & 0xff ) == 0xa0 )
{
- if (m_type == FLASH_ATMEL_29C010)
+ if (m_maker_id == MFG_ATMEL && m_device_id == 0xd5)
{
m_flash_mode = FM_WRITEPAGEATMEL;
m_byte_count = 0;
@@ -899,6 +725,12 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
{
m_flash_mode = FM_NORMAL;
}
+ // Fast mode
+ else if( ( ( address & 0xfff ) == 0xaaa || ( address & 0xfff ) == 0x555 ) && ( data & 0xff ) == 0x20 )
+ {
+ m_flash_mode = FM_NORMAL;
+ m_fast_mode = true;
+ }
else
{
logerror( "unexpected %08x=%02x in FM_READAMDID2\n", address, data & 0xff );
@@ -1095,7 +927,7 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
break;
}
m_status = 0x80;
- if (m_type == FLASH_SST_28SF040)
+ if (m_maker_id == MFG_SST && m_device_id == 0x04)
m_flash_mode = FM_NORMAL;
else
m_flash_mode = FM_READSTATUS;
@@ -1125,7 +957,7 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
case FM_CLEARPART1:
if( ( data & 0xff ) == 0xd0 )
{
- if (m_type == FLASH_SST_28SF040)
+ if (m_maker_id == MFG_SST && m_device_id == 0x04)
{
// clear the 256 bytes block containing the current address to all 0xffs
uint32_t base = address * ((m_bits == 16) ? 2 : 1);
@@ -1133,7 +965,7 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
m_timer->adjust( attotime::from_msec( 4 ) );
}
- else if (m_type == FLASH_INTEL_E28F400B)
+ else if (m_maker_id == MFG_INTEL && m_device_id == 0x4471)
{
// 00000-03fff - 16KB boot block (may be write protected via external pins)
// 04000-05fff - 8KB parameter block
@@ -1206,11 +1038,79 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data)
logerror( "unexpected %08x=%02x in FM_SETMASTER:\n", address, data & 0xff );
break;
}
- m_flash_mode = FM_NORMAL;
+ m_flash_mode = FM_READSTATUS;
+ break;
+ case FM_WRITEBUFFER1:
+ // Datasheets don't specify what happens when the word count is outside of
+ // the valid range so clamp and pray
+ if ( m_bits == 16 )
+ m_write_buffer_count = std::min<uint32_t>(data, 0xf) + 1;
+ else
+ m_write_buffer_count = std::min<uint32_t>(data, 0x1f) + 1;
+
+ m_status = 0x80;
+ m_flash_mode = FM_WRITEBUFFER2;
+ m_byte_count = 0;
+ break;
+ case FM_WRITEBUFFER2:
+ {
+ if ( m_byte_count < m_write_buffer_count )
+ {
+ if ( m_byte_count == 0 )
+ m_write_buffer_start_address = address;
+
+ if ( address >= m_write_buffer_start_address + m_write_buffer_count )
+ {
+ // All subsequent addresses must lie within the start address plus the count
+ // Set error bits and abort
+ m_status = (1 << 4) | (1 << 5);
+ m_flash_mode = FM_READSTATUS;
+ }
+ else
+ {
+ if ( m_bits == 8 )
+ {
+ m_write_buffer[m_byte_count] = data;
+ }
+ else
+ {
+ m_write_buffer[m_byte_count * 2] = data >> 8;
+ m_write_buffer[m_byte_count * 2 + 1] = data;
+ }
+
+ m_byte_count++;
+ }
+ }
+ else
+ {
+ if ( ( data & 0xff ) == 0xd0 )
+ {
+ // Confirmation byte received, commit buffered data
+ uint32_t base = m_write_buffer_start_address * ((m_bits == 16) ? 2 : 1);
+ uint32_t len = m_write_buffer_count * ((m_bits == 16) ? 2 : 1);
+ memcpy(&m_data[base], m_write_buffer, len);
+ m_status = 0x80;
+ }
+ else
+ {
+ // Invalid Command/Sequence, set error bits and abort
+ m_status = (1 << 4) | (1 << 5);
+ }
+
+ m_flash_mode = FM_READSTATUS;
+ }
+ }
break;
case FM_BANKSELECT:
m_bank = data & 0xff;
m_flash_mode = FM_NORMAL;
break;
+ case FM_FAST_RESET:
+ if ( ( data & 0xff ) == 0xf0 || ( data & 0xff ) == 0 ) {
+ m_fast_mode = false;
+ m_flash_mode = FM_NORMAL;
+ } else
+ logerror( "unexpected %08x=%02x in FM_FAST_RESET:\n", address, data & 0xff );
+ break;
}
}