Ed64 vseries

Makefile

@@ -20,10 +20,12 @@ SRCS = \
 	boot/boot.c \
 	boot/cic.c \
 	boot/reboot.S \
-	flashcart/64drive/64drive_ll.c \
-	flashcart/64drive/64drive.c \
 	flashcart/flashcart_utils.c \
 	flashcart/flashcart.c \
+	flashcart/64drive/64drive_ll.c \
+	flashcart/64drive/64drive.c \
+	flashcart/ed64/ed64_ll.c \
+	flashcart/ed64/ed64.c \
 	flashcart/sc64/sc64_ll.c \
 	flashcart/sc64/sc64.c \
 	libs/libspng/spng/spng.c \
@@ -55,6 +57,7 @@ SRCS = \
 	menu/views/error.c \
 	menu/views/fault.c \
 	menu/views/file_info.c \
+	menu/views/flashcart_info.c \
 	menu/views/image_viewer.c \
 	menu/views/text_viewer.c \
 	menu/views/load_disk.c \

README.md

@@ -28,7 +28,6 @@ An open source menu for N64 flashcarts.
 
 
 ### Video showcase (as of Oct 12 2023)
-
 [![N64FlashcartMenu Showcase](http://img.youtube.com/vi/6CKImHTifDA/0.jpg)](http://www.youtube.com/watch?v=6CKImHTifDA "N64FlashcartMenu Showcase (Oct 12 2023)")
 
 
@@ -61,6 +60,7 @@ Menu currently supports the following emulators and associated ROM file names:
  - **Game Boy** / **GB Color**: [gb64](https://lambertjamesd.github.io/gb64/romwrapper/romwrapper.html) by *lambertjamesd* - `gb.v64` / `gbc.v64`
  - **Sega Master System** / **Sega Game Gear** / **Sg1000**: [TotalSMS](https://github.com/ITotalJustice/TotalSMS) - `TotalSMS.z64` (Currently broken)
 
+
 ### Menu Settings
 The Menu creates a `config.ini` file in `sd:/menu/` which contains various settings that are used by the menu.
 Currently these are read-only (can be viewed in the menu by pressing `L` on the Joypad).
@@ -70,6 +70,7 @@ If required, you can manually adjust the file on the SD card using your computer
 - Ensure the cart has the latest [firmware](https://github.com/Polprzewodnikowy/SummerCart64/releases/latest) installed.
 - Download the latest `sc64menu.n64` file from the releases page, then put it in the root directory of your SD card.
 
+
 ##### 64DD disk support
 For the ability to load and run 64DD disk images, you need to add the folder `/menu/64ddipl` on the SD card.
 Download and add the relevant ipl files and rename them before adding them to the folder:
@@ -88,14 +89,28 @@ Note: to load an expansion disk (e.g. F-Zero X) browse to the N64 ROM and load i
 ### ED64 & ED64P Specific
 Currently not supported, but work is in progress (See [PR's](https://github.com/Polprzewodnikowy/N64FlashcartMenu/pulls)).
 
-The aim is to replace [Altra64](https://github.com/networkfusion/altra64) and [ED64-UnofficialOS](https://github.com/n64-tools/ED64-UnofficialOS-binaries).
+**WiP** The aim is to replace [Altra64](https://github.com/networkfusion/altra64) and [ED64-UnofficialOS](https://github.com/n64-tools/ED64-UnofficialOS-binaries).
 
 
-# Developer documentation
+#### ED64
+Download the `ED64.v64` ROM from the latest action run assets and place it in the `/ED64` folder.
+
 
+#### ED64P
+Download the `ED64P.v64` ROM from the latest action run assets and place it in the `/ED64P` folder.
+
+
+# Developer documentation
 You can use a dev container in VSCode to ease development.
 
 
+## To Build:
+`ms-vscode.makefile-tools` will help (installed automatically in dev container).
+TODO: it does not yet work with `F5`: see https://devblogs.microsoft.com/cppblog/now-announcing-makefile-support-in-visual-studio-code/
+WORKAROUND: in the dev container terminal, use make directly, i.e.: `make all`
+The ROMs can be found in the `output` directory.
+
+
 ## To deploy:
 ### SC64
 * Download the deployer [here](https://github.com/Polprzewodnikowy/SummerCart64/releases/download/v2.18.0/sc64-deployer-windows-v2.18.0.zip)
@@ -114,34 +129,40 @@ Then in the dev container, use `make run` or `make run-debug`
 
 
 #### From your host (Windows) OS
-
 * Run `./localdeploy.bat` from the terminal
 
 Toggle the N64 power switch to load the ROM.
 
-`ms-vscode.makefile-tools` will help (installed automatically in dev container).
-TODO: it does not yet work with `F5`: see https://devblogs.microsoft.com/cppblog/now-announcing-makefile-support-in-visual-studio-code/
-WORKAROUND: in the dev container terminal, use make directly, i.e.: `make`
-The ROM can be found in the `output` directory.
 
-NOTE: a "release" version of the SC64 menu is called `sc64menu.n64` and can be created for when you want to add it directly to the SDCard. This is generated by running `make all` or running `make sc64`.
+#### From the SD Card
+A "release" version of the SC64 menu is called `sc64menu.n64` and can be created for when you want to add it directly to the root folder on the SDCard. This is generated by running `make all` or running `make sc64`.
 
 
-### Others
+### ED64 V3 over USB from your host (Windows) OS
+* Download the UNFLoader [here](https://github.com/buu342/N64-UNFLoader/releases/download/v2.11/UNFLoader-Windows-x86.zip)
+* Extract and place `UNFLoader.exe` in the `tools` directory.
+* Ensure the current "official menu" is `V3.06`.
+* Run the appropriate command from windows cmd prompt to ensure your current directory is the root project directory.
+* Upload the ROM (e.g. `./tools/UNFLoader.exe -r ./output/OS64.v64`)
+
+
+### Others (non USB)
 * Add the required file to the correct folder on your SD card.
 
 
 # Update Libdragon submodule
 This repo currently uses the `unstable` branch as a submodule at a specific commit.
 To update to the latest version, use `git submodule update --remote ` from the terminal.
 
+
 # Generate documentation
 Run `doxygen` from the dev container terminal.
 Make sure you fix the warnings before creating a PR!
 Generated documentation is located in `output/docs` folder and auto published to the `gh-pages` branch when merged with `main`.
 
 Once merged, they can be viewed [here](https://polprzewodnikowy.github.io/N64FlashcartMenu/)
 
+
 # Open source software and licenses used
  - [libdragon](https://github.com/DragonMinded/libdragon) (UNLICENSE License)
  - [libspng](https://github.com/randy408/libspng) (BSD 2-Clause License)

src/flashcart/64drive/64drive.c

@@ -275,6 +275,7 @@ static flashcart_t flashcart_d64 = {
     .load_64dd_disk = NULL,
     .set_save_type = d64_set_save_type,
     .set_save_writeback = d64_set_save_writeback,
+    .get_device_info = NULL,
 };
 
 

src/flashcart/ed64/README.md

@@ -0,0 +1,12 @@
+This folder allows support for the ED64(P) flashcart when using V series hardware.
+
+Initially, this aims to work when loading the official ED64 OS menu, selecting the N64FlashcartMenu and then loading a ROM from there. This works around needing to load the correct firmware. To automate this, it is possible to set this menu to autoload (at least in the unofficial menu). i.e. You can set this ROM to auto load by placing a file called `autoexec.v64` in the `ED64` folder with the content of the file pointing to the path of this ROM.
+
+However, the current implementation is able to replace `/ED64/ED64.v64` and load ROM's using the `output/ED64.v64` ROM.
+
+
+Notes: 
+
+* `libcart` seems to use a different base register address `0x08040000`, but official implementation uses `0xA8040000`
+* Loading saves is currently not available.
+