summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2017-02-11 05:01:03 +0100
committer hap <happppp@users.noreply.github.com>2017-02-11 05:01:03 +0100
commitbc695d75da77abc29f2b404e0dfb8afbb3fea2ca (patch)
treed32fa1e8e8deebe08659d27d91c677572be33cd4 /src
parent56a8b5a73b1ee5782014d233fc7efe6d3108cfb5 (diff)
pic16: added pic1655 (nw)
Diffstat (limited to 'src')
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.cpp63
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.h10
-rw-r--r--src/mame/drivers/hh_pic16.cpp3
3 files changed, 54 insertions, 22 deletions
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp
index 7216261501e..d07ef796190 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.cpp
+++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp
@@ -75,6 +75,7 @@
const device_type PIC16C54 = &device_creator<pic16c54_device>;
const device_type PIC16C55 = &device_creator<pic16c55_device>;
+const device_type PIC1655 = &device_creator<pic1655_device>;
const device_type PIC16C56 = &device_creator<pic16c56_device>;
const device_type PIC16C57 = &device_creator<pic16c57_device>;
const device_type PIC16C58 = &device_creator<pic16c58_device>;
@@ -143,6 +144,11 @@ pic16c55_device::pic16c55_device(const machine_config &mconfig, const char *tag,
{
}
+pic1655_device::pic1655_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : pic16c5x_device(mconfig, PIC1655, "PIC1655", tag, owner, clock, "pic1655", 9, 5, 0x1655)
+{
+}
+
pic16c56_device::pic16c56_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pic16c5x_device(mconfig, PIC16C56, "PIC16C56", tag, owner, clock, "pic16c56", 10, 5, 0x16C56)
{
@@ -322,7 +328,7 @@ void pic16c5x_device::PUSH_STACK(uint16_t data)
uint8_t pic16c5x_device::GET_REGFILE(offs_t addr) /* Read from internal memory */
{
- uint8_t data;
+ uint8_t data = 0;
if (addr == 0) { /* Indirect addressing */
addr = (FSR & m_picRAMmask);
@@ -341,21 +347,31 @@ uint8_t pic16c5x_device::GET_REGFILE(offs_t addr) /* Read from internal memory *
break;
case 4: data = (FSR | (uint8_t)(~m_picRAMmask));
break;
- case 5: data = m_read_a(PIC16C5x_PORTA, 0xff);
- data &= m_TRISA;
- data |= ((uint8_t)(~m_TRISA) & PORTA);
- data &= 0x0f; /* 4-bit port (only lower 4 bits used) */
+ case 5: if (m_picmodel == 0x1655) {
+ data = m_read_a(PIC16C5x_PORTA, 0xff) & 0x0f;
+ }
+ else {
+ data = m_read_a(PIC16C5x_PORTA, 0xff);
+ data &= m_TRISA;
+ data |= ((uint8_t)(~m_TRISA) & PORTA);
+ data &= 0x0f; /* 4-bit port (only lower 4 bits used) */
+ }
break;
- case 6: data = m_read_b(PIC16C5x_PORTB, 0xff);
- data &= m_TRISB;
- data |= ((uint8_t)(~m_TRISB) & PORTB);
+ case 6: if (m_picmodel != 0x1655) { /* B is output-only on 1655 */
+ data = m_read_b(PIC16C5x_PORTB, 0xff);
+ data &= m_TRISB;
+ data |= ((uint8_t)(~m_TRISB) & PORTB);
+ }
break;
- case 7: if ((m_picmodel == 0x16C55) || (m_picmodel == 0x16C57)) {
+ case 7: if (m_picmodel == 0x1655) {
+ data = m_read_c(PIC16C5x_PORTC, 0xff) & PORTC;
+ }
+ else if ((m_picmodel == 0x16C55) || (m_picmodel == 0x16C57)) {
data = m_read_c(PIC16C5x_PORTC, 0xff);
data &= m_TRISC;
data |= ((uint8_t)(~m_TRISC) & PORTC);
}
- else { /* PIC16C54, PIC16C56, PIC16C58 */
+ else { /* PIC16C54, PIC16C56, PIC16C58 */
data = M_RDRAM(addr);
}
break;
@@ -381,8 +397,8 @@ void pic16c5x_device::STORE_REGFILE(offs_t addr, uint8_t data) /* Write to in
{
case 0: /* Not an actual register, nothing to save */
break;
- case 1: m_delay_timer = 2; /* Timer starts after next two instructions */
- if (PSA == 0) m_prescaler = 0; /* Must clear the Prescaler */
+ case 1: m_delay_timer = 2; /* Timer starts after next two instructions */
+ if (PSA == 0) m_prescaler = 0; /* Must clear the Prescaler */
TMR0 = data;
break;
case 2: PCL = data;
@@ -392,18 +408,27 @@ void pic16c5x_device::STORE_REGFILE(offs_t addr, uint8_t data) /* Write to in
break;
case 4: FSR = (data | (uint8_t)(~m_picRAMmask));
break;
- case 5: data &= 0x0f; /* 4-bit port (only lower 4 bits used) */
- m_write_a(PIC16C5x_PORTA, data & (uint8_t)(~m_TRISA), 0xff);
- PORTA = data;
+ case 5: if (m_picmodel != 0x1655) { /* A is input-only on 1655 */
+ data &= 0x0f; /* 4-bit port (only lower 4 bits used) */
+ m_write_a(PIC16C5x_PORTA, data & (uint8_t)(~m_TRISA), 0xff);
+ PORTA = data;
+ }
break;
- case 6: m_write_b(PIC16C5x_PORTB, data & (uint8_t)(~m_TRISB), 0xff);
+ case 6: if (m_picmodel == 0x1655)
+ m_write_b(PIC16C5x_PORTB, data, 0xff);
+ else
+ m_write_b(PIC16C5x_PORTB, data & (uint8_t)(~m_TRISB), 0xff);
PORTB = data;
break;
- case 7: if ((m_picmodel == 0x16C55) || (m_picmodel == 0x16C57)) {
+ case 7: if (m_picmodel == 0x1655) {
+ m_write_c(PIC16C5x_PORTC, data, 0xff);
+ PORTC = data;
+ }
+ else if ((m_picmodel == 0x16C55) || (m_picmodel == 0x16C57)) {
m_write_c(PIC16C5x_PORTC, data & (uint8_t)(~m_TRISC), 0xff);
PORTC = data;
}
- else { /* PIC16C54, PIC16C56, PIC16C58 */
+ else { /* PIC16C54, PIC16C56, PIC16C58 */
M_WRTRAM(addr, data);
}
break;
@@ -1089,7 +1114,7 @@ void pic16c5x_device::execute_run()
m_PC++;
PCL++;
- if ((m_opcode.w.l & 0xff0) != 0x000) { /* Do all opcodes except the 00? ones */
+ if (m_picmodel == 0x1655 || (m_opcode.w.l & 0xff0) != 0x000) { /* Do all opcodes except the 00? ones */
m_inst_cycles = s_opcode_main[((m_opcode.w.l >> 4) & 0xff)].cycles;
(this->*s_opcode_main[((m_opcode.w.l >> 4) & 0xff)].function)();
}
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.h b/src/devices/cpu/pic16c5x/pic16c5x.h
index 4688e301ae4..e7b8c3f7387 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.h
+++ b/src/devices/cpu/pic16c5x/pic16c5x.h
@@ -56,6 +56,7 @@ enum
extern const device_type PIC16C54;
extern const device_type PIC16C55;
+extern const device_type PIC1655;
extern const device_type PIC16C56;
extern const device_type PIC16C57;
extern const device_type PIC16C58;
@@ -230,7 +231,6 @@ private:
void pic16c5x_soft_reset();
void pic16c5x_update_watchdog(int counts);
void pic16c5x_update_timer(int counts);
-
};
@@ -250,6 +250,14 @@ public:
};
+class pic1655_device : public pic16c5x_device
+{
+public:
+ // construction/destruction
+ pic1655_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+};
+
+
class pic16c56_device : public pic16c5x_device
{
public:
diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index 8d50186f349..785f95e465c 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -263,11 +263,10 @@ static const s16 maniac_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
static MACHINE_CONFIG_START( maniac, maniac_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC16C55, 850000) // RC osc. R=13.4K, C=470pf, but unknown RC curve - measured 800-890kHz
+ MCFG_CPU_ADD("maincpu", PIC1655, 850000) // RC osc. R=13.4K, C=470pf, but unknown RC curve - measured 800-890kHz
MCFG_PIC16C5x_READ_A_CB(IOPORT("IN.0"))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(maniac_state, output_w))
MCFG_PIC16C5x_WRITE_C_CB(WRITE8(maniac_state, output_w))
- MCFG_PIC16C5x_SET_CONFIG(0) // ?
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_maniac)