diff options
author | 2021-01-27 08:20:27 +1100 | |
---|---|---|
committer | 2021-01-27 08:20:27 +1100 | |
commit | d5407444774ae45feb53a3e5927880a3def3d55c (patch) | |
tree | 8a669159899ff13cda293424375b0345585faae8 | |
parent | f54f2fa543d03ab51f044693532e978447a4c0d2 (diff) | |
parent | a7e6ae77d2b8116d3d5f768534e5421411764784 (diff) |
Merge remote-tracking branch 'upstream/master'
103 files changed, 310 insertions, 214 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index d23fa226f49..52aac8fe83e 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mamedev.mame" - android:versionCode="227" - android:versionName="0.227" + android:versionCode="228" + android:versionName="0.228" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/hash/saitek_egr.xml b/hash/saitek_egr.xml index e2c57a2ad60..c6df74f98aa 100644 --- a/hash/saitek_egr.xml +++ b/hash/saitek_egr.xml @@ -13,6 +13,7 @@ license:CC0 <description>Endgame ROM (ver. 1)</description> <year>1988</year> <publisher>Saitek</publisher> + <sharedfeat name="compatibility" value="egr"/> <part name="extrom" interface="saitek_egr"> <dataarea name="rom" size="0x8000"> <rom name="egr.bin" size="0x8000" crc="1f9800c8" sha1="6147ad3de65b897fa5f6ab06b2f8597403d6e32e" /> @@ -24,6 +25,7 @@ license:CC0 <description>Endgame ROM (ver. 2)</description> <year>1988</year> <publisher>Saitek</publisher> + <sharedfeat name="compatibility" value="egr2"/> <part name="extrom" interface="saitek_egr"> <dataarea name="rom" size="0x8000"> <rom name="egr2.bin" size="0x8000" crc="9f751516" sha1="c46053b0af55856f2a6871d4aa65b3bd0e7d865f" /> @@ -1743,14 +1743,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.227"' > $@ + @echo '#define BARE_BUILD_VERSION "0.228"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.227" > $@ + @echo #define BARE_BUILD_VERSION "0.228" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index a98c4d94540..c12d77d42e8 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -4911,6 +4911,7 @@ files { MAME_DIR .. "src/mame/drivers/gammagic.cpp", MAME_DIR .. "src/mame/drivers/gamtor.cpp", MAME_DIR .. "src/mame/drivers/gei.cpp", + MAME_DIR .. "src/mame/drivers/gfamily.cpp", MAME_DIR .. "src/mame/drivers/globalfr.cpp", MAME_DIR .. "src/mame/drivers/globalvr.cpp", MAME_DIR .. "src/mame/drivers/gluck2.cpp", diff --git a/src/devices/bus/acorn/cms/4080term.cpp b/src/devices/bus/acorn/cms/4080term.cpp index 3313545a618..36ec6f6020e 100644 --- a/src/devices/bus/acorn/cms/4080term.cpp +++ b/src/devices/bus/acorn/cms/4080term.cpp @@ -58,7 +58,6 @@ ROM_END static DEVICE_INPUT_DEFAULTS_START(keyboard) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_1200) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_2) diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index f2b319fb50c..0a38d5ce9cf 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -221,7 +221,6 @@ void softbox_device::ppi1_pc_w(uint8_t data) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp index 31d77555d06..64beb75d6f2 100644 --- a/src/devices/bus/rs232/keyboard.cpp +++ b/src/devices/bus/rs232/keyboard.cpp @@ -8,7 +8,6 @@ INPUT_PORTS_START(serial_keyboard) PORT_INCLUDE(generic_keyboard) PORT_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", serial_keyboard_device, update_serial) - PORT_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", serial_keyboard_device, update_serial) PORT_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", serial_keyboard_device, update_serial) PORT_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", serial_keyboard_device, update_serial) PORT_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", serial_keyboard_device, update_serial) @@ -25,7 +24,6 @@ serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, de , device_buffered_serial_interface(mconfig, *this) , device_rs232_port_interface(mconfig, *this) , m_rs232_txbaud(*this, "RS232_TXBAUD") - , m_rs232_startbits(*this, "RS232_STARTBITS") , m_rs232_databits(*this, "RS232_DATABITS") , m_rs232_parity(*this, "RS232_PARITY") , m_rs232_stopbits(*this, "RS232_STOPBITS") @@ -53,7 +51,7 @@ void serial_keyboard_device::device_reset() clear_fifo(); - int const startbits = convert_startbits(m_rs232_startbits->read()); + int const startbits = 1; int const databits = convert_databits(m_rs232_databits->read()); parity_t const parity = convert_parity(m_rs232_parity->read()); stop_bits_t const stopbits = convert_stopbits(m_rs232_stopbits->read()); diff --git a/src/devices/bus/rs232/keyboard.h b/src/devices/bus/rs232/keyboard.h index a10f9a78385..55e7e9d10fc 100644 --- a/src/devices/bus/rs232/keyboard.h +++ b/src/devices/bus/rs232/keyboard.h @@ -35,7 +35,6 @@ private: virtual void received_byte(uint8_t byte) override; required_ioport m_rs232_txbaud; - required_ioport m_rs232_startbits; required_ioport m_rs232_databits; required_ioport m_rs232_parity; required_ioport m_rs232_stopbits; diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp index 2cbf3e353da..86cac00a12a 100644 --- a/src/devices/bus/rs232/null_modem.cpp +++ b/src/devices/bus/rs232/null_modem.cpp @@ -10,7 +10,6 @@ null_modem_device::null_modem_device(const machine_config &mconfig, const char * m_stream(*this, "stream"), m_rs232_txbaud(*this, "RS232_TXBAUD"), m_rs232_rxbaud(*this, "RS232_RXBAUD"), - m_rs232_startbits(*this, "RS232_STARTBITS"), m_rs232_databits(*this, "RS232_DATABITS"), m_rs232_parity(*this, "RS232_PARITY"), m_rs232_stopbits(*this, "RS232_STOPBITS"), @@ -32,7 +31,6 @@ void null_modem_device::device_add_mconfig(machine_config &config) static INPUT_PORTS_START(null_modem) PORT_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", null_modem_device, update_serial) PORT_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", null_modem_device, update_serial) - PORT_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", null_modem_device, update_serial) PORT_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", null_modem_device, update_serial) PORT_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", null_modem_device, update_serial) PORT_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", null_modem_device, update_serial) @@ -57,7 +55,7 @@ void null_modem_device::device_start() WRITE_LINE_MEMBER(null_modem_device::update_serial) { - int startbits = convert_startbits(m_rs232_startbits->read()); + int startbits = 1; int databits = convert_databits(m_rs232_databits->read()); parity_t parity = convert_parity(m_rs232_parity->read()); stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read()); diff --git a/src/devices/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h index 2482cc5ed35..cc63ac96231 100644 --- a/src/devices/bus/rs232/null_modem.h +++ b/src/devices/bus/rs232/null_modem.h @@ -40,7 +40,6 @@ private: required_ioport m_rs232_txbaud; required_ioport m_rs232_rxbaud; - required_ioport m_rs232_startbits; required_ioport m_rs232_databits; required_ioport m_rs232_parity; required_ioport m_rs232_stopbits; diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp index 4309463fd17..19347b84002 100644 --- a/src/devices/bus/rs232/printer.cpp +++ b/src/devices/bus/rs232/printer.cpp @@ -27,7 +27,6 @@ serial_printer_device::serial_printer_device(const machine_config &mconfig, devi m_initial_rx_state(1), m_printer(*this, "printer"), m_rs232_rxbaud(*this, "RS232_RXBAUD"), - m_rs232_startbits(*this, "RS232_STARTBITS"), m_rs232_databits(*this, "RS232_DATABITS"), m_rs232_parity(*this, "RS232_PARITY"), m_rs232_stopbits(*this, "RS232_STOPBITS") @@ -42,7 +41,6 @@ void serial_printer_device::device_add_mconfig(machine_config &config) static INPUT_PORTS_START(serial_printer) PORT_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", serial_printer_device, update_serial) - PORT_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", serial_printer_device, update_serial) PORT_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", serial_printer_device, update_serial) PORT_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", serial_printer_device, update_serial) PORT_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", serial_printer_device, update_serial) @@ -59,7 +57,7 @@ void serial_printer_device::device_start() WRITE_LINE_MEMBER(serial_printer_device::update_serial) { - int startbits = convert_startbits(m_rs232_startbits->read()); + int startbits = 1; int databits = convert_databits(m_rs232_databits->read()); parity_t parity = convert_parity(m_rs232_parity->read()); stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read()); diff --git a/src/devices/bus/rs232/printer.h b/src/devices/bus/rs232/printer.h index 973e46dc768..cdc0fbbbbf7 100644 --- a/src/devices/bus/rs232/printer.h +++ b/src/devices/bus/rs232/printer.h @@ -36,7 +36,6 @@ private: required_device<printer_image_device> m_printer; required_ioport m_rs232_rxbaud; - required_ioport m_rs232_startbits; required_ioport m_rs232_databits; required_ioport m_rs232_parity; required_ioport m_rs232_stopbits; diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp index dec296006be..db002447621 100644 --- a/src/devices/bus/rs232/pty.cpp +++ b/src/devices/bus/rs232/pty.cpp @@ -16,7 +16,6 @@ pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, co device_pty_interface(mconfig, *this), m_rs232_txbaud(*this, "RS232_TXBAUD"), m_rs232_rxbaud(*this, "RS232_RXBAUD"), - m_rs232_startbits(*this, "RS232_STARTBITS"), m_rs232_databits(*this, "RS232_DATABITS"), m_rs232_parity(*this, "RS232_PARITY"), m_rs232_stopbits(*this, "RS232_STOPBITS"), @@ -28,7 +27,7 @@ pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, co WRITE_LINE_MEMBER(pseudo_terminal_device::update_serial) { - int startbits = convert_startbits(m_rs232_startbits->read()); + int startbits = 1; int databits = convert_databits(m_rs232_databits->read()); parity_t parity = convert_parity(m_rs232_parity->read()); stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read()); @@ -52,7 +51,6 @@ WRITE_LINE_MEMBER(pseudo_terminal_device::update_serial) static INPUT_PORTS_START(pseudo_terminal) PORT_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", pseudo_terminal_device, update_serial) PORT_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", pseudo_terminal_device, update_serial) - PORT_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", pseudo_terminal_device, update_serial) PORT_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", pseudo_terminal_device, update_serial) PORT_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", pseudo_terminal_device, update_serial) PORT_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", pseudo_terminal_device, update_serial) diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h index 88550fd5791..a5accaaf83b 100644 --- a/src/devices/bus/rs232/pty.h +++ b/src/devices/bus/rs232/pty.h @@ -37,7 +37,6 @@ private: required_ioport m_rs232_txbaud; required_ioport m_rs232_rxbaud; - required_ioport m_rs232_startbits; required_ioport m_rs232_databits; required_ioport m_rs232_parity; required_ioport m_rs232_stopbits; diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h index 5a007dd34a3..85019427387 100644 --- a/src/devices/bus/rs232/rs232.h +++ b/src/devices/bus/rs232/rs232.h @@ -23,16 +23,33 @@ #define RS232_BAUD_57600 (0x0c) #define RS232_BAUD_115200 (0x0d) +#define RS232_BAUD_50 (0x0e) +#define RS232_BAUD_75 (0x0f) +#define RS232_BAUD_134_5 (0x10) +#define RS232_BAUD_200 (0x11) +#define RS232_BAUD_1800 (0x12) +#define RS232_BAUD_2000 (0x13) +#define RS232_BAUD_3600 (0x14) +#define RS232_BAUD_7200 (0x15) + #define PORT_RS232_BAUD(_tag, _default_baud, _description, _class, _write_line) \ PORT_START(_tag) \ PORT_CONFNAME(0xff, _default_baud, _description) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, _class, _write_line) \ + PORT_CONFSETTING( RS232_BAUD_50, "50") \ + PORT_CONFSETTING( RS232_BAUD_75, "75") \ PORT_CONFSETTING( RS232_BAUD_110, "110") \ + PORT_CONFSETTING( RS232_BAUD_134_5, "134.5") \ PORT_CONFSETTING( RS232_BAUD_150, "150") \ + PORT_CONFSETTING( RS232_BAUD_200, "200") \ PORT_CONFSETTING( RS232_BAUD_300, "300") \ PORT_CONFSETTING( RS232_BAUD_600, "600") \ PORT_CONFSETTING( RS232_BAUD_1200, "1200") \ + PORT_CONFSETTING( RS232_BAUD_1800, "1800") \ + PORT_CONFSETTING( RS232_BAUD_2000, "2000") \ PORT_CONFSETTING( RS232_BAUD_2400, "2400") \ + PORT_CONFSETTING( RS232_BAUD_3600, "3600") \ PORT_CONFSETTING( RS232_BAUD_4800, "4800") \ + PORT_CONFSETTING( RS232_BAUD_7200, "7200") \ PORT_CONFSETTING( RS232_BAUD_9600, "9600") \ PORT_CONFSETTING( RS232_BAUD_14400, "14400") \ PORT_CONFSETTING( RS232_BAUD_19200, "19200") \ @@ -41,15 +58,6 @@ PORT_CONFSETTING( RS232_BAUD_57600, "57600") \ PORT_CONFSETTING( RS232_BAUD_115200, "115200") -#define RS232_STARTBITS_0 (0x00) -#define RS232_STARTBITS_1 (0x01) - -#define PORT_RS232_STARTBITS(_tag, _default_startbits, _description, _class, _write_line) \ - PORT_START(_tag) \ - PORT_CONFNAME(0xff, _default_startbits, _description) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, _class, _write_line) \ - PORT_CONFSETTING( RS232_STARTBITS_0, "0") \ - PORT_CONFSETTING( RS232_STARTBITS_1, "1") - #define RS232_DATABITS_5 (0x00) #define RS232_DATABITS_6 (0x01) #define RS232_DATABITS_7 (0x02) @@ -209,23 +217,21 @@ protected: 28800, 38400, 57600, - 115200 + 115200, + + 50, + 75, + 134, // -0.37% error + 200, + 1800, + 2000, + 3600, + 7200 }; return values[baud]; } - static int convert_startbits(uint8_t startbits) - { - static const int values[] = - { - 0, - 1 - }; - - return values[startbits]; - } - static int convert_databits(uint8_t databits) { static const int values[] = diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp index 0955cd58a99..1c753996ec1 100644 --- a/src/devices/bus/rs232/terminal.cpp +++ b/src/devices/bus/rs232/terminal.cpp @@ -9,7 +9,6 @@ serial_terminal_device::serial_terminal_device(const machine_config &mconfig, co , device_rs232_port_interface(mconfig, *this) , m_rs232_txbaud(*this, "RS232_TXBAUD") , m_rs232_rxbaud(*this, "RS232_RXBAUD") - , m_rs232_startbits(*this, "RS232_STARTBITS") , m_rs232_databits(*this, "RS232_DATABITS") , m_rs232_parity(*this, "RS232_PARITY") , m_rs232_stopbits(*this, "RS232_STOPBITS") @@ -21,7 +20,6 @@ static INPUT_PORTS_START(serial_terminal) PORT_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", serial_terminal_device, update_serial) PORT_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", serial_terminal_device, update_serial) - PORT_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", serial_terminal_device, update_serial) PORT_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", serial_terminal_device, update_serial) PORT_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", serial_terminal_device, update_serial) PORT_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", serial_terminal_device, update_serial) @@ -36,7 +34,7 @@ WRITE_LINE_MEMBER(serial_terminal_device::update_serial) { clear_fifo(); - int const startbits = convert_startbits(m_rs232_startbits->read()); + int const startbits = 1; int const databits = convert_databits(m_rs232_databits->read()); parity_t const parity = convert_parity(m_rs232_parity->read()); stop_bits_t const stopbits = convert_stopbits(m_rs232_stopbits->read()); diff --git a/src/devices/bus/rs232/terminal.h b/src/devices/bus/rs232/terminal.h index 727b3122583..32073efec4d 100644 --- a/src/devices/bus/rs232/terminal.h +++ b/src/devices/bus/rs232/terminal.h @@ -30,7 +30,6 @@ private: required_ioport m_rs232_txbaud; required_ioport m_rs232_rxbaud; - required_ioport m_rs232_startbits; required_ioport m_rs232_databits; required_ioport m_rs232_parity; required_ioport m_rs232_stopbits; diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp index 64eb9638d74..29efc80b185 100644 --- a/src/devices/bus/s100/wunderbus.cpp +++ b/src/devices/bus/s100/wunderbus.cpp @@ -61,7 +61,6 @@ WRITE_LINE_MEMBER( s100_wunderbus_device::pic_int_w ) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_110 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_110 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/devices/bus/ss50/mpc.cpp b/src/devices/bus/ss50/mpc.cpp index 18194605a9c..99c476684b3 100644 --- a/src/devices/bus/ss50/mpc.cpp +++ b/src/devices/bus/ss50/mpc.cpp @@ -88,7 +88,6 @@ ioport_constructor ss50_mpc_device::device_input_ports() const static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_300) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_300) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/devices/bus/ss50/mps.cpp b/src/devices/bus/ss50/mps.cpp index b7e4157812e..b79d1dddbc0 100644 --- a/src/devices/bus/ss50/mps.cpp +++ b/src/devices/bus/ss50/mps.cpp @@ -96,7 +96,6 @@ ioport_constructor ss50_mps_device::device_input_ports() const static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/devices/bus/ss50/mps2.cpp b/src/devices/bus/ss50/mps2.cpp index 04e8d0de9ac..f0d9350bfb8 100644 --- a/src/devices/bus/ss50/mps2.cpp +++ b/src/devices/bus/ss50/mps2.cpp @@ -110,7 +110,6 @@ ioport_constructor ss50_mps2_device::device_input_ports() const static DEVICE_INPUT_DEFAULTS_START( terminal_upper ) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) @@ -119,7 +118,6 @@ DEVICE_INPUT_DEFAULTS_END static DEVICE_INPUT_DEFAULTS_START( terminal_lower ) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp index e55037d6aca..b3b4dc4e89d 100644 --- a/src/devices/bus/vme/vme_fccpu20.cpp +++ b/src/devices/bus/vme/vme_fccpu20.cpp @@ -246,7 +246,6 @@ void vme_fccpu20_device::cpu20_mem(address_map &map) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp index 7f7f2046fb5..e58673a0bb0 100644 --- a/src/devices/machine/smioc.cpp +++ b/src/devices/machine/smioc.cpp @@ -129,7 +129,6 @@ void smioc_device::smioc_mem(address_map &map) static DEVICE_INPUT_DEFAULTS_START(terminal) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_7) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_EVEN) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt index 63559f39cf3..c1a3cbb880b 100644 --- a/src/mame/arcade.flt +++ b/src/mame/arcade.flt @@ -472,6 +472,7 @@ gberet.cpp gcpinbal.cpp gei.cpp getaway.cpp +gfamily.cpp ggconnie.cpp ghosteo.cpp giclassic.cpp diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp index 70831508053..053aed7b31f 100644 --- a/src/mame/drivers/a7150.cpp +++ b/src/mame/drivers/a7150.cpp @@ -417,7 +417,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( kbd_rs232_defaults ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_28800 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_28800 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp index 0619b52988e..94870fd4f11 100644 --- a/src/mame/drivers/aim65.cpp +++ b/src/mame/drivers/aim65.cpp @@ -207,7 +207,6 @@ image_init_result aim65_state::load_cart(device_image_interface &image, generic_ static DEVICE_INPUT_DEFAULTS_START( serial_term ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_1200 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_1200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_ODD ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp index 23a838660bb..cb6ab415540 100644 --- a/src/mame/drivers/aquarius.cpp +++ b/src/mame/drivers/aquarius.cpp @@ -337,7 +337,6 @@ GFXDECODE_END static DEVICE_INPUT_DEFAULTS_START(printer) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_1200) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_1200) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_2) diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index e2e00ffe54f..cf20cafe347 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -790,7 +790,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START(mwskins_comm) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_14400) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_14400) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index bd5f6dbd184..1bcba2984a0 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -241,7 +241,6 @@ QUICKLOAD_LOAD_MEMBER(binbug_state::quickload_cb) static DEVICE_INPUT_DEFAULTS_START( keyboard ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_300 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index 4f337e67c24..828b939a900 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -219,7 +219,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( kbd_rs232_defaults ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_300 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_300 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/blit.cpp b/src/mame/drivers/blit.cpp index 91004ab15a1..4878a60865a 100644 --- a/src/mame/drivers/blit.cpp +++ b/src/mame/drivers/blit.cpp @@ -133,7 +133,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( host_rs232_defaults ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) @@ -143,7 +142,6 @@ DEVICE_INPUT_DEFAULTS_END static DEVICE_INPUT_DEFAULTS_START( kbd_rs232_defaults ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp index 5c806149779..85f4cb17038 100644 --- a/src/mame/drivers/bogeyman.cpp +++ b/src/mame/drivers/bogeyman.cpp @@ -33,7 +33,7 @@ void bogeyman_state::ay8910_latch_w(uint8_t data) void bogeyman_state::ay8910_control_w(uint8_t data) { // bit 0 is flipscreen - flip_screen_set(data & 0x01); + flip_screen_set(~data & 0x01); // bit 5 goes to 8910 #0 BDIR pin if ((m_last_write & 0x20) == 0x20 && (data & 0x20) == 0x00) @@ -295,4 +295,5 @@ ROM_END /* Game Driver */ -GAME( 1985, bogeyman, 0, bogeyman, bogeyman, bogeyman_state, empty_init, ROT0, "Technos Japan", "Bogey Manor", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) +// ROT180 confirmed by Kold +GAME( 1985, bogeyman, 0, bogeyman, bogeyman, bogeyman_state, empty_init, ROT180, "Technos Japan", "Bogey Manor", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp index 548a9472b46..9c68b76f7ee 100644 --- a/src/mame/drivers/bullet.cpp +++ b/src/mame/drivers/bullet.cpp @@ -977,7 +977,6 @@ WRITE_LINE_MEMBER( bulletf_state::req_w ) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp index ec9997a80a8..cbb2e5b986b 100644 --- a/src/mame/drivers/candela.cpp +++ b/src/mame/drivers/candela.cpp @@ -664,7 +664,6 @@ void can09_state::can09_map(address_map &map) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_300 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_300 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 07c3cd03156..5d98aed29a1 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -27,7 +27,7 @@ Year + Game License PCB Tilemaps Sprites 95 Sailor Moon Banpresto BP945A 038 9437WX711 013 9346E7002 Z80 95 Donpachi Atlus AT-C01DP-2 038 9429WX727 013 9347E7003 NMK 112 96 Air Gallet Banpresto BP962A 038 9437WX711 013 9346E7002 Z80 -96 Hotdog Storm Marble ASTC9501 038 9341EX702 013 Z80 +96 Hotdog Storm Marble ASCT9501 038 9341EX702 013 Z80 96 Pac-Slot Namco N-44 EM 038 9444WX010 013 9345E7006 96 Poka Poka Satan Kato's PPS-MAIN 038 9444WX010 013 9607EX013 97 Tekken Card World Namco EMG4 038 9701WX001 013 9651EX001 @@ -3733,30 +3733,30 @@ Hotdog Storm Marble 1996 +------------------------------------------------------+ -| 6296 MP1 MP2 6264 6264 LED 68257 | -| 68257 68257 | -| VOL Z80 +--------+ | -| YM2203 | | 9 8 | +| 6295 MP1 MP2 6264 6264 LED 68257 | +| GAL 68257 68257 | +| VOL Y3014 Z80 +--------+ | +|LA4460N YM2203 | | 9 8 | | | 013 | P P | | | | M M | | 68257 +--------+ | -| 68000-16 68257 | -| | -| | -|J 93C46 MP3 +------+ +------+ +------+ | -|A MP4 | 038 | | 038 | | 038 | | +| 68000P12 68257 | +|J | +|A 93C46 MP3 +------+ +------+ +------+ | +|M MP4 | 038 | | 038 | | 038 | | |M | | | | | | | -|M +------+ +------+ +------+ | -|A | +|A +------+ +------+ +------+ | +| | | 4 4 4 4 4 4 | | 6264 5 6 6 6 6 6 7 6 6 | | P1 P2 6264 P 2 2 P 2 2 P 2 2 | | 32MHz M 6 6 M 6 6 M 6 6 | +------------------------------------------------------+ -BOARD #: ASTC9501 -CPU: TMP68HC000-16 -Sound: M6295 + YM2203 +BOARD #: ASCT9501 +CPU: MC68HC00P12, Z0840006PSC +Sound: M6295, YM2203C + Y3014B + LA4460N Sanyo High Gain 51dB, 12W AF Power Amplifier OSC: 32.000MHz EEPROM: ATMEL 93C46 CUSTOM: 038 9341EX702 x3 @@ -3800,7 +3800,7 @@ ROM_START( hotdogst ) ROM_LOAD( "mp1.u65", 0x00000, 0x80000, CRC(4868be1b) SHA1(32b8234b19fdbe07fa5057fa7965e36807e35e77) ) // 1xxxxxxxxxxxxxxxxxx = 0xFF, 4 x 0x20000 ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD( "eeprom-hotdogst.bin", 0x0000, 0x0080, CRC(12b4f934) SHA1(5b28d8fbd78869db78ce49e541a9d65558841966) ) + ROM_LOAD16_WORD( "eeprom-hotdogst.u14", 0x0000, 0x0080, CRC(12b4f934) SHA1(5b28d8fbd78869db78ce49e541a9d65558841966) ) ROM_END diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp index f415c37c6ae..6902c60872e 100644 --- a/src/mame/drivers/ccs2810.cpp +++ b/src/mame/drivers/ccs2810.cpp @@ -11,8 +11,8 @@ Chips: INS8250N-B, Z80A, uPD2716D, 82S129. Crystals: 16 MHz, 1.8432MHz SYSTEM OPERATION: Press Enter up to three times to start the system. -Supported baud rates include 110, 150, 300, 600, 1200, 2400, 9600, 14400, -38400, 57600 and 115200. +Supported baud rates include 50, 75, 110, 134.5, 150, 200, 300, 600, 1200, +1800, 2000, 2400, 3600, 7200, 9600, 14400, 38400, 57600 and 115200. All commands are in uppercase. A Assign logical device @@ -1002,7 +1002,6 @@ static const z80_daisy_config daisy_chain[] = static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index 69daabe838a..d13b16c6c32 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -448,7 +448,6 @@ void coco_state::coco_floating(machine_config &config) static DEVICE_INPUT_DEFAULTS_START( rs_printer ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp index c00d40c0968..17be09e6372 100644 --- a/src/mame/drivers/coco3.cpp +++ b/src/mame/drivers/coco3.cpp @@ -241,7 +241,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( rs_printer ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp index 495d1e033ad..e6347e26f6e 100644 --- a/src/mame/drivers/cybiko.cpp +++ b/src/mame/drivers/cybiko.cpp @@ -382,7 +382,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( debug_serial ) // set up debug port to default to 57600 DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_57600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_57600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp index 573674cd8d8..d8f5fc2d3df 100644 --- a/src/mame/drivers/digel804.cpp +++ b/src/mame/drivers/digel804.cpp @@ -614,7 +614,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( digel804_rs232_defaults ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_ODD ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp index 61182a6b060..62cc09fa473 100644 --- a/src/mame/drivers/dim68k.cpp +++ b/src/mame/drivers/dim68k.cpp @@ -409,7 +409,6 @@ void dim68k_state::machine_start() static DEVICE_INPUT_DEFAULTS_START(keyboard) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_300) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_300) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/mame/drivers/duet16.cpp b/src/mame/drivers/duet16.cpp index e008bd8283a..688a59eacf3 100644 --- a/src/mame/drivers/duet16.cpp +++ b/src/mame/drivers/duet16.cpp @@ -348,7 +348,6 @@ void duet16_keyboard_devices(device_slot_interface &device) static DEVICE_INPUT_DEFAULTS_START(keyboard) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_1200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index 30bce561ba9..bb5578275e0 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -212,7 +212,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/exorciser.cpp b/src/mame/drivers/exorciser.cpp index f83ea59b38a..11b7b26d346 100644 --- a/src/mame/drivers/exorciser.cpp +++ b/src/mame/drivers/exorciser.cpp @@ -638,7 +638,6 @@ void exorciser_state::machine_start() static DEVICE_INPUT_DEFAULTS_START(exorterm) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) @@ -647,7 +646,6 @@ DEVICE_INPUT_DEFAULTS_END static DEVICE_INPUT_DEFAULTS_START(printer) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp index a2dadcd4bb0..051e2c2640c 100644 --- a/src/mame/drivers/exp85.cpp +++ b/src/mame/drivers/exp85.cpp @@ -157,7 +157,6 @@ WRITE_LINE_MEMBER( exp85_state::sod_w ) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp index 24dee9ed14e..72aefaedcaa 100644 --- a/src/mame/drivers/funkball.cpp +++ b/src/mame/drivers/funkball.cpp @@ -756,7 +756,6 @@ void funkball_state::machine_reset() static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_57600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_57600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/gfamily.cpp b/src/mame/drivers/gfamily.cpp new file mode 100644 index 00000000000..3072b34b50d --- /dev/null +++ b/src/mame/drivers/gfamily.cpp @@ -0,0 +1,120 @@ +// license:BSD-3-Clause +// copyright-holders: +/* +Games Family P4-4P (Pentium 4 - 4 Players) + +PC with Chinese Windows 2000 Pro and several emulators, including: + -MAME v0.78 (Dec 30 2003) + -MAME v0.96u3 (May 25 2005) + -MAME v0.106 (May 16 2006) + -Nebula 2.1.5 + -FB Alpha v0.2.94.98 + -ZiNc 1.1 + + +PC motherboard plus an additional PCB for JAMMA, inputs and basic config. + +PC board: +CPU: Intel Celeron 1.7GHz / 128kb / 400MHz SL6SC +RAM: 256MB-DDR400 +PCB: 04/082006-SiS-651-6A6IXRMAC-00, Realtec ALC655 audio, Realtec RTL8201BL Ethernet (25.000 MHz xtal), Winbond W83194BG-648 (14.31818 MHz xtal) +BIOS: 686 AMIBIOS (c) 2006 AY36 8897 + +I/O board: +AT89C2051 + Microchip CF745 + 2 x Microchip PIC12F508 + Altera Max CPLD + +*/ + +#include "emu.h" +#include "cpu/i386/i386.h" +#include "screen.h" + +namespace { + +class gfamily_state : public driver_device +{ +public: + gfamily_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") + { } + + void gfamily(machine_config &config); + +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + +private: + required_device<cpu_device> m_maincpu; + + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void gfamily_map(address_map &map); +}; + +void gfamily_state::video_start() +{ +} + +uint32_t gfamily_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + return 0; +} + +void gfamily_state::gfamily_map(address_map &map) +{ +} + +static INPUT_PORTS_START( gfamily ) +INPUT_PORTS_END + + +void gfamily_state::machine_start() +{ +} + +void gfamily_state::machine_reset() +{ +} + +void gfamily_state::gfamily(machine_config &config) +{ + // Basic machine hardware + PENTIUM4(config, m_maincpu, 1'700'000'000); // Actually an Intel Celeron SL6SC 1.7GHz + m_maincpu->set_addrmap(AS_PROGRAM, &gfamily_state::gfamily_map); + + // Video hardware + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(60); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); + screen.set_size(640, 480); + screen.set_visarea(0, 640-1, 0, 480-1); + screen.set_screen_update(FUNC(gfamily_state::screen_update)); +} + +/*************************************************************************** + + Game drivers + +***************************************************************************/ + +ROM_START( gmfamily ) + ROM_REGION(0x80000, "bios", 0) + ROM_LOAD("686_amibios_ay36_8897.bin", 0x00000, 0x80000, CRC(e04c5750) SHA1(240ca6b270bdebf129e4ce43e79275aa067b6ada) ) + + // PICs and MCUs from the I/O board, all of them protected + ROM_REGION(0x10000, "unsorted", 0) + ROM_LOAD("at89c2051.u3", 0x0000, 0x4000, NO_DUMP ) // 2 Kbytes internal ROM + ROM_LOAD("cf745.u2", 0x4000, 0x2000, NO_DUMP ) // 1 Kbytes internal ROM + ROM_LOAD("pic12f508.u0", 0x6000, 0x2000, NO_DUMP ) // 1 Kbytes internal ROM + ROM_LOAD("pic12f508.u6", 0x8000, 0x2000, NO_DUMP ) // 1 Kbytes internal ROM + + DISK_REGION( "ide:0:hdd:image" ) // From a Norton Ghost recovery image + DISK_IMAGE( "gamesfamily_1.1", 0, SHA1(627584c5fceaa2649a4fbc9670fbf8aa036f82be) ) +ROM_END + +} // Anonymous namespace + + +GAME( 200?, gmfamily, 0, gfamily, gfamily, gfamily_state, empty_init, ROT0, "bootleg", "Games Family", MACHINE_IS_SKELETON ) diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index 4b670245d25..997ebb79761 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -597,7 +597,6 @@ WRITE_LINE_MEMBER(igt_gameking_state::vblank_irq) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_38400 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_38400 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/gs6502.cpp b/src/mame/drivers/gs6502.cpp index 7b1b214f826..ecab72b0a01 100644 --- a/src/mame/drivers/gs6502.cpp +++ b/src/mame/drivers/gs6502.cpp @@ -41,7 +41,6 @@ void gs6502_state::gs6502_mem(address_map &map) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_115200 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_115200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/gs6809.cpp b/src/mame/drivers/gs6809.cpp index 7e951f503fc..69ab610ad0b 100644 --- a/src/mame/drivers/gs6809.cpp +++ b/src/mame/drivers/gs6809.cpp @@ -41,7 +41,6 @@ void gs6809_state::gs6809_mem(address_map &map) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_115200 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_115200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/gscpm.cpp b/src/mame/drivers/gscpm.cpp index 46981e9b8f1..0dbbebe454c 100644 --- a/src/mame/drivers/gscpm.cpp +++ b/src/mame/drivers/gscpm.cpp @@ -134,7 +134,6 @@ void gscpm_state::machine_reset() static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_115200 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_115200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/gsz80.cpp b/src/mame/drivers/gsz80.cpp index ab7310b12ac..b9928574455 100644 --- a/src/mame/drivers/gsz80.cpp +++ b/src/mame/drivers/gsz80.cpp @@ -56,7 +56,6 @@ void gsz80_state::gsz80_io(address_map &map) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_115200 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_115200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp index 2f725965a6d..91982e6d71a 100644 --- a/src/mame/drivers/h89.cpp +++ b/src/mame/drivers/h89.cpp @@ -178,7 +178,6 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) // TODO - baud rate should be controlled by SW501 setting DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp index 9f375d1004e..4cc7d4c87ea 100644 --- a/src/mame/drivers/harriet.cpp +++ b/src/mame/drivers/harriet.cpp @@ -87,7 +87,6 @@ static const input_device_default terminal_defaults[] = { DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp index 57d19fdfdb5..28d5078c4f4 100644 --- a/src/mame/drivers/horizon.cpp +++ b/src/mame/drivers/horizon.cpp @@ -140,7 +140,6 @@ uint8_t horizon_state::ff_r() static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/icebox.cpp b/src/mame/drivers/icebox.cpp index 373eaa2f22c..9ce800a3e81 100644 --- a/src/mame/drivers/icebox.cpp +++ b/src/mame/drivers/icebox.cpp @@ -312,7 +312,6 @@ static void floppies(device_slot_interface &device) static DEVICE_INPUT_DEFAULTS_START( terminal ) // we need to remove bit 7 which is on the last character of each message DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/intellec4.cpp b/src/mame/drivers/intellec4.cpp index 2b04b7e8f7d..2362381aa41 100644 --- a/src/mame/drivers/intellec4.cpp +++ b/src/mame/drivers/intellec4.cpp @@ -825,7 +825,6 @@ void intellec4_state::intellec4_program_memory(address_map &map) DEVICE_INPUT_DEFAULTS_START(tty) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0x00ff, RS232_BAUD_110) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0x00ff, RS232_BAUD_110) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0x00ff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0x00ff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0x00ff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0x00ff, RS232_STOPBITS_2) diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp index 38597e2d106..64cfb12f38d 100644 --- a/src/mame/drivers/iris3130.cpp +++ b/src/mame/drivers/iris3130.cpp @@ -606,7 +606,6 @@ WRITE_LINE_MEMBER(iris3000_state::duartb_irq_handler) static DEVICE_INPUT_DEFAULTS_START( ip2_terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp index 76382eaca99..df05e2c1cb6 100644 --- a/src/mame/drivers/isbc.cpp +++ b/src/mame/drivers/isbc.cpp @@ -237,7 +237,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( isbc86_terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_300 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_300 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) @@ -246,7 +245,6 @@ DEVICE_INPUT_DEFAULTS_END static DEVICE_INPUT_DEFAULTS_START( isbc286_terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/isbc8010.cpp b/src/mame/drivers/isbc8010.cpp index 7666d9e79be..c68cb41c9c2 100644 --- a/src/mame/drivers/isbc8010.cpp +++ b/src/mame/drivers/isbc8010.cpp @@ -165,7 +165,6 @@ WRITE_LINE_MEMBER( isbc8010_state::usart_clock_tick ) static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to 4800 DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_4800 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_4800 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp index cca695f5a07..657f9900795 100644 --- a/src/mame/drivers/laserbas.cpp +++ b/src/mame/drivers/laserbas.cpp @@ -6,7 +6,7 @@ ============================================ TODO: -- Video: weird palette changes, Laserbase colors, missing bg scrolling between stages (CRT address lines + m_hset ( or m_vset ?)) +- Video: weird palette changes, Laserbase colors, gfx rendering in general needs verification - Sound: sound related i/o writes ( out_w handler ) - Interrupts - NMI/Int timing is wrong, it's based on measures of broken PCB TS 20.01.2017 @@ -106,7 +106,8 @@ private: uint8_t vram_r(offs_t offset); void vram_w(offs_t offset, uint8_t data); - void videoctrl_w(offs_t offset, uint8_t data); + void videoctrl1_w(offs_t offset, uint8_t data); + void videoctrl2_w(offs_t offset, uint8_t data); uint8_t z1_r(offs_t offset); uint8_t track_lo_r(); uint8_t track_hi_r(); @@ -136,41 +137,32 @@ TIMER_DEVICE_CALLBACK_MEMBER( laserbas_state::laserbas_scanline ) MC6845_UPDATE_ROW( laserbas_state::crtc_update_row ) { - int x = 0; - int x_max = 0x100; - int dx = 1; - - if (m_flipscreen) - { - y = 0xdf - y; - x = 0xff; - x_max = -1; - dx = -1; - } - - int pixaddr = y << 8; rgb_t const *const palette = m_palette->palette()->entry_list_raw(); - uint32_t *const b = &bitmap.pix(y); - while (x != x_max) + offs_t addr = ((ma & 0x3ff) << 5) | (ra << 7); + addr += (m_vset << 7); + + for (int x = 0; x < x_count; x++) { - int offset = (pixaddr >> 1) & 0x7fff; - int shift = (pixaddr & 1) * 4; // two 4 bit pixels in one byte - int p1 = (m_vram[offset] >> shift) & 0xf; - int p2 = (m_vram[offset + 0x8000] >> shift) & 0xf; // 0x10000 VRAM, two 4 bit layers 0x8000 bytes each - int p; - - if (p2) - p = p2; - else if (p1) - p = p1 + 16; - else - p = m_bset; - - b[x] = palette[p]; - - pixaddr++; - x += dx; + // draw 8 pixels + for (int i = 0; i < 8; i++) + { + // layer 1 (scrolling) + offs_t offset_p1 = (addr + (x << 2) + (i >> 1)) & 0x7fff; + uint8_t p1 = (m_vram[0x0000 + offset_p1] >> ((i & 1) * 4)) & 0x0f; + + // layer 2 (fixed) + offs_t offset_p2= ((y * 0x80) | (ra << 7)) + (x << 2) + (i >> 1); + uint8_t p2 = (m_vram[0x8000 + offset_p2] >> ((i & 1) * 4)) & 0x0f; + + // priority: p2 > p1 > background + uint8_t p = p2 ? p2 : p1 ? (p1 + 16) : m_bset; + + if (m_flipscreen) + bitmap.pix(0xdf - y, 0xff - (x * 8 + i)) = palette[p]; + else + bitmap.pix(y, x * 8 + i) = palette[p]; + } } } @@ -184,22 +176,33 @@ void laserbas_state::vram_w(offs_t offset, uint8_t data) m_vram[offset+(m_vrambank?0x8000:0)] = data; } -void laserbas_state::videoctrl_w(offs_t offset, uint8_t data) +void laserbas_state::videoctrl1_w(offs_t offset, uint8_t data) { - if (!(offset&1)) - { - m_vrambank = data & 0x40; // layer select - m_flipscreen = !(data & 0x80); - m_vset = (data>>3)&7; // inc-ed on interrupts ( 8 ints / frame ?) - m_hset = data&7; - } - else - { - data^=0xff; - m_bset = data>>4; // bg pen - m_scl = (data&8)>>3; // unknown - m_nmi=data&1; // nmi enable (not on schematics, traced) - } + data ^= 0xff; + + // 7------- flip screen + // -6------ layer select + // --543--- vset (vertical scroll, inc'ed on interrupts - 8 ints/frame?) + // -----210 hset (presumely horizontal scroll) + + m_flipscreen = bool(BIT(data, 7)); + m_vrambank = BIT(data, 6) ? 0 : 1; + m_vset = (data >> 3) & 0x07; + m_hset = (data >> 0) & 0x07; +} + +void laserbas_state::videoctrl2_w(offs_t offset, uint8_t data) +{ + data ^= 0xff; + + // 7654---- background pen + // ----3--- scl (unknown) + // -----21- not used? + // -------0 nmi enable (not on schematics, traced) + + m_bset = (data >> 4) & 0x0f; + m_scl = BIT(data, 3); + m_nmi = BIT(data, 0); } uint8_t laserbas_state::z1_r(offs_t offset) @@ -301,7 +304,8 @@ void laserbas_state::laserbas_io(address_map &map) map.global_mask(0xff); map(0x00, 0x00).w("crtc", FUNC(mc6845_device::address_w)); map(0x01, 0x01).w("crtc", FUNC(mc6845_device::register_w)); - map(0x10, 0x11).w(FUNC(laserbas_state::videoctrl_w)); + map(0x10, 0x10).w(FUNC(laserbas_state::videoctrl1_w)); + map(0x11, 0x11).w(FUNC(laserbas_state::videoctrl2_w)); map(0x20, 0x20).portr("DSW"); map(0x21, 0x21).portr("INPUTS"); map(0x22, 0x22).r(FUNC(laserbas_state::track_hi_r)); @@ -392,7 +396,7 @@ void laserbas_state::laserbas(machine_config &config) pit1.out_handler<2>().set(FUNC(laserbas_state::pit_out_w<5>)); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(4000000, 256, 0, 256, 256, 0, 256); /* temporary, CRTC will configure screen */ + screen.set_raw(6000000, 360, 0, 256, 274, 0, 224); screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update)); mc6845_device &crtc(MC6845(config, "crtc", 3000000/4)); /* unknown clock, hand tuned to get ~60 fps */ diff --git a/src/mame/drivers/mbc020.cpp b/src/mame/drivers/mbc020.cpp index 2adf1210b03..50f1831ab4e 100644 --- a/src/mame/drivers/mbc020.cpp +++ b/src/mame/drivers/mbc020.cpp @@ -110,7 +110,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( keyboard ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) @@ -119,7 +118,6 @@ DEVICE_INPUT_DEFAULTS_END static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp index ccead8b4a2a..c6c4e5a549a 100644 --- a/src/mame/drivers/mc10.cpp +++ b/src/mame/drivers/mc10.cpp @@ -650,7 +650,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( printer ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/mekd1.cpp b/src/mame/drivers/mekd1.cpp index 2f12103ba5e..bd5e09a041b 100644 --- a/src/mame/drivers/mekd1.cpp +++ b/src/mame/drivers/mekd1.cpp @@ -404,7 +404,6 @@ void mekd1_state::machine_start() static DEVICE_INPUT_DEFAULTS_START(terminal) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_2400) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_2400) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_7) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_SPACE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/mame/drivers/mekd3.cpp b/src/mame/drivers/mekd3.cpp index 29105919019..b2af8114a30 100644 --- a/src/mame/drivers/mekd3.cpp +++ b/src/mame/drivers/mekd3.cpp @@ -964,7 +964,6 @@ void mekd3_state::machine_reset() static DEVICE_INPUT_DEFAULTS_START(terminal) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/mame/drivers/mekd4.cpp b/src/mame/drivers/mekd4.cpp index d8856a11893..8ce7f05fdde 100644 --- a/src/mame/drivers/mekd4.cpp +++ b/src/mame/drivers/mekd4.cpp @@ -977,7 +977,6 @@ void mekd4_state::machine_reset() static DEVICE_INPUT_DEFAULTS_START(terminal) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/mame/drivers/mekd5.cpp b/src/mame/drivers/mekd5.cpp index 284b2d30eda..dbea468ce45 100644 --- a/src/mame/drivers/mekd5.cpp +++ b/src/mame/drivers/mekd5.cpp @@ -449,7 +449,6 @@ void mekd5_state::machine_reset() static DEVICE_INPUT_DEFAULTS_START(terminal) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) diff --git a/src/mame/drivers/mfabfz.cpp b/src/mame/drivers/mfabfz.cpp index 9fa283b4851..c0b74e5d738 100644 --- a/src/mame/drivers/mfabfz.cpp +++ b/src/mame/drivers/mfabfz.cpp @@ -241,7 +241,6 @@ void mfabfz_state::mfabfz(machine_config &config) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_4800 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_4800 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/mice.cpp b/src/mame/drivers/mice.cpp index 85e4b5c010b..e6de8d4ec76 100644 --- a/src/mame/drivers/mice.cpp +++ b/src/mame/drivers/mice.cpp @@ -144,7 +144,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( mice_terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_2400 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_2400 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) @@ -153,7 +152,6 @@ DEVICE_INPUT_DEFAULTS_END static DEVICE_INPUT_DEFAULTS_START( mice2_terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_2400 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_2400 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp index 3457c1388e2..d53759f08eb 100644 --- a/src/mame/drivers/micro20.cpp +++ b/src/mame/drivers/micro20.cpp @@ -158,7 +158,6 @@ void micro20_state::micro20_map(address_map &map) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/microkit.cpp b/src/mame/drivers/microkit.cpp index 0530204798e..e5260204718 100644 --- a/src/mame/drivers/microkit.cpp +++ b/src/mame/drivers/microkit.cpp @@ -150,7 +150,6 @@ void microkit_state::machine_start() static DEVICE_INPUT_DEFAULTS_START( serial_keyb ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_300 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_300 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_MARK ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp index 1910c73b5f2..975a1723262 100644 --- a/src/mame/drivers/oric.cpp +++ b/src/mame/drivers/oric.cpp @@ -904,7 +904,10 @@ void telestrat_state::telstrat(machine_config &config) ROM_START(oric1) ROM_REGION(0x4000, "maincpu", 0) - ROM_LOAD ("basic10.rom", 0, 0x04000, CRC(f18710b4) SHA1(333116e6884d85aaa4dfc7578a91cceeea66d016)) + ROM_SYSTEM_BIOS( 0, "ver10", "Basic 1.0") + ROMX_LOAD ("basic10.rom", 0, 0x04000, CRC(f18710b4) SHA1(333116e6884d85aaa4dfc7578a91cceeea66d016), ROM_BIOS(0)) + ROM_SYSTEM_BIOS( 1, "ver10uk", "Basic 1.0 UK") + ROMX_LOAD( "basic10uk.rom", 0, 0x04000, CRC(d6006a01) SHA1(84759cc8faae53070f1c8ce8408982a0edcb0796), ROM_BIOS(1)) ROM_END ROM_START(orica) diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index 9c25f9504e9..494bcff0b4b 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -259,7 +259,6 @@ void peoplepc_keyboard_devices(device_slot_interface &device) static DEVICE_INPUT_DEFAULTS_START(keyboard) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_1200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/pimps.cpp b/src/mame/drivers/pimps.cpp index 12212d11e22..fa7a7614a3e 100644 --- a/src/mame/drivers/pimps.cpp +++ b/src/mame/drivers/pimps.cpp @@ -140,7 +140,6 @@ void pimps_state::machine_reset() static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to 9600, 7 bits, even parity DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp index 863620d4232..dee8696c1b1 100644 --- a/src/mame/drivers/pipbug.cpp +++ b/src/mame/drivers/pipbug.cpp @@ -141,7 +141,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_110 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_110 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index c8c72297f2f..177dd29388e 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -169,7 +169,6 @@ static const z80_daisy_config daisy_chain_intf[] = static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/qtsbc.cpp b/src/mame/drivers/qtsbc.cpp index 1de5050030a..423334b4b58 100644 --- a/src/mame/drivers/qtsbc.cpp +++ b/src/mame/drivers/qtsbc.cpp @@ -468,7 +468,6 @@ void qtsbc_state::machine_reset() static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp index 2e71d92b050..f067ced3ed1 100644 --- a/src/mame/drivers/rd100.cpp +++ b/src/mame/drivers/rd100.cpp @@ -225,7 +225,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_2400 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_2400 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp index d474456e1af..973b42a46c1 100644 --- a/src/mame/drivers/sage2.cpp +++ b/src/mame/drivers/sage2.cpp @@ -359,7 +359,6 @@ WRITE_LINE_MEMBER( sage2_state::fdc_irq ) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/saitek_corona.cpp b/src/mame/drivers/saitek_corona.cpp index d62e10a0b78..710a8119c1e 100644 --- a/src/mame/drivers/saitek_corona.cpp +++ b/src/mame/drivers/saitek_corona.cpp @@ -294,7 +294,7 @@ void corona_state::corona(machine_config &config) /* extension rom */ GENERIC_CARTSLOT(config, "extrom", generic_plain_slot, "saitek_egr"); - SOFTWARE_LIST(config, "cart_list").set_original("saitek_egr"); + SOFTWARE_LIST(config, "cart_list").set_original("saitek_egr").set_filter("egr2"); } diff --git a/src/mame/drivers/saitek_simultano.cpp b/src/mame/drivers/saitek_simultano.cpp index 372e86c281d..788247eb0af 100644 --- a/src/mame/drivers/saitek_simultano.cpp +++ b/src/mame/drivers/saitek_simultano.cpp @@ -10,7 +10,7 @@ Two versions are known: "B" from 1988/1989, and "C" from 1989. Hardware notes: - WDC W65C02P @ 5MHz -- 64KB ROM (2*AMI 27256), socket for 32KB Endgame ROM +- 64KB ROM (2*AMI 27256), socket for 32KB Endgame ROM (ver. 2) - 8KB RAM (SRM2264LC) battery-backed - "HELIOS" NEC gate array - Epson SED1502F, LCD screen @@ -21,6 +21,7 @@ with hardware differences: 3MHz R65C02, 1 64KB ROM and no EGR socket. TODO: - where does the IRQ come from? same problem as with stratos +- verify that egr(1) does not work on real chesscomputer ***************************************************************************/ @@ -336,7 +337,7 @@ void simultano_state::simultano(machine_config &config) /* extension rom */ GENERIC_CARTSLOT(config, "extrom", generic_plain_slot, "saitek_egr"); - SOFTWARE_LIST(config, "cart_list").set_original("saitek_egr"); + SOFTWARE_LIST(config, "cart_list").set_original("saitek_egr").set_filter("egr2"); } diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index 7560713e304..953325efe54 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -858,7 +858,6 @@ void sapi_state::sapi3b(machine_config &config) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) // high bit stripped off in software DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/sb8085.cpp b/src/mame/drivers/sb8085.cpp index 55c35f0e4a3..af48a17a5c3 100644 --- a/src/mame/drivers/sb8085.cpp +++ b/src/mame/drivers/sb8085.cpp @@ -22,14 +22,19 @@ Space Byte also advertised a 16K static RAM board and a 2708/2716 EPROM programmer for use in this system. - Getting it to work: - 1. Slot CRT: choose Terminal + Getting it to work with the terminal: + 1. Slot CRT: choose Terminal. (The VTI should be removed from S100 slot + 1 or else its keyboard must be disabled later.) 2. Reboot - 3. Press E. It will autodetect the baud rate and start up + 3. Press A (certain other keys may work here). It will autodetect the + baud rate and start up. (Only 110, 150, 300, 1200, 2400, 4800 and + 9600 baud are detected properly.) 4. Now you can enter commands (such as D000,FFF) 5. If it says KEYBOARD ERROR it doesn't mean a problem with the keyboard, it means you made a mistake. + To use the monitor with the VTI, start by typing A (in uppercase). + ***************************************************************************/ #include "emu.h" @@ -270,7 +275,6 @@ static void sb8085_s100_devices(device_slot_interface &device) static DEVICE_INPUT_DEFAULTS_START(terminal) DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600) DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600) - DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1) DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_7) DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_EVEN) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_2) diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp index a85b44c7e2a..fcd18519d2f 100644 --- a/src/mame/drivers/scramble.cpp +++ b/src/mame/drivers/scramble.cpp @@ -1652,6 +1652,30 @@ ROM_START( mars ) ROM_LOAD( "c01s.6e", 0x0000, 0x0020, CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) ) ROM_END +// 2 PCB set: 10041A and 09041A. All ROMs have been dumped multiple times with different programmers, but needs a redump from a different PCB to be sure +ROM_START( marsarf ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "10041a.ma1", 0x0000, 0x0800, CRC(2fe47b97) SHA1(5e33bd8cdb7e510f5ecac5e59e687d7aa531f488) ) + ROM_LOAD( "10041a.ma3", 0x0800, 0x0800, CRC(5c37ed57) SHA1(bac8513894ccd06ac1461182e3a246ae590c6788) ) + ROM_LOAD( "10041a.ma2", 0x1000, 0x0800, CRC(06c6bb56) SHA1(404ddc600f0c41fa6358f86bb7a3159835d1a04d) ) + ROM_LOAD( "10041a.ma4", 0x1800, 0x0800, CRC(8e68a1a2) SHA1(6f5b176a4f3fef91646a2cb783e5b52c8c15fbfd) ) + ROM_LOAD( "10041a.ma5", 0x2000, 0x0800, CRC(5b7eac43) SHA1(d24034b6f6a4c93ce21142bcaac1dde014612793) ) + ROM_LOAD( "10041a.ma6", 0x2800, 0x0800, CRC(4b83a795) SHA1(b6a0f1096e3b649ce8d6d1b7f074df0d9dcec626) ) + ROM_LOAD( "10041a.ma7", 0x3000, 0x0800, CRC(a09f402e) SHA1(8799cd82f611bc8eef170f89f4f8d8a3d9a871b0) ) + + ROM_REGION( 0x10000, "audiocpu", 0 ) + ROM_LOAD( "09041a.s1", 0x0000, 0x0800, BAD_DUMP CRC(fd47b688) SHA1(211606011d41d870ce2fef22eb900c65ca08d64f) ) // always drops data bit 2 on address line 2, it's identical to the standard Scramble ROM otherwise + ROM_LOAD( "09041a.s2", 0x0800, 0x0800, CRC(de7912da) SHA1(8558b4eff5d7e63029b325edef9914feda5834c3) ) + ROM_LOAD( "09041a.s3", 0x1000, 0x0800, CRC(ebf90e0b) SHA1(9fedcaf0bff61f61d20b5876dcdf8705f4ab6e14) ) + + ROM_REGION( 0x1000, "gfx1", 0 ) // the game shows a corrupted M in MARS at the title screen. Verified it happens on PCB, too. Probably a bad ROM. + ROM_LOAD( "10041a.c1", 0x0000, 0x0800, CRC(3bd970ba) SHA1(f688d6066f894ae46a7888727d997b21c01b8e54) ) + ROM_LOAD( "10041a.c2", 0x0800, 0x0800, CRC(d9929b15) SHA1(6e1679a0204c62b885ac096e737d37005b6aa0ac) ) + + ROM_REGION( 0x0020, "proms", 0 ) + ROM_LOAD( "10041a_7603-5.bin", 0x0000, 0x0020, CRC(413703bf) SHA1(66648b2b28d3dcbda5bdb2605d1977428939dd3c) ) +ROM_END + ROM_START( devilfsh ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "u26.1", 0x0000, 0x0800, CRC(ec047d71) SHA1(c35555010fe239213e92946b65a54612d5a23399) ) @@ -2038,6 +2062,7 @@ GAME( 1981, 800fath, mariner, mariner, 800fath, scramble_state, init_mariner GAME( 1981, 800fatha, mariner, mariner, 800fath, scramble_state, init_mariner, ROT90, "Amenip (US Billiards Inc. license)", "800 Fathoms (older)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) GAME( 1981, mars, 0, mars, mars, scramble_state, init_mars, ROT90, "Artic", "Mars", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, marsarf, mars, mars, mars, scramble_state, empty_init, ROT90, "bootleg (Arfyc)", "Mars (bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // unencrypted, very similar to the original. Bad sound ROM GAME( 1982, devilfsh, 0, devilfsh, devilfsh, scramble_state, init_devilfsh, ROT90, "Artic", "Devil Fish", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/sdk80.cpp b/src/mame/drivers/sdk80.cpp index dec15907e97..02ec7cbabde 100644 --- a/src/mame/drivers/sdk80.cpp +++ b/src/mame/drivers/sdk80.cpp @@ -115,7 +115,6 @@ WRITE_LINE_MEMBER( sdk80_state::usart_clock_tick ) static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to 4800 DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_4800 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_4800 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp index 8a7b7be6330..96b310d16b2 100644 --- a/src/mame/drivers/sdk85.cpp +++ b/src/mame/drivers/sdk85.cpp @@ -216,7 +216,6 @@ u8 sdk85_state::kbd_r() static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_110 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_110 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp index cef0f11989d..f5c59868c11 100644 --- a/src/mame/drivers/sdk86.cpp +++ b/src/mame/drivers/sdk86.cpp @@ -169,7 +169,6 @@ void sdk86_state::machine_start() static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_4800 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_4800 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/seattlecmp.cpp b/src/mame/drivers/seattlecmp.cpp index ef8197a2d41..f8860479bbc 100644 --- a/src/mame/drivers/seattlecmp.cpp +++ b/src/mame/drivers/seattlecmp.cpp @@ -99,7 +99,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_19200 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index ad18084ea0a..5427177b5e2 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -75,7 +75,7 @@ void shootout_state::sound_cpu_command_w(uint8_t data) void shootout_state::flipscreen_w(uint8_t data) { - flip_screen_set(data & 0x01); + flip_screen_set(~data & 0x01); } /* @@ -432,7 +432,7 @@ void shootout_state::init_shootout() membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x8000, 0x4000); } - -GAME( 1985, shootout, 0, shootout, shootout, shootout_state, init_shootout, ROT0, "Data East USA", "Shoot Out (US)", MACHINE_SUPPORTS_SAVE ) -GAME( 1985, shootoutj, shootout, shootouj, shootouj, shootout_state, init_shootout, ROT0, "Data East Corporation", "Shoot Out (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1985, shootoutb, shootout, shootouk, shootout, shootout_state, init_shootout, ROT0, "bootleg", "Shoot Out (Korean Bootleg)", MACHINE_SUPPORTS_SAVE ) +// ROT180 confirmed by Kold +GAME( 1985, shootout, 0, shootout, shootout, shootout_state, init_shootout, ROT180, "Data East USA", "Shoot Out (US)", MACHINE_SUPPORTS_SAVE ) +GAME( 1985, shootoutj, shootout, shootouj, shootouj, shootout_state, init_shootout, ROT180, "Data East Corporation", "Shoot Out (Japan)", MACHINE_SUPPORTS_SAVE ) +GAME( 1985, shootoutb, shootout, shootouk, shootout, shootout_state, init_shootout, ROT180, "bootleg", "Shoot Out (Korean Bootleg)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index 150df0cefd6..81671a57e7b 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -2076,6 +2076,8 @@ PCB marked 'ROLLA REV. 1' and 'CTE 001 94V-0 0205' 1 JFC 95101 (AY8910 compatible) 4 8-dip banks 1 24.00 MHz XTAL (on the daughterboard) + +Has Random Games in GFX, possibly pointing to superb2k (same producer) also using a 8052 derived CPU under the epoxy block */ ROM_START( rolla ) @@ -2113,6 +2115,24 @@ ROM_START( score5 ) ROM_LOAD16_BYTE( "8_am27c100.u58", 0x40001, 0x20000, CRC(db20c424) SHA1(537c3b4dfb532473955042a58d204aebf60e950e) ) ROM_END +// this runs on a Rolla PCB with an unverified CPU enclosed in an epoxy block. GFX ROMs are half sized if compared to all the other supported sets. +ROM_START( superb2k ) + ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF ) + ROM_LOAD( "v5.u9", 0x00000, 0x10000, CRC(dbbc3062) SHA1(fd020571a610ea60ef207fd709e737506bf9300a) ) // ROM was outside the epoxy block + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD16_BYTE( "u29", 0x00000, 0x10000, CRC(b876a2a4) SHA1(e52020b71cf8e98f8d5f5caf98ec3bb2a0cd09f8) ) + ROM_LOAD16_BYTE( "u31", 0x00001, 0x10000, CRC(ab994cab) SHA1(7f50534a4c875049c8e80ec734ff4c5343f40d96) ) + ROM_LOAD16_BYTE( "u33", 0x40000, 0x10000, CRC(bbe554d4) SHA1(18b59b25d59f94a06ed59908b7d03f1adda8d90e) ) + ROM_LOAD16_BYTE( "u35", 0x40001, 0x10000, CRC(bbef9385) SHA1(f8aa5787ef6c510617c847a231c7e4cf59d7003f) ) + + ROM_REGION( 0x80000, "gfx2", 0 ) + ROM_LOAD16_BYTE( "u52", 0x00000, 0x10000, CRC(b0bb947a) SHA1(6822dd82b9be72b47ecaa412de4e070b372be170) ) + ROM_LOAD16_BYTE( "u54", 0x00001, 0x10000, CRC(065aa631) SHA1(ae5e8a952bd0a6b052ab7636240e0ebc495f09aa) ) + ROM_LOAD16_BYTE( "u56", 0x40000, 0x10000, CRC(b9121b69) SHA1(9a46444a63977d45392c6513550d132e5d2da365) ) + ROM_LOAD16_BYTE( "u58", 0x40001, 0x10000, CRC(0a7023aa) SHA1(2efdb4ad2acd90fff39144e08b012e39b571a682) ) +ROM_END + /********************************** * Driver Init * **********************************/ @@ -2204,5 +2224,6 @@ GAME( 199?, tigerslt, 0, skylncr, skylncr, skylncr_state, init_miacti GAME( 199?, sstar97, 0, sstar97, sstar97, skylncr_state, empty_init, ROT0, "Bordun International", "Super Star 97 / Ming Xing 97 (version V153B)", MACHINE_SUPPORTS_SAVE ) GAME( 1995, bdream97, 0, bdream97, skylncr, skylncr_state, empty_init, ROT0, "bootleg (KKK)", "Hudie Meng 97", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) GAME( 2000, sonikfig, 0, skylncr, sonikfig, skylncr_state, init_sonikfig, ROT0, "Z Games", "Sonik Fighter (version 02, encrypted)", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -GAME( 199?, rolla, 0, skylncr, skylncr, skylncr_state, empty_init, ROT0, "<unknown>", "unknown 'Rolla' slot machine", MACHINE_IS_SKELETON ) // internal CPU ROM not dumped +GAME( 199?, rolla, 0, skylncr, skylncr, skylncr_state, empty_init, ROT0, "Random Games", "unknown 'Rolla' slot machine", MACHINE_IS_SKELETON ) // internal CPU ROM not dumped GAME( 2000?,score5, 0, skylncr, score5, skylncr_state, init_sonikfig, ROT0, "Z Games", "Score 5", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // game runs but screen is completely black due to palette mishandling +GAME( 2000?,superb2k, 0, skylncr, skylncr, skylncr_state, empty_init, ROT0, "Random Games", "Super Butterfly 2000", MACHINE_IS_SKELETON ) // encrypted / different CPU type ? diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index cca973ac016..039680dda14 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -6937,6 +6937,7 @@ ROM_END /***********************************************************************/ +// TODO: according to Kold at very least Athena is ROT180 not ROT0 GAME( 1983, marvins, 0, marvins, marvins, snk_state, empty_init, ROT270, "SNK", "Marvin's Maze", 0 ) GAME( 1984, vangrd2, 0, vangrd2, vangrd2, snk_state, empty_init, ROT270, "SNK", "Vanguard II", 0 ) GAME( 1984, madcrash, 0, vangrd2, madcrash, snk_state, empty_init, ROT0, "SNK", "Mad Crasher", 0 ) diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp index 9798b6199bc..4a4bbc1bd37 100644 --- a/src/mame/drivers/softbox.cpp +++ b/src/mame/drivers/softbox.cpp @@ -291,7 +291,6 @@ void softbox_state::ppi1_pc_w(uint8_t data) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index 5eec67d75e4..dc05676a319 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -435,7 +435,6 @@ static const floppy_interface sorcerer_floppy_interface = static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_1200 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_1200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp index 4a9785c5810..9f6b843e6b4 100644 --- a/src/mame/drivers/superslave.cpp +++ b/src/mame/drivers/superslave.cpp @@ -308,7 +308,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/tabe22.cpp b/src/mame/drivers/tabe22.cpp index e075a67d185..7c0997fe300 100644 --- a/src/mame/drivers/tabe22.cpp +++ b/src/mame/drivers/tabe22.cpp @@ -239,7 +239,6 @@ void printer_devices(device_slot_interface &device) static DEVICE_INPUT_DEFAULTS_START( printer_defaults ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_4800 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_4800 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_ODD ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index 21748861b5c..6a29175f515 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -389,7 +389,6 @@ void ivg09_state::kbd_put(u8 data) static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_1200 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_1200 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp index c51441df698..c9d723a8bed 100644 --- a/src/mame/drivers/tim100.cpp +++ b/src/mame/drivers/tim100.cpp @@ -94,7 +94,6 @@ INPUT_PORTS_END static DEVICE_INPUT_DEFAULTS_START( keyboard ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_ODD ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) @@ -103,7 +102,6 @@ DEVICE_INPUT_DEFAULTS_END static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) diff --git a/src/mame/drivers/tricep.cpp b/src/mame/drivers/tricep.cpp index b7ebd2c1db3..41855eaa599 100644 --- a/src/mame/drivers/tricep.cpp +++ b/src/mame/drivers/tricep.cpp @@ -99,7 +99,6 @@ static const input_device_default terminal_defaults[] = { DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index ddb5e51fb49..da5191a1136 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -609,7 +609,6 @@ GFXDECODE_END static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_300 ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_300 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_ODD ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/machine/acs8600_ics.cpp b/src/mame/machine/acs8600_ics.cpp index 5cd6a1c46c5..37a2100167c 100644 --- a/src/mame/machine/acs8600_ics.cpp +++ b/src/mame/machine/acs8600_ics.cpp @@ -59,7 +59,6 @@ WRITE_LINE_MEMBER(acs8600_ics_device::attn_w) static DEVICE_INPUT_DEFAULTS_START(altos8600_terminal) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index 348351f4dad..03ee565f5e4 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -1168,7 +1168,6 @@ void apollo_state::apollo(machine_config &config) static DEVICE_INPUT_DEFAULTS_START( apollo_terminal ) DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) - DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 ) DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 ) DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) diff --git a/src/mame/machine/ngen_kb.cpp b/src/mame/machine/ngen_kb.cpp index 7d418649fba..3f363de2533 100644 --- a/src/mame/machine/ngen_kb.cpp +++ b/src/mame/machine/ngen_kb.cpp @@ -42,10 +42,6 @@ static INPUT_PORTS_START( ngen_keyboard ) PORT_CONFNAME(0xff, RS232_BAUD_19200, "TX Baud") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) PORT_CONFSETTING( RS232_BAUD_19200, "19200") // TODO: Based on the RAM refresh timer (~78kHz) to be 19530Hz - PORT_START("RS232_STARTBITS") - PORT_CONFNAME(0xff, RS232_STARTBITS_1, "Start Bits") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) - PORT_CONFSETTING( RS232_STARTBITS_1, "1") - PORT_START("RS232_DATABITS") PORT_CONFNAME(0xff, RS232_DATABITS_8, "Data Bits") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, serial_keyboard_device, update_serial) PORT_CONFSETTING( RS232_DATABITS_8, "8") diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 3c9033355cc..545d706b2cb 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -15031,6 +15031,9 @@ pcv20 // 198? PC-XT with V20 CPU @source:getaway.cpp getaway +@source:gfamily.cpp +gmfamily // + @source:ggconnie.cpp fishingm // (c) 1997 Capcom ggconnie // (c) ???? Capcom @@ -36580,6 +36583,7 @@ knockoutb // bootleg knockoutc // mariner // (c) 1981 Amenip mars // (c) 1981 Artic +marsarf // bootleg (Arfyc) mrkougar // (c) 1984 ATW mrkougar2 // (c) 1984 ATW mrkougb // bootleg @@ -37968,6 +37972,7 @@ score5 // Z Games skylncr // (c) 1995 Bordun International sonikfig // Z Games sstar97 // (c) 199? Bordun International +superb2k // Random Games tigerslt // Bootleg? @source:skyraid.cpp |