From 678cd3c9219c131366f4dcca29cb338257df9b43 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 28 Mar 2021 09:38:11 -0400 Subject: asma2k: Fix memory-related regression --- src/mame/drivers/alphasma.cpp | 52 ++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp index 3eb07232fa5..6310f3db734 100644 --- a/src/mame/drivers/alphasma.cpp +++ b/src/mame/drivers/alphasma.cpp @@ -9,6 +9,10 @@ TODO: - ADB and PS/2 - charset ROM is wrong + - asma2k keyboard doesn't work + - asma2k accesses memory below 0x8000; is there more ROM there? + - asma2k reads from nonexistent internal register at 0x0001 + (probably a bug, since the same code exists in both BIOSes) ****************************************************************************/ @@ -77,18 +81,20 @@ class asma2k_state : public alphasmart_state public: asma2k_state(const machine_config &mconfig, device_type type, const char *tag) : alphasmart_state(mconfig, type, tag) + , m_io_view(*this, "io") { } void asma2k(machine_config &config); private: - uint8_t io_r(offs_t offset); - void io_w(offs_t offset, uint8_t data); + void lcd_ctrl_w(uint8_t data); virtual void port_a_w(uint8_t data) override; void asma2k_mem(address_map &map); + memory_view m_io_view; + uint8_t m_lcd_ctrl; }; @@ -178,41 +184,16 @@ void alphasmart_state::alphasmart_mem(address_map &map) map(0xc000, 0xc000).w(FUNC(alphasmart_state::kb_matrixl_w)); } -uint8_t asma2k_state::io_r(offs_t offset) -{ - if (offset == 0x2000) - return kb_r(); - - //else printf("unknown r: %x\n", offset); - - return 0; -} - -void asma2k_state::io_w(offs_t offset, uint8_t data) +void asma2k_state::lcd_ctrl_w(uint8_t data) { - if (offset == 0x2000) - kb_matrixh_w(data); - else if (offset == 0x4000) - { - uint8_t changed = (m_lcd_ctrl ^ data) & data; - update_lcdc(changed & 0x01, changed & 0x02); - m_lcd_ctrl = data; - } - - //else printf("unknown w: %x %x\n", offset, data); + uint8_t changed = (m_lcd_ctrl ^ data) & data; + update_lcdc(changed & 0x01, changed & 0x02); + m_lcd_ctrl = data; } void asma2k_state::port_a_w(uint8_t data) { - if ((m_port_a ^ data) & 0x40) - { - address_space &space = m_maincpu->space(AS_PROGRAM); - - if (data & 0x40) - space.install_readwrite_bank(0x0000, 0x7fff, m_rambank); - else - space.install_readwrite_handler(0x0000, 0x7fff, read8sm_delegate(*this, FUNC(asma2k_state::io_r)), write8sm_delegate(*this, FUNC(asma2k_state::io_w))); - } + m_io_view.select(BIT(data, 6)); m_rambank->set_entry(((data>>4) & 0x03)); m_port_a = data; @@ -222,7 +203,12 @@ void asma2k_state::port_a_w(uint8_t data) void asma2k_state::asma2k_mem(address_map &map) { map.unmap_value_high(); - map(0x0000, 0x7fff).bankrw("rambank"); + map(0x0000, 0x7fff).view(m_io_view); + m_io_view[0](0x2000, 0x2000).rw(FUNC(asma2k_state::kb_r), FUNC(asma2k_state::kb_matrixh_w)); + m_io_view[0](0x4000, 0x4000).w(FUNC(asma2k_state::lcd_ctrl_w)); + m_io_view[0](0x7fd4, 0x7fd7).lr8(NAME([]() { return 0; })); // ? + m_io_view[0](0x7fe8, 0x7feb).lr8(NAME([]() { return 0; })); // ? + m_io_view[1](0x0000, 0x7fff).bankrw("rambank"); map(0x8000, 0xffff).rom().region("maincpu", 0); map(0x9000, 0x9000).w(FUNC(asma2k_state::kb_matrixl_w)); } -- cgit v1.2.3 From 438edcd151dae46de91c54a6e0c5ead8ed8f3800 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 29 Mar 2021 04:30:37 +1100 Subject: Fix building with clang 6 Annoyingly, clang 6 produces warnings for unused private static data members, but does not recognise the [[maybe_unused]] attribute for them. --- scripts/genie.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/genie.lua b/scripts/genie.lua index 895e8e3df3e..7ecd386cafa 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1086,6 +1086,12 @@ end "-Wno-unknown-warning-option", "-Wno-unused-value", } + if (version < 70000) or ((version < 100001) and (_OPTIONS["targetos"] == 'macosx')) then + buildoptions { -- clang 6.0 complains that [[maybe_unused]] is ignored for static data members + "-Wno-error=ignored-attributes", + "-Wno-error=unused-const-variable", + } + end if ((version >= 100000) and (_OPTIONS["targetos"] ~= 'macosx')) or (version >= 120000) then buildoptions { "-Wno-xor-used-as-pow", -- clang 10.0 complains that expressions like 10 ^ 7 look like exponention -- cgit v1.2.3 From 6a2743a4920db3b606a69e512e9a15f827806815 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Mon, 29 Mar 2021 22:25:45 +0200 Subject: floppy: Fix an annoyingly subtle write bug --- src/devices/imagedev/floppy.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 9fd39fae6e5..2d3fd334afb 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -1157,14 +1157,16 @@ void floppy_image_device::write_flux(const attotime &start, const attotime &end, buf.push_back(floppy_image::MG_N); } + uint32_t cur_mg; if((buf[index] & floppy_image::TIME_MASK) == start_pos) { if(index) - index--; + cur_mg = buf[index-1]; else - index = buf.size() - 1; - } + cur_mg = buf[buf.size() - 1]; + } else + cur_mg = buf[index]; - uint32_t cur_mg = buf[index] & floppy_image::MG_MASK; + cur_mg &= floppy_image::MG_MASK; if(cur_mg == floppy_image::MG_N || cur_mg == floppy_image::MG_D) cur_mg = floppy_image::MG_A; @@ -1293,7 +1295,6 @@ void floppy_image_device::write_zone(uint32_t *buf, int &cells, int &index, uint spos = epos; } } - } } -- cgit v1.2.3 From 2610d8771d77136c55853abb95212804cab8fec5 Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 29 Mar 2021 22:48:14 -0400 Subject: Restore legacy pc_dsk floppy support for imgtool only --- scripts/src/tools.lua | 2 + src/tools/imgtool/formats/pc_dsk_legacy.cpp | 138 ++++++++++++++++++++++++++++ src/tools/imgtool/formats/pc_dsk_legacy.h | 21 +++++ src/tools/imgtool/modules/pc_flop.cpp | 4 +- 4 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 src/tools/imgtool/formats/pc_dsk_legacy.cpp create mode 100644 src/tools/imgtool/formats/pc_dsk_legacy.h diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 0f59b97ae4f..b3fb64c30c0 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -681,6 +681,8 @@ files { MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.cpp", + MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.h", MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp", MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp", MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp", diff --git a/src/tools/imgtool/formats/pc_dsk_legacy.cpp b/src/tools/imgtool/formats/pc_dsk_legacy.cpp new file mode 100644 index 00000000000..10bf22153f5 --- /dev/null +++ b/src/tools/imgtool/formats/pc_dsk_legacy.cpp @@ -0,0 +1,138 @@ +// license:BSD-3-Clause +// copyright-holders:Nathan Woods +/********************************************************************* + + formats/pc_dsk_legacy.cpp + + PC disk images (legacy support for imgtool) + +*********************************************************************/ + +#include "formats/pc_dsk_legacy.h" +#include "formats/basicdsk.h" + +struct pc_disk_sizes +{ + uint32_t image_size; + int sectors; + int heads; +}; + + + +static const struct pc_disk_sizes disk_sizes[] = +{ + { 8*1*40*512, 8, 1}, /* 5 1/4 inch double density single sided */ + { 8*2*40*512, 8, 2}, /* 5 1/4 inch double density */ + { 9*1*40*512, 9, 1}, /* 5 1/4 inch double density single sided */ + { 9*2*40*512, 9, 2}, /* 5 1/4 inch double density */ + {10*2*40*512, 10, 2}, /* 5 1/4 inch double density single sided */ + { 9*2*80*512, 9, 2}, /* 80 tracks 5 1/4 inch drives rare in PCs */ + { 9*2*80*512, 9, 2}, /* 3 1/2 inch double density */ + {15*2*80*512, 15, 2}, /* 5 1/4 inch high density (or japanese 3 1/2 inch high density) */ + {18*2*80*512, 18, 2}, /* 3 1/2 inch high density */ + {21*2*80*512, 21, 2}, /* 3 1/2 inch high density DMF */ + {36*2*80*512, 36, 2} /* 3 1/2 inch enhanced density */ +}; + + + +static floperr_t pc_dsk_compute_geometry(floppy_image_legacy *floppy, struct basicdsk_geometry *geometry) +{ + int i; + uint64_t size; + + memset(geometry, 0, sizeof(*geometry)); + size = floppy_image_size(floppy); + + for (i = 0; i < std::size(disk_sizes); i++) + { + if (disk_sizes[i].image_size == size) + { + geometry->sectors = disk_sizes[i].sectors; + geometry->heads = disk_sizes[i].heads; + geometry->sector_length = 512; + geometry->first_sector_id = 1; + geometry->tracks = (int) (size / disk_sizes[i].sectors / disk_sizes[i].heads / geometry->sector_length); + return FLOPPY_ERROR_SUCCESS; + } + } + + if (size >= 0x1a) + { + /* + * get info from boot sector. + * not correct on all disks + */ + uint8_t scl, spt, heads; + floppy_image_read(floppy, &scl, 0x0c, 1); + floppy_image_read(floppy, &spt, 0x18, 1); + floppy_image_read(floppy, &heads, 0x1A, 1); + + if (size == ((uint64_t) scl) * spt * heads * 0x200) + { + geometry->sectors = spt; + geometry->heads = heads; + geometry->sector_length = 512; + geometry->first_sector_id = 1; + geometry->tracks = scl; + return FLOPPY_ERROR_SUCCESS; + } + } + + return FLOPPY_ERROR_SUCCESS; +} + + + +static FLOPPY_IDENTIFY(pc_dsk_identify) +{ + floperr_t err; + struct basicdsk_geometry geometry; + + err = pc_dsk_compute_geometry(floppy, &geometry); + if (err) + return err; + + *vote = geometry.heads ? 100 : 0; + return FLOPPY_ERROR_SUCCESS; +} + + + +static FLOPPY_CONSTRUCT(pc_dsk_construct) +{ + floperr_t err; + struct basicdsk_geometry geometry; + + if (params) + { + /* create */ + memset(&geometry, 0, sizeof(geometry)); + geometry.heads = params->lookup_int(PARAM_HEADS); + geometry.tracks = params->lookup_int(PARAM_TRACKS); + geometry.sectors = params->lookup_int(PARAM_SECTORS); + geometry.first_sector_id = 1; + geometry.sector_length = 512; + } + else + { + /* open */ + err = pc_dsk_compute_geometry(floppy, &geometry); + if (err) + return err; + } + + return basicdsk_construct(floppy, &geometry); +} + + + +/* ----------------------------------------------------------------------- */ + +LEGACY_FLOPPY_OPTIONS_START( pc ) + LEGACY_FLOPPY_OPTION( pc_dsk, "dsk,ima,img,ufi,360", "PC floppy disk image", pc_dsk_identify, pc_dsk_construct, nullptr, + HEADS([1]-2) + TRACKS(40/[80]) + SECTORS(8/[9]/10/15/18/36)) +LEGACY_FLOPPY_OPTIONS_END diff --git a/src/tools/imgtool/formats/pc_dsk_legacy.h b/src/tools/imgtool/formats/pc_dsk_legacy.h new file mode 100644 index 00000000000..86fbc7a2546 --- /dev/null +++ b/src/tools/imgtool/formats/pc_dsk_legacy.h @@ -0,0 +1,21 @@ +// license:BSD-3-Clause +// copyright-holders:Nathan Woods +/********************************************************************* + + formats/pc_dsk_legacy.h + + PC disk images (legacy support for imgtool) + +*********************************************************************/ + +#ifndef PC_DSK_LEGACY_H +#define PC_DSK_LEGACY_H + +#include "formats/flopimg.h" + + +/**************************************************************************/ + +LEGACY_FLOPPY_OPTIONS_EXTERN(pc); + +#endif /* PC_DSK_LEGACY_H */ diff --git a/src/tools/imgtool/modules/pc_flop.cpp b/src/tools/imgtool/modules/pc_flop.cpp index 8ee5ae8a8ec..ea2a8f8abe0 100644 --- a/src/tools/imgtool/modules/pc_flop.cpp +++ b/src/tools/imgtool/modules/pc_flop.cpp @@ -10,7 +10,7 @@ #include "imgtool.h" #include "formats/imageutl.h" -#include "formats/pc_dsk.h" +#include "formats/pc_dsk_legacy.h" #include "fat.h" #include "iflopimg.h" @@ -163,7 +163,7 @@ void pc_floppy_get_info(const imgtool_class *imgclass, uint32_t state, union img /* --- the following bits of info are returned as pointers to data or functions --- */ case IMGTOOLINFO_PTR_MAKE_CLASS: info->make_class = imgtool_floppy_make_class; break; case IMGTOOLINFO_PTR_FLOPPY_CREATE: info->create = fat_image_create; break; - case IMGTOOLINFO_PTR_FLOPPY_FORMAT: info->p = nullptr; break; + case IMGTOOLINFO_PTR_FLOPPY_FORMAT: info->p = (void *) floppyoptions_pc; break; case IMGTOOLINFO_PTR_READ_BLOCK: info->read_block = fat_image_readblock; break; case IMGTOOLINFO_PTR_WRITE_BLOCK: info->write_block = fat_image_writeblock; break; case IMGTOOLINFO_PTR_GET_GEOMETRY: info->get_geometry = fat_image_get_geometry; break; -- cgit v1.2.3 From 943c06cba087c19574714e26e68f5668c87730f1 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 30 Mar 2021 22:19:45 +1100 Subject: version bump --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index a3e31808348..fd34954db6e 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 0b97180cd4b..0c1b144584a 100644 --- a/makefile +++ b/makefile @@ -1745,14 +1745,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.229"' > $@ + @echo '#define BARE_BUILD_VERSION "0.230"' > $@ @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.229" > $@ + @echo #define BARE_BUILD_VERSION "0.230" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ -- cgit v1.2.3