Skip to content

[pull] master from MiSTer-devel:master#361

Open
pull[bot] wants to merge 217 commits intomiscellaneousbits:masterfrom
MiSTer-devel:master
Open

[pull] master from MiSTer-devel:master#361
pull[bot] wants to merge 217 commits intomiscellaneousbits:masterfrom
MiSTer-devel:master

Conversation

@pull
Copy link

@pull pull bot commented Sep 8, 2023

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Sep 8, 2023
zakk4223 and others added 27 commits September 9, 2023 17:53
Having a 2nd user database has the advantage of allowing custom entries
without losing them every time when N64-database.txt is overwritten.
* Auto detect system region, CIC, and save type if the ROM is missing from N64-database

Make it possible to to load games with correct settings even if they are missing from the database file.

* Removed auto-detection of save type

Only detect system region and cic type, use db for save type.

* Replace info texts with shorter variants

.
Some users complained that some games weren't working anymore after my submission. The reason is that I always set save type to "none" when the game wasn't detected in the db. This reverts some of the old behavior, don't touch the save type and controller pak settings when these settings are unknown because of missing db.
* input.cpp: pass dev nr to joy_analog

This allows for per-controller behavior

* N64: add emulation for the analog joystick

This applies the reduced-range octagonal gate of the N64 analog stick to
regular analog sticks.

The code was mostly written by Patrick Pollock with small optimizations
by Martin Donlon and myself.
ID, region and revision are grabbed from the games' header and are looked up in the database text file, the same file where MD5 hashes are now. Both MD5 and ID will be valid ways of determining ROM settings, so old database files will still work. The benefit of this is that the database can be shrunk quite considerably, as many, many duplicates can be removed. It will be (much) easier to maintain. I'm hoping to see fewer pull request made to the database repository as a consequence of this change.
* Squashed commit of the following:

commit 40c58ab
Merge: 1fc9c37 7c65b22
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Fri Oct 6 09:00:07 2023 +0200

    Merge branch 'master' of https://github.com/yxkalle/Main_MiSTer

commit 1fc9c37
Author: Rikard Bengtsson <rikard.bengtsson@yahoo.se>
Date:   Fri Oct 6 08:57:57 2023 +0200

    N64: Just some cleanup. Made code simpler. Added some comments where needed.

commit 7c65b22
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Fri Oct 6 04:09:51 2023 +0200

    Delete MiSTer_noface

commit fe21695
Merge: c163956 ee5659a
Author: Rikard Bengtsson <rikard.bengtsson@yahoo.se>
Date:   Fri Oct 6 03:28:02 2023 +0200

    Merge branch 'master' into add-id-to-db

commit c163956
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Fri Oct 6 03:15:05 2023 +0200

    Update n64.cpp

commit f4a6b98
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Fri Oct 6 03:12:51 2023 +0200

    cleanup

commit 401b9dc
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Tue Oct 3 22:48:03 2023 +0200

    Clean-up

    Clean-up the code, added some comments. Allow uppercase md5s in the database.

commit e0e2aff
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Mon Oct 2 20:05:28 2023 +0200

    Cleaner code?

commit 5546668
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Sun Oct 1 02:13:00 2023 +0200

    Delete N64-database.txt

    Delete before PR

commit 9e8fc3f
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Sun Oct 1 02:09:07 2023 +0200

    Some commenting and clean-up

commit be19bb6
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Sun Oct 1 01:19:05 2023 +0200

    Autodetect settings by ID

    Settings are saved in the database text files as usual, but you can match by both MD5 (first 4096), MD5 (full) as well as ID + region + revision.

* Added support for hacked boot codes
* Scale N64 analog optimally wrt gate shapes

* Limit max_range to near diagonals

* Make magic numbers adjustable constants
- Add an expanded key option to include core pixel freq in key E.g. Corename_FPS_Fpix=PhaseInc
- Fixes issue with matching YC key when Saturn core changes from low res to high res mode, as the FPS remains the same when the pixel clocks change (E.g. 6.71Mhz vs 7.16Mhz)
- Tested with existing yc.txt list as well as new Saturn keys for yc.txt
* Added controller handling for new N64 options

* Move to N64 folder and add per stick ranges

* Improve latency
* Squashed commit of the following:

commit 40c58ab
Merge: 1fc9c37 7c65b22
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Fri Oct 6 09:00:07 2023 +0200

    Merge branch 'master' of https://github.com/yxkalle/Main_MiSTer

commit 1fc9c37
Author: Rikard Bengtsson <rikard.bengtsson@yahoo.se>
Date:   Fri Oct 6 08:57:57 2023 +0200

    N64: Just some cleanup. Made code simpler. Added some comments where needed.

commit 7c65b22
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Fri Oct 6 04:09:51 2023 +0200

    Delete MiSTer_noface

commit fe21695
Merge: c163956 ee5659a
Author: Rikard Bengtsson <rikard.bengtsson@yahoo.se>
Date:   Fri Oct 6 03:28:02 2023 +0200

    Merge branch 'master' into add-id-to-db

commit c163956
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Fri Oct 6 03:15:05 2023 +0200

    Update n64.cpp

commit f4a6b98
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Fri Oct 6 03:12:51 2023 +0200

    cleanup

commit 401b9dc
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Tue Oct 3 22:48:03 2023 +0200

    Clean-up

    Clean-up the code, added some comments. Allow uppercase md5s in the database.

commit e0e2aff
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Mon Oct 2 20:05:28 2023 +0200

    Cleaner code?

commit 5546668
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Sun Oct 1 02:13:00 2023 +0200

    Delete N64-database.txt

    Delete before PR

commit 9e8fc3f
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Sun Oct 1 02:09:07 2023 +0200

    Some commenting and clean-up

commit be19bb6
Author: Rikard Bengtsson <rikard@loginhasselberg.se>
Date:   Sun Oct 1 01:19:05 2023 +0200

    Autodetect settings by ID

    Settings are saved in the database text files as usual, but you can match by both MD5 (first 4096), MD5 (full) as well as ID + region + revision.

* Added support for hacked boot codes

* Update n64.cpp
sorgelig and others added 30 commits November 12, 2025 21:01
…les (#1069)

Co-authored-by: Bemjo <Bemjo@users.noreply.github.com>
Got rid of the annoying message you get when opening the menu in a game that uses cpak.
It said "Saving..." even when there wasn't anything to save.
Cleaned up and refactored the save file code. Much easier to follow now.
* Fix of-by-one error

ROMs with headers containing an internal name of 20 characters (or more) got truncated to 19.

* Make sure not to read outside of the intended header section
* Refactor devcontainer into Docker Compose

We need to make the platform explicit (only via the Docker Compose) as the Dockerfile fetches a crosscompiler for x86.

* Add git to dev container
* SNES: add Competition Cart support.

* SNES: add PowerFest 94 1m cart recognition.
* Fix bootcore config param

We fix the case of a given generic corename set in bootcore (without version and extension).

* When bootcore is not version specific, find the latest
-adjust max seek delay (Astal stage1)
-minimum seek time when the old and new positions are close (Sonic R retry race)
Expand is_pcxt() to recognize Tandy1000 and PCjr as PCXT-class systems, while keeping the cached detection behavior.
* Saturn: fix CUE parsing for mixed-size images (Vigilant Paradise).

* Saturn: partially revert "adjust max seek delay (Astal stage1)"
Also replaced some magic numbers with enums
* frame-synchronized autofire, per-button rates, custom rates via mister.ini
* frame timer using core frame counter, fallback to timerfd
* improved button reference counting (previously limited to 2)
The x86 file sharing code opens files with O_WRONLY which maps
incorrectly to O_RDONLY. Fix this by explicitely mapping O_RDONLY
and O_WRONLY.

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Co-authored-by: Sven Schnelle <svens@stackframe.org>
* WIP Adding Atari800 side of things

* WIP Migrated some functionality from .sv to here

* WIP XEX file loading works, clean-ups

* WIP UART/SIO interface beginning

* WIP Adding Atari800 drive emulator

* WIP First version of the drive emulator working with ATR and XEX files

* WIP ATX files are working

* WIP HDD is now mounted separately

* WIP PBI/HDD is working too

* Cleaning up and adding supporting Atari ASM files

* Updated versioning information in the Atari800 FW

* WIP Adding support for the Atari 5200 core

* Atari 5200 support complete

* Atari800: fixed SIO timing bugs

* Atari800: sorting out SIO timing issues still

* Atari800: eliminate OSD lock up possibilities

* Atari800: Improved XEX loader
deleting file by using wildcards  isn't working with a shared
fs. Add the code to support deleting multiple files.

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Co-authored-by: Sven Schnelle <svens@stackframe.org>
* DiskImage: match new[] with delete[]

Signed-off-by: Sven Schnelle <fz@stackframe.org>

* st_tos: match new[] with delete[]

Signed-off-by: Sven Schnelle <fz@stackframe.org>

* scaler: fix calloc arguments

The first argument is the number of members, the second
argument the size of each member. Swap the arguments to
the correct order to prevent warings with newer compilers.

Signed-off-by: Sven Schnelle <fz@stackframe.org>

---------

Signed-off-by: Sven Schnelle <fz@stackframe.org>
* CD-i: Fixed buffer overflow

Fixed reintroduction of the buffer overflow by
commit 1addb89

Originally was fixed with c0171c9 but not yet
well understood.

* CD-i: Mount root folder NvRAM after core load

Instead of starting with an empty NvRAM,
"saves/CD-i/CD-i.sav" will be loaded instead.

Avoids machine reset by NvRAM change in case
a root folder CD image shall be used
* Fix YPbPr gating and refresh CSC after direct_video auto-detect

* Fix direct_video ypbpr bug
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Development

Successfully merging this pull request may close these issues.