Commit graph

27 commits

Author SHA1 Message Date
ac0ccec3f9 Try to mount a new disc always
.. even if the eject action didn't appear to eject anything
2025-04-16 19:39:08 +02:00
f34ec2a1b9 Initialize local variable 2025-04-16 19:37:58 +02:00
15d0a7b623 ensure to close disc after it's mmap'd 2025-04-04 21:27:52 +02:00
19f975ac6c fix mounting discs when called for
by not clearing the accrun flag, the dialog to insert a previously
ejected disc successfully causes the emulated mac to cycle to the
correct disc.

This worked in several cases I tested, though in the specific case
of an older OS (About Finder says 5.3) with a newer floppy
(HyperCardBootSystem7.img) the hypercard floppy keeps adding a new
desktop icon everytime it's ejected then re-loaded, and the request
to load it can never be satisfied.
2025-04-04 18:47:23 +02:00
b4e41a6739 multi discs
you can specify a directory as the second -d argument and then cycle
among them by dragging to trash. Using eject doesn't work very well,
because it leaves a ghost on the desktop and accessing it has no way
of completing.
2025-04-04 16:17:19 +02:00
46c886d9e5 WIP disc collections 2025-04-04 08:16:41 +02:00
cd98358391 Use emul_ret when calling a trap 2025-04-03 20:12:20 +02:00
a59b9fbeb3 manipulate the DiskInPlace flag better 2025-03-29 21:45:02 -05:00
24c8b1ebe6 It successfully mounted a 2nd disc!
with caveats
2025-03-29 21:22:53 -05:00
b12811d05b Add basic dependency analysis 2025-03-29 10:17:46 -05:00
a16d721ce8 unix_main: Support specification of multiple disc images.
This doesn't do anything yet, only the first disc image is
actually mounted.
2025-03-29 10:04:12 -05:00
Matt Evans
b62d3c6e72 Bump external/Musashi
Fixes some pesky build warnings, mostly cosmetic.
2025-01-01 18:38:50 +00:00
Matt Evans
606f7f75fe README: updates for screen resolution configuration
Bump to v0.22
2024-12-16 23:16:43 +00:00
Matt Evans
59109b5f6a mem2scr: Make resolution-agnostic by reading OS X/Y resolution
This tool can now take screenshots of non-standard screen resolution builds by
reading the screen res from OS variables.
2024-12-16 23:16:43 +00:00
Matt Evans
a9be35c7b3 rom: Support variable screen res in MacPlusV3 ROM
This change adds a boatload of ROM patches to alter screen base, resolution,
words-per-line, and related variables so that MacOS will function correctly
with a framebuffer other than 512x342 (which remains the default).

The majority of the patches are actually to make ROM-drawn low-level things
(such as disc icons, happy/sad Mac icons/crash hexadecimal info) render
right and be positioned correctly.

This works up to about 800x600; the limiting factor is patching int16
immediates for certain instructions, meaning a ~64KB framebuffer size
is the current limit without more work.

The Makefile can now take DISP_WIDTH/DISP_HEIGHT parameters to configure
a build.  There is no support for dynamic switching, or runtime-selected
switching.
2024-12-16 23:16:43 +00:00
Matt Evans
183a1472bb umac.h: Calculate screen base based on resolution defines, remove hardwiring 2024-12-16 23:16:43 +00:00
Matt Evans
9b3dd31d56 unix_main: Remove hardcoded X display resolution 2024-12-16 23:16:43 +00:00
Matt Evans
83ca8a1cfe Clean up compilation warnings
Various functions dropped a void declaration (lazy), which is added.
Removed an unused variable in unix_main.
2024-12-16 23:16:43 +00:00
Matt Evans
5d23667c8e Update README with info on memory configs
Bumps to v0.21
2024-08-27 01:11:39 +01:00
Matt Evans
954636e9db Support 'strange' memory sizes, such as 256K, 192K
Additional ROM patches manually set the memTop variable to a given
memory size, and the memory test routine is skipped.  This allows
the Plus ROM to cope with a Mac 256K configuration, but also non-
power-of-two sizes.  That's useful for an MCU, making a Mac 208K,
Mac 192K, etc. possible.

Memory addresses are clamped such that wrapping within the RAM
region works, and any emulated address can be used without
overflowing the host RAM allocation.  For a power-of-two memory
size this boils down (after compiler optimisation) to a plain
tmask; for non-Po2, this involves a divide/mod in the weird ROM
probing "off the end" cases, and a simple compare in all other
runtime cases (so shouldn't be too slow).
2024-08-27 01:11:39 +01:00
Matt Evans
1ada25b956 README: bump version/date 2024-08-18 17:45:54 +01:00
Matt Evans
854e89e162 Add disc read/write callbacks
Instead of relying on the disc data being directly mapped, and
accessing blocks by memcpy'ing from it, provide op_read/op_write
callbacks so that the host can do disc ops itself (e.g. access SD).

The disc_descr_t describes the callbacks (and an opaque pointer
passed as an argument when they are invoked), per-disc.
2024-08-18 17:45:54 +01:00
Matt Evans
f0ff05081c Add MEMSIZE build-time parameter to set memory size
By default, this is 128 (for 128KB).  Usable values are 128, 512,
1024, 2048, 4096.
2024-08-18 17:45:54 +01:00
Matt Evans
5449bb9697 scc: Improve RR0 status bits
...slightly.  This shows the sync/hunt status, and TxUnderrun, which
are expected by system 7's startup.  (It enables SDLC mode and probes
stuff.)

With this (and increasing memory, e.g. 4MB), umac boots 7.5.5 :)
2024-08-18 17:45:54 +01:00
Matt Evans
fda1246f63 Update README 2024-07-15 23:41:20 +01:00
Matt Evans
1ce7c5bc91 discs: Add write support
The unix_main gets another option, -w, that enables the disc
mapping to reflect writes back to the backing file.

The disc emulation code now handles writes, which are copied
back to the disc data.

This still doesn't abstract read/write ops to disc, which will
be the next step (to support, for example, block-based storage).
2024-07-15 23:28:03 +01:00
Matt Evans
563626a382 First public release
Squashed for release at v0.1
2024-06-15 21:10:48 +01:00