diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index 438f828451f..a87c984c563 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -2,16 +2,18 @@ // copyright-holders:Carl #include "emu.h" +#include "machine/at.h" + #include "bus/isa/isa_cards.h" #include "cpu/i86/i286.h" #include "machine/8042kbdc.h" -#include "machine/at.h" #include "machine/ds6417.h" #include "sound/dac.h" #include "sound/ymopl.h" #include "video/pc_vga.h" -#include "speaker.h" + #include "softlist_dev.h" +#include "speaker.h" class vis_audio_device : public device_t, diff --git a/src/mame/drivers/wms_shuffle.cpp b/src/mame/drivers/wms_shuffle.cpp index 0828fa13aa3..182a0ace199 100644 --- a/src/mame/drivers/wms_shuffle.cpp +++ b/src/mame/drivers/wms_shuffle.cpp @@ -519,11 +519,10 @@ void shuffle_state::s4(machine_config &config) void shuffle_state::s9(machine_config &config) { s4(config); - config.device_remove("maincpu"); config.device_remove("pia22"); config.device_remove("s4sound"); - M6802(config, m_maincpu, XTAL(4'000'000)); + M6802(config.replace(), m_maincpu, XTAL(4'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &shuffle_state::s9_map); config.set_default_layout(layout_shuffle9); diff --git a/uismall.bdf b/uismall.bdf index 4e2cd00136a..2ecb22e4cd7 100644 --- a/uismall.bdf +++ b/uismall.bdf @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT Copyright (C) 1997-2021 MAMEDev and contributors +COMMENT Copyright (C) 1997-2022 MAMEDev and contributors FONT -mamedev-uismall-Medium-R-Normal--16-120-96-96-P-100-ISO10646-1 SIZE 12 96 96 FONTBOUNDINGBOX 8 11 0 -2 @@ -12,7 +12,7 @@ FONT_ASCENT 9 FONT_DESCENT 2 AVERAGE_WIDTH 100 SPACING "P" -_GBDFED_INFO "Edited with gbdfed 1.5." +_GBDFED_INFO "Edited with gbdfed 1.6." FOUNDRY "mamedev" FAMILY_NAME "uismall" WEIGHT_NAME "Medium" @@ -23,7 +23,7 @@ CHARSET_REGISTRY "ISO10646" CHARSET_ENCODING "1" DEFAULT_CHAR 173 ENDPROPERTIES -CHARS 1024 +CHARS 1081 STARTCHAR space ENCODING 32 SWIDTH 250 0 @@ -5858,6 +5858,22 @@ F0 90 60 ENDCHAR +STARTCHAR char478 +ENCODING 478 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 9 0 0 +BITMAP +70 +00 +50 +00 +70 +88 +F8 +88 +88 +ENDCHAR STARTCHAR char479 ENCODING 479 SWIDTH 312 0 @@ -13551,6 +13567,700 @@ BITMAP 00 80 ENDCHAR +STARTCHAR char8592 +ENCODING 8592 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +20 +40 +F8 +40 +20 +ENDCHAR +STARTCHAR char8593 +ENCODING 8593 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +20 +70 +A8 +20 +20 +ENDCHAR +STARTCHAR char8594 +ENCODING 8594 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +20 +10 +F8 +10 +20 +ENDCHAR +STARTCHAR char8595 +ENCODING 8595 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +20 +20 +A8 +70 +20 +ENDCHAR +STARTCHAR char8596 +ENCODING 8596 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 5 0 0 +BITMAP +28 +44 +FE +44 +28 +ENDCHAR +STARTCHAR char8597 +ENCODING 8597 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +70 +A8 +20 +A8 +70 +20 +ENDCHAR +STARTCHAR char8598 +ENCODING 8598 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +F0 +C0 +A0 +90 +08 +ENDCHAR +STARTCHAR char8599 +ENCODING 8599 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +78 +18 +28 +48 +80 +ENDCHAR +STARTCHAR char8600 +ENCODING 8600 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +80 +48 +28 +18 +78 +ENDCHAR +STARTCHAR char8601 +ENCODING 8601 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +08 +90 +A0 +C0 +F0 +ENDCHAR +STARTCHAR char8610 +ENCODING 8610 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +24 +48 +F0 +48 +24 +ENDCHAR +STARTCHAR char8611 +ENCODING 8611 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +90 +48 +3C +48 +90 +ENDCHAR +STARTCHAR char8619 +ENCODING 8619 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 5 0 0 +BITMAP +24 +4A +FC +48 +20 +ENDCHAR +STARTCHAR char8620 +ENCODING 8620 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 5 0 0 +BITMAP +48 +A4 +7E +24 +08 +ENDCHAR +STARTCHAR char8651 +ENCODING 8651 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +40 +F8 +00 +F8 +10 +20 +ENDCHAR +STARTCHAR char8652 +ENCODING 8652 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +10 +F8 +00 +F8 +40 +20 +ENDCHAR +STARTCHAR char8676 +ENCODING 8676 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +90 +A0 +FC +A0 +90 +ENDCHAR +STARTCHAR char8677 +ENCODING 8677 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +24 +14 +FC +14 +24 +ENDCHAR +STARTCHAR char8702 +ENCODING 8702 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +10 +18 +F4 +18 +10 +ENDCHAR +STARTCHAR char8703 +ENCODING 8703 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 5 0 0 +BITMAP +28 +6C +BA +6C +28 +ENDCHAR +STARTCHAR char10514 +ENCODING 10514 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +F8 +20 +70 +A8 +20 +20 +ENDCHAR +STARTCHAR char10515 +ENCODING 10515 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +20 +20 +A8 +70 +20 +F8 +ENDCHAR +STARTCHAR char10570 +ENCODING 10570 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +20 +40 +FC +08 +10 +ENDCHAR +STARTCHAR char10571 +ENCODING 10571 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +10 +08 +FC +40 +20 +ENDCHAR +STARTCHAR char10572 +ENCODING 10572 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +20 +30 +28 +A0 +60 +20 +ENDCHAR +STARTCHAR char10573 +ENCODING 10573 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +20 +60 +A0 +28 +30 +20 +ENDCHAR +STARTCHAR char10574 +ENCODING 10574 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 3 0 2 +BITMAP +28 +44 +FE +ENDCHAR +STARTCHAR char10575 +ENCODING 10575 +SWIDTH 312 0 +DWIDTH 5 0 +BBX 4 7 0 0 +BITMAP +40 +60 +50 +40 +50 +60 +40 +ENDCHAR +STARTCHAR char10576 +ENCODING 10576 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 3 0 0 +BITMAP +FE +44 +28 +ENDCHAR +STARTCHAR char10577 +ENCODING 10577 +SWIDTH 312 0 +DWIDTH 5 0 +BBX 3 7 0 0 +BITMAP +20 +60 +A0 +20 +A0 +60 +20 +ENDCHAR +STARTCHAR char10578 +ENCODING 10578 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +90 +A0 +FC +80 +80 +ENDCHAR +STARTCHAR char10579 +ENCODING 10579 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +24 +14 +FC +04 +04 +ENDCHAR +STARTCHAR char10580 +ENCODING 10580 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +F8 +20 +30 +28 +20 +20 +ENDCHAR +STARTCHAR char10581 +ENCODING 10581 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +20 +20 +28 +30 +20 +F8 +ENDCHAR +STARTCHAR char10582 +ENCODING 10582 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +80 +80 +FC +A0 +90 +ENDCHAR +STARTCHAR char10583 +ENCODING 10583 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +04 +04 +FC +14 +24 +ENDCHAR +STARTCHAR char10584 +ENCODING 10584 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +F8 +20 +60 +A0 +20 +20 +ENDCHAR +STARTCHAR char10585 +ENCODING 10585 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +20 +20 +A0 +60 +20 +F8 +ENDCHAR +STARTCHAR char10586 +ENCODING 10586 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +24 +44 +FC +04 +04 +ENDCHAR +STARTCHAR char10587 +ENCODING 10587 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +90 +88 +FC +80 +80 +ENDCHAR +STARTCHAR char10588 +ENCODING 10588 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +20 +30 +28 +20 +20 +F8 +ENDCHAR +STARTCHAR char10589 +ENCODING 10589 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +F8 +20 +20 +28 +30 +20 +ENDCHAR +STARTCHAR char10590 +ENCODING 10590 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +04 +04 +FC +44 +24 +ENDCHAR +STARTCHAR char10591 +ENCODING 10591 +SWIDTH 437 0 +DWIDTH 7 0 +BBX 6 5 0 0 +BITMAP +80 +80 +FC +88 +90 +ENDCHAR +STARTCHAR char10592 +ENCODING 10592 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +20 +60 +A0 +20 +20 +F8 +ENDCHAR +STARTCHAR char10593 +ENCODING 10593 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 6 0 0 +BITMAP +F8 +20 +20 +A0 +60 +20 +ENDCHAR +STARTCHAR char10594 +ENCODING 10594 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +40 +F8 +00 +F8 +40 +20 +ENDCHAR +STARTCHAR char10595 +ENCODING 10595 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 5 0 0 +BITMAP +28 +6C +AA +28 +28 +ENDCHAR +STARTCHAR char10596 +ENCODING 10596 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 7 0 0 +BITMAP +20 +10 +F8 +00 +F8 +10 +20 +ENDCHAR +STARTCHAR char10597 +ENCODING 10597 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 5 0 0 +BITMAP +28 +28 +AA +6C +28 +ENDCHAR +STARTCHAR char10602 +ENCODING 10602 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 2 +BITMAP +20 +40 +F8 +00 +F8 +ENDCHAR +STARTCHAR char10603 +ENCODING 10603 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +F8 +00 +F8 +40 +20 +ENDCHAR +STARTCHAR char10604 +ENCODING 10604 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 2 +BITMAP +20 +10 +F8 +00 +F8 +ENDCHAR +STARTCHAR char10605 +ENCODING 10605 +SWIDTH 375 0 +DWIDTH 6 0 +BBX 5 5 0 0 +BITMAP +F8 +00 +F8 +40 +20 +ENDCHAR +STARTCHAR char10606 +ENCODING 10606 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 5 0 0 +BITMAP +28 +68 +AA +2C +28 +ENDCHAR +STARTCHAR char10607 +ENCODING 10607 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 7 5 0 0 +BITMAP +28 +2C +AA +68 +28 +ENDCHAR STARTCHAR char65377 ENCODING 65377 SWIDTH 375 0