Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

SPARC keyboard: get rid of some annoying printfs, use constants [Vas Crabb]

Browse Source
This commit is contained in:
Vas Crabb 2016-07-21 02:50:31 +10:00
parent c17d03a053
commit 5ad599f088
3 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/devices/bus/sunkbd/sparckbd.cpp
View File

@ -367,8 +367,8 @@ void sparc_keyboard_device::device_reset()
m_beeper_state = 0; m_beeper_state = 0;
// configure device_serial_interface // configure device_serial_interface
set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1); set_data_frame(START_BIT_COUNT, DATA_BIT_COUNT, PARITY, STOP_BITS);
set_rate(1'200); set_rate(BAUD);
receive_register_reset(); receive_register_reset();
transmit_register_reset(); transmit_register_reset();
@ -444,8 +444,6 @@ void sparc_keyboard_device::rcv_complete()
switch (m_rx_state) switch (m_rx_state)
{ {
case RX_LED: case RX_LED:
printf("SPARC keyboard: LED data: %02x\n", code);
fflush(stdout);
machine().output().set_led_value(LED_NUM, BIT(code, 0)); machine().output().set_led_value(LED_NUM, BIT(code, 0));
machine().output().set_led_value(LED_COMPOSE, BIT(code, 1)); machine().output().set_led_value(LED_COMPOSE, BIT(code, 1));
machine().output().set_led_value(LED_SCROLL, BIT(code, 2)); machine().output().set_led_value(LED_SCROLL, BIT(code, 2));
@ -458,43 +456,28 @@ void sparc_keyboard_device::rcv_complete()
case RX_IDLE: case RX_IDLE:
switch (code) switch (code)
{ {
// Reset case COMMAND_RESET:
case 0x01U:
printf("SPARC keyboard: reset\n");
fflush(stdout);
device_reset(); device_reset();
break; break;
// Bell on case COMMAND_BELL_ON:
case 0x02U:
printf("SPARC keyboard: bell on\n");
fflush(stdout);
m_beeper_state |= UINT8(BEEPER_BELL); m_beeper_state |= UINT8(BEEPER_BELL);
m_beeper->set_state(m_beeper_state ? 1 : 0); m_beeper->set_state(m_beeper_state ? 1 : 0);
m_rx_state = RX_IDLE; m_rx_state = RX_IDLE;
break; break;
// Bell off case COMMAND_BELL_OFF:
case 0x03U:
printf("SPARC keyboard: bell off\n");
fflush(stdout);
m_beeper_state &= ~UINT8(BEEPER_BELL); m_beeper_state &= ~UINT8(BEEPER_BELL);
m_beeper->set_state(m_beeper_state ? 1 : 0); m_beeper->set_state(m_beeper_state ? 1 : 0);
m_rx_state = RX_IDLE; m_rx_state = RX_IDLE;
break; break;
// Click on case COMMAND_CLICK_ON:
case 0x0aU:
printf("SPARC keyboard: keyclick on\n");
fflush(stdout);
m_keyclick = 1; m_keyclick = 1;
m_rx_state = RX_IDLE; m_rx_state = RX_IDLE;
break; break;
// Click off case COMMAND_CLICK_OFF:
case 0x0bU:
printf("SPARC keyboard: keyclick off\n");
fflush(stdout);
m_keyclick = 0; m_keyclick = 0;
m_click_timer->reset(); m_click_timer->reset();
m_beeper_state &= ~UINT8(BEEPER_CLICK); m_beeper_state &= ~UINT8(BEEPER_CLICK);
@ -502,17 +485,12 @@ void sparc_keyboard_device::rcv_complete()
m_rx_state = RX_IDLE; m_rx_state = RX_IDLE;
break; break;
// LED command case COMMAND_LED:
case 0x0eU:
printf("SPARC keyboard: LED command\n");
fflush(stdout);
m_rx_state = RX_LED; m_rx_state = RX_LED;
break; break;
// Layout command case COMMAND_LAYOUT:
case 0x0fU: send_byte(0xfeU);
printf("SPARC keyboard: layout command\n");
fflush(stdout);
send_byte(UINT8(m_dips->read() & 0x3fU)); send_byte(UINT8(m_dips->read() & 0x3fU));
m_rx_state = RX_IDLE; m_rx_state = RX_IDLE;
break; break;

10
src/devices/bus/sunkbd/sparckbd.h
View File

@ -56,6 +56,16 @@ private:
RX_LED RX_LED
}; };
enum : UINT8 {
COMMAND_RESET = 0x01U,
COMMAND_BELL_ON = 0x02U,
COMMAND_BELL_OFF = 0x03U,
COMMAND_CLICK_ON = 0x0aU,
COMMAND_CLICK_OFF = 0x0bU,
COMMAND_LED = 0x0eU,
COMMAND_LAYOUT = 0x0fU
};
void scan_row(); void scan_row();
void send_byte(UINT8 code); void send_byte(UINT8 code);

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

@ -7,6 +7,14 @@
device_type const SUNKBD_PORT = &device_creator<sun_keyboard_port_device>; device_type const SUNKBD_PORT = &device_creator<sun_keyboard_port_device>;
int const device_sun_keyboard_port_interface::START_BIT_COUNT;
int const device_sun_keyboard_port_interface::DATA_BIT_COUNT;
device_serial_interface::parity_t const device_sun_keyboard_port_interface::PARITY;
device_serial_interface::stop_bits_t const device_sun_keyboard_port_interface::STOP_BITS;
int const device_sun_keyboard_port_interface::BAUD;
sun_keyboard_port_device::sun_keyboard_port_device( sun_keyboard_port_device::sun_keyboard_port_device(
machine_config const &mconfig, machine_config const &mconfig,
char const *tag, char const *tag,