From 6fcc49bca096bab406aee3e84674b3b3210d000c Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Sun, 16 Oct 2022 22:43:10 +0100 Subject: kr2376.cpp: Added the ROM12 variant. --- src/devices/machine/kr2376.cpp | 125 ++++++++++++++++++++++++----------------- src/devices/machine/kr2376.h | 17 +++--- 2 files changed, 83 insertions(+), 59 deletions(-) diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp index f77bf3d93dc..af0abb4169d 100644 --- a/src/devices/machine/kr2376.cpp +++ b/src/devices/machine/kr2376.cpp @@ -11,7 +11,7 @@ DEFINE_DEVICE_TYPE(KR2376_ST, kr2376_st_device, "kr2376_st", "SMC KR2376-ST Keyboard Encoder") -//DEFINE_DEVICE_TYPE(KR2376_12, kr2376_12_device, "kr2376_12", "SMC KR2376-12 Keyboard Encoder") +DEFINE_DEVICE_TYPE(KR2376_12, kr2376_12_device, "kr2376_12", "SMC KR2376-12 Keyboard Encoder") kr2376_device::kr2376_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock), @@ -85,55 +85,80 @@ uint8_t kr2376_st_device::key_codes(int mode, int x, int y) return KEY_CODES[mode][x][y]; } -// TODO: determine ROM contents of KR2376-12 -//kr2376_12_device::kr2376_12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) -// : kr2376_device(mconfig, KR2376_12, tag, owner, clock) -//{} -//uint8_t kr2376_12_device::key_codes(int mode, int x, int y) -//{ -// static const uint8_t KEY_CODES[3][8][11] = -// { -// // normal -// { -// // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 -// { 0x33, 0x32, 0x31, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X0 -// { 0x36, 0x35, 0x34, 0x7d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X1 -// { 0x39, 0x38, 0x37, 0x5b, 0x02, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00 }, // X2 -// { 0x08, 0x0a, 0x09, 0x0b, 0x00, 0x7c, 0x00, 0x00, 0x0d, 0x20, 0x00 }, // X3 -// { 0x2d, 0x2f, 0x2e, 0x2c, 0x6d, 0x6e, 0x62, 0x76, 0x63, 0x78, 0x7a }, // X4 -// { 0x3a, 0x3b, 0x6c, 0x6b, 0x6a, 0x68, 0x67, 0x66, 0x64, 0x73, 0x61 }, // X5 -// { 0x60, 0x70, 0x6f, 0x69, 0x75, 0x79, 0x74, 0x72, 0x65, 0x77, 0x71 }, // X6 -// { 0x2d, 0x30, 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31 } // X7 -// }, -// -// // shift -// { -// // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 -// { 0x33, 0x32, 0x31, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X0 -// { 0x36, 0x35, 0x34, 0x5d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X1 -// { 0x39, 0x38, 0x37, 0x7b, 0x04, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00 }, // X2 -// { 0x08, 0x0a, 0x09, 0x0b, 0x00, 0x5c, 0x00, 0x00, 0x0d, 0x20, 0x00 }, // X3 -// { 0x2d, 0x3f, 0x3e, 0x3c, 0x4d, 0x4e, 0x42, 0x56, 0x43, 0x58, 0x5a }, // X4 -// { 0x2a, 0x2b, 0x4c, 0x4b, 0x4a, 0x48, 0x47, 0x46, 0x44, 0x53, 0x41 }, // X5 -// { 0x40, 0x50, 0x4f, 0x49, 0x55, 0x59, 0x54, 0x52, 0x45, 0x57, 0x51 }, // X6 -// { 0x3d, 0x30, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21 } // X7 -// }, -// -// // control -// { -// // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 -// { 0x33, 0x32, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X0 -// { 0x36, 0x35, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X1 -// { 0x39, 0x38, 0x37, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00 }, // X2 -// { 0x08, 0x0a, 0x09, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x20, 0x00 }, // X3 -// { 0x1f, 0x2f, 0x2e, 0x2c, 0x0d, 0x0e, 0x02, 0x16, 0x03, 0x18, 0x1a }, // X4 -// { 0x3a, 0x3b, 0x0c, 0x0b, 0x0a, 0x08, 0x07, 0x06, 0x04, 0x13, 0x01 }, // X5 -// { 0x00, 0x10, 0x0f, 0x09, 0x15, 0x19, 0x14, 0x12, 0x05, 0x17, 0x11 }, // X6 -// { 0x2d, 0x30, 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31 } // X7 -// } -// }; -// return KEY_CODES[mode][x][y]; -//} +kr2376_12_device::kr2376_12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : kr2376_device(mconfig, KR2376_12, tag, owner, clock) +{ +} + +uint8_t kr2376_12_device::key_codes(int mode, int x, int y) +{ + static const uint8_t KEY_CODES[3][8][11] = + { + // normal + { + // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 + // 3 2 1 RS SUB GS SYN STX NAK DC4 NUL + { 0x33, 0x32, 0x31, 0x1e, 0x1a, 0x1d, 0x16, 0x02, 0x15, 0x14, 0x00 }, // X0 + // 6 5 4 ] [ ETX CAN GS DEL DLE SOH + { 0x36, 0x35, 0x34, 0x5d, 0x5b, 0x03, 0x18, 0x1d, 0x7f, 0x10, 0x01 }, // X1 + // 9 8 7 | ~ FS EM ESC SUB HT ACK + { 0x39, 0x38, 0x37, 0x7c, 0x7e, 0x1c, 0x19, 0x1b, 0x1a, 0x09, 0x06 }, // X2 + // US VT DC1 BS SI HT LF FF CR SP ETB + { 0x1f, 0x0b, 0x11, 0x08, 0x0f, 0x09, 0x0a, 0x0c, 0x0d, 0x20, 0x17 }, // X3 + // - 0 9 8 7 6 5 4 3 2 1 + { 0x2d, 0x30, 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31 }, // X4 + // \ p o i u y t r e w q + { 0x5c, 0x70, 0x6f, 0x69, 0x75, 0x79, 0x74, 0x72, 0x65, 0x77, 0x71 }, // X5 + // : ; l k j h g f d s a + { 0x3a, 0x3b, 0x6c, 0x6b, 0x6a, 0x68, 0x67, 0x66, 0x64, 0x73, 0x61 }, // X6 + // _ / . , m n b v c x z + { 0x5f, 0x2f, 0x2e, 0x2c, 0x6d, 0x6e, 0x62, 0x76, 0x63, 0x78, 0x7a } // X7 + }, + + // shift + { + // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 + // 3 2 1 RS SUB DC2 SYN STX NAK DC4 NUL + { 0x33, 0x32, 0x31, 0x1e, 0x1a, 0x12, 0x16, 0x02, 0x15, 0x14, 0x00 }, // X0 + // 6 5 4 } { ETX CAN GS DEL DLE SOH + { 0x36, 0x35, 0x34, 0x7d, 0x7b, 0x03, 0x18, 0x1d, 0x7f, 0x10, 0x01 }, // X1 + // 9 8 7 \ ^ FS EM ESC SUB HT ACK + { 0x39, 0x38, 0x37, 0x5c, 0x5e, 0x1c, 0x19, 0x1b, 0x1a, 0x09, 0x06 }, // X2 + // US VT DC1 BS SO DC3 LF FF CR SP ETB + { 0x1f, 0x0b, 0x11, 0x08, 0x0e, 0x13, 0x0a, 0x0c, 0x0d, 0x20, 0x17 }, // X3 + // = 0 ) ( ' & % $ # " ! + { 0x3d, 0x30, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21 }, // X4 + // @ P O I U Y T R E W Q + { 0x40, 0x50, 0x4f, 0x49, 0x55, 0x59, 0x54, 0x52, 0x45, 0x57, 0x51 }, // X5 + // * + L K J H G F D S A + { 0x2a, 0x2b, 0x4c, 0x4b, 0x4a, 0x48, 0x47, 0x46, 0x44, 0x53, 0x41 }, // X6 + // _ ? > < M N B V C X Z + { 0x5f, 0x3f, 0x3e, 0x3c, 0x4d, 0x4e, 0x42, 0x56, 0x43, 0x58, 0x5a } // X7 + }, + + // control + { + // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 + // 3 2 1 RS SUB GS SYN STX NAK DC4 NUL + { 0x33, 0x32, 0x31, 0x1e, 0x1a, 0x1d, 0x16, 0x02, 0x15, 0x14, 0x00 }, // X0 + // 6 5 4 GS ESC ETX CAN GS DEL DLE SOH + { 0x36, 0x35, 0x34, 0x1d, 0x1b, 0x03, 0x18, 0x1d, 0x7f, 0x10, 0x01 }, // X1 + // 9 8 7 FS RS FS EM ESC SUB HT ACK + { 0x39, 0x38, 0x37, 0x1c, 0x1e, 0x1c, 0x19, 0x1b, 0x1a, 0x09, 0x06 }, // X2 + // US VT DC1 BS SI HT LF FF CR SP ETB + { 0x1f, 0x0b, 0x11, 0x08, 0x0f, 0x09, 0x0a, 0x0c, 0x0d, 0x20, 0x17 }, // X3 + // - 0 9 8 7 6 5 4 3 2 1 + { 0x2d, 0x30, 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31 }, // X4 + // NUL DLE SI HT NAK EM DC4 DC2 ENQ ETB DC1 + { 0x00, 0x10, 0x0f, 0x09, 0x15, 0x19, 0x14, 0x12, 0x05, 0x17, 0x11 }, // X5 + // : ; FF VT LF BS BEL ACK EOT DC3 SOH + { 0x3a, 0x3b, 0x0c, 0x0b, 0x0a, 0x08, 0x07, 0x06, 0x04, 0x13, 0x01 }, // X6 + // US / . , CR SO STX SYN ETX CAN SUB + { 0x1f, 0x2f, 0x2e, 0x2c, 0x0d, 0x0e, 0x02, 0x16, 0x03, 0x18, 0x1a } // X7 + } + }; + return KEY_CODES[mode][x][y]; +} //------------------------------------------------- // device_start - device-specific startup diff --git a/src/devices/machine/kr2376.h b/src/devices/machine/kr2376.h index 6f8306bb30d..2345ade8c5e 100644 --- a/src/devices/machine/kr2376.h +++ b/src/devices/machine/kr2376.h @@ -106,16 +106,15 @@ protected: virtual uint8_t key_codes(int mode, int x, int y) override; }; -//class kr2376_12_device : public kr2376_device -//{ -//public: -// // construction/destruction -// kr2376_12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); -//protected: -// virtual uint8_t key_codes(int mode, int x, int y) override; -//}; +class kr2376_12_device : public kr2376_device +{ +public: + kr2376_12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + virtual uint8_t key_codes(int mode, int x, int y) override; +}; DECLARE_DEVICE_TYPE(KR2376_ST, kr2376_st_device) -//DECLARE_DEVICE_TYPE(KR2376_12, kr2376_12_device) +DECLARE_DEVICE_TYPE(KR2376_12, kr2376_12_device) #endif // MAME_MACHINE_KR2376_H -- cgit v1.2.3