From 0f107fde029bee98ca8d8a78a7035a86671d4760 Mon Sep 17 00:00:00 2001 From: arbee Date: Sat, 18 Aug 2018 16:57:29 -0400 Subject: [PATCH] tms57002: clean up git merge weirdness (nw) --- src/devices/cpu/tms57002/tms57002.cpp | 28 --------------------------- 1 file changed, 28 deletions(-) diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp index 1a50ad894a4..25e48a19322 100644 --- a/src/devices/cpu/tms57002/tms57002.cpp +++ b/src/devices/cpu/tms57002/tms57002.cpp @@ -656,34 +656,6 @@ uint32_t tms57002_device::get_cmem(uint8_t addr) } } -uint32_t tms57002_device::get_cmem(uint8_t addr) -{ - if(sa == addr && update_counter_head != update_counter_tail) - sti |= S_UPDATE; - - if(sti & S_UPDATE) - { - cmem[addr] = update[update_counter_tail]; - update_counter_tail = (update_counter_tail + 1) & 0x0f; - update_empty(); - - if(update_counter_head == update_counter_tail) - sti &= ~S_UPDATE; - - return cmem[addr]; // The value of crm is ignored during an update. - } - else - { - int crm = (st1 & ST1_CRM) >> ST1_CRM_SHIFT; - uint32_t cvar = cmem[addr]; - if(crm == 1) - return (cvar & 0xffff0000); - else if(crm == 2) - return (cvar << 16); - return cvar; - } -} - void tms57002_device::cache_flush() { int i;