diff options
Diffstat (limited to 'src/devices/machine/pla.cpp')
-rw-r--r-- | src/devices/machine/pla.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/devices/machine/pla.cpp b/src/devices/machine/pla.cpp index 463ccc334cc..44db6a4ed10 100644 --- a/src/devices/machine/pla.cpp +++ b/src/devices/machine/pla.cpp @@ -12,12 +12,10 @@ #include "plaparse.h" #define LOG_TERMS (1 << 0U) - //#define VERBOSE (LOG_TERMS) -//#define LOG_OUTPUT_STREAM std::cout - #include "logmacro.h" + DEFINE_DEVICE_TYPE(PLA, pla_device, "pla", "PLA") DEFINE_DEVICE_TYPE(PLS100, pls100_device, "pls100", "82S100-series PLA") DEFINE_DEVICE_TYPE(MOS8721, mos8721_device, "mos8721", "MOS 8721 PLA") @@ -125,8 +123,6 @@ void pla_device::parse_fusemap() return; } - LOGMASKED(LOG_TERMS, "PLA read and parsed, %d fuses in %s format\n", jed.numfuses, jed.binfmt == MAXLOADER ? "Maxloader" : "DataIO" ); - // parse it uint32_t fusenum = 0; @@ -139,21 +135,11 @@ void pla_device::parse_fusemap() for (int i = 0; i < m_inputs; i++) { - if (jed.binfmt == MAXLOADER) - { - term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << (i + 32); // complement - term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << i; // true - } - else if (jed.binfmt == DATAIO) - { - term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << i; // true - term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << (i + 32); // complement - } - else - { - logerror("PLA parser: Unknown JED format\n"); - break; - } + // complement + term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << (i + 32); + + // true + term->and_mask |= (uint64_t)jed_get_fuse(&jed, fusenum++) << i; } // OR mask |