Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 18:08:04 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

(nw) fix stuff up:

Browse Source 
* sunmouse: helps to invert that... also improve notes
* sunkbd: remove an assert that triggers if you type fast, improve notes
This commit is contained in:
Vas Crabb 2018-09-18 18:02:13 +10:00
parent ef5fe3c95e
commit 9f73340dbc
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/devices/bus/sunkbd/hlekbd.cpp
View File

@ -101,7 +101,7 @@
control on home row, caps lock at bottom left corner of main area
Type 5 International layout:
Type 5 International (ISO) layout:
76 1d 05 06 08 0a 0c 0e 10 11 12 07 09 0b 16 17 15 2d 02 04 30
@ -114,7 +114,7 @@
double-height return key, 58 (US backslash) moved to home row, 7c added on left of bottom row
Type 5 Japanese layout:
Type 5 Japanese (JIS) layout:
76 1d 05 06 08 0a 0c 0e 10 11 12 07 09 0b 16 17 15 2d 02 04 30
@ -127,8 +127,8 @@
double-height return key
yen/pipe replaces backtick/tilde at top left corner of main area
linefeed scancode repurposed for backslash/underscore
kana replaces alt graph (with LED window)
extra kakutei (確定), henkan (変換) and nihongo on-off keys
kana (かな) replaces alt graph (with LED window)
extra kakutei (確定), henkan (変換) and nihongo on-off (日本語 On-Off) keys
*/
@ -942,13 +942,13 @@ void hle_device_base::key_break(uint8_t row, uint8_t column)
assert(!fifo_full());
assert(m_make_count);
// send the break code, and the idle code if no other keysa are down
// send the break code, and the idle code if no other keys are down
transmit_byte(0x80U | (row << 4) | column);
if (!--m_make_count)
transmit_byte(0x7fU);
// check our counting
assert(are_all_keys_up() == !bool(m_make_count));
// this blows up if a key is pressed just as the last key is released
//assert(are_all_keys_up() == !bool(m_make_count));
}

6
src/devices/bus/sunkbd/sunkbd.cpp
View File

@ -68,7 +68,7 @@
1e: 1 3e: O 5e: KP 0 7e:
1f: 2 3f: P 5f: L9/Find 7f:
00, 7e, and 7f are reserved for special messages.
7e and 7f are reserved for special messages.
L function group and R function group repurposed on Type 4 keyboard.
F10, F11, F12, Alt Graph, Compose, and Help added on Type 4 keyboard.
Num Lock, KP -, KP +, KP 0, KP ., and Enter added on Type 4 keyboard.
@ -79,8 +79,8 @@
KP = repurposed for Mute on Type 5 keyboard.
Blank key only present on Type 5 UNIX keyboard.
< > only present on Type 5 International (ISO) keyboard.
Line Feed repurposed for backslash/underscore on Japanese Type 5 keyboard.
Kakutei, Henkan, and Nihongo On-Off only present on Japanese Type 5 keyboard.
Line Feed repurposed for backslash/underscore on Type 5 Japanese (JIS) keyboard.
Kakutei, Henkan, and Nihongo On-Off only present on Type 5 Japanese (JIS) keyboard.
TODO:
* Add power key line for soft power sun4c and later systems.

6
src/devices/bus/sunmouse/hlemouse.cpp
View File

@ -37,9 +37,9 @@ namespace {
INPUT_PORTS_START( mouse )
PORT_START("BTN")
PORT_BIT( 0xfff8, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CODE(MOUSECODE_BUTTON1) PORT_CHANGED_MEMBER(DEVICE_SELF, hle_device_base, input_changed, nullptr)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_CODE(MOUSECODE_BUTTON2) PORT_CHANGED_MEMBER(DEVICE_SELF, hle_device_base, input_changed, nullptr)
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_CODE(MOUSECODE_BUTTON3) PORT_CHANGED_MEMBER(DEVICE_SELF, hle_device_base, input_changed, nullptr)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(MOUSECODE_BUTTON1) PORT_CHANGED_MEMBER(DEVICE_SELF, hle_device_base, input_changed, nullptr)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(MOUSECODE_BUTTON2) PORT_CHANGED_MEMBER(DEVICE_SELF, hle_device_base, input_changed, nullptr)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(MOUSECODE_BUTTON3) PORT_CHANGED_MEMBER(DEVICE_SELF, hle_device_base, input_changed, nullptr)
PORT_START("X")
PORT_BIT( 0xf000, IP_ACTIVE_HIGH, IPT_UNUSED )

6
src/devices/bus/sunmouse/sunmouse.cpp
View File

@ -3,7 +3,7 @@
/*
Sun mouse port
Pre-USB Sun keyboards use an asynchronous serial protocol. Data is
Before USB, Sun used an asynchronous serial mouse protocol. Data is
transmitted at TTL levels using an asynchronous serial protocol.
The mouse RxD line is pulled up by the host and driven low by an
open collector driver in the mouse for the mark (1) condition. This
@ -13,7 +13,7 @@
Most Sun mouse port devices transmit data at 1,200 Baud. However,
some devices transmit at 4,800 Baud, and it's possible to modify any
Type 5 mouse for 4,800 Baud operation. Solaris 2.3 or later is
Sun Type 5 mouse for 4,800 Baud operation. Solaris 2.3 or later is
required to support a 4,800 Baud mouse.
From the Sun 2/50 onwards, the keyboard and mouse share a single
@ -42,7 +42,7 @@
Type 5 and later sacrifice the TxD line from the host to the mouse
in favour of a dedicated line for the soft power key. It was never
used for anything useful with standard Sun components anyway.
used for anything useful with standard Sun peripherals anyway.
Sun 2 and Sun 3 used an optical mouse made by Mouse Systems. The
colour varied (usually black for Sun 2 and white for Sun 3). They