parent 8f7bd6c

author Bradon Kanyid <bradon.kanyid@blueowl.xyz> 1593158857 -0700
committer Bradon Kanyid <bradon.kanyid@blueowl.xyz> 1593218619 -0700

Embed multimenu into firmware, as fallback

if no menu file is found at /multimenu.bin, use embedded menu built into
firmware

Author: bradonkanyid

code/veccart/.gitignore

@@ -55,3 +55,6 @@ modules.order
 Module.symvers
 Mkfile.old
 dkms.conf
+
+# generated filed for multicart menu pulled from other directory (don't want it checked in here)
+multicart.ld

code/veccart/Makefile

@@ -56,6 +56,7 @@ CC		= $(PREFIX)-gcc
 LD		= $(PREFIX)-gcc
 OBJCOPY	= $(PREFIX)-objcopy
 OBJDUMP	= $(PREFIX)-objdump
+
 # Uncomment this line if you want to use the installed (not local) library.
 #TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
 TOOLCHAIN_DIR=../libopencm3
@@ -96,6 +97,10 @@ docker-build: Dockerfile
 docker:
 	docker run --rm -t -v `pwd`:/build/veccart -u `id -u ${USER}`:`id -g ${USER}` stm32-build make images $(HW_VER_ARGS)
 
+bash:
+	docker run --rm -it -v `pwd`:/build/veccart -u `id -u ${USER}`:`id -g ${USER}` stm32-build bash
+
+
 images: $(BINARY).images
 flash: $(BINARY).flash
 
@@ -117,13 +122,21 @@ rom.o: rom.inc rom.c rom.h
 %.list: %.elf
 	$(VERBOSE)$(OBJDUMP) -S $(*).elf > $(*).list
 
-%.elf: $(OBJS) $(LDSCRIPT)
+%.elf: $(OBJS) $(LDSCRIPT) multicart.ld
 	$(LD) -o $(*).elf $(OBJS) $(LDFLAGS)
 	$(PREFIX)-size $(*).elf
 
 %.o: %.c Makefile
 	$(CC) $(CFLAGS) -o $@ -c $<
 
+multicart.bin:
+	make -C ../multicart/ docker-build
+	make -C ../multicart/
+	cp ../multicart/multicart.bin .
+
+multicart.ld: multicart.bin
+	cat $< | hexdump -v -e '"BYTE(0x" 1/1 "%02X" ")\n"' > $@
+
 clean:
 	rm -f $(OBJS)
 	rm -f *.elf
@@ -133,9 +146,6 @@ clean:
 	rm -f *.list
 	rm -rf *.d
 
-#%.flash: %.hex
-#	stm32flash -w "$(*).hex" -b 460800 -i -rts,dtr,-dtr -v -g 0x0 /dev/ttyUSB0
-
 %.flash: %.bin
 	dfu-util -a 0 -d 0483:df11 -s 0x08000000 -D $(*).bin
 

code/veccart/main.c

@@ -50,6 +50,8 @@
 
 // Externs
 extern GameFileRecord* pActiveGameData;
+extern char multicart_start;
+extern char multicart_end;
 
 //Memory for the menu ROM and the running cartridge.
 //We keep both in memory so we can quickly exchange them when a reset has been detected.
@@ -74,6 +76,8 @@ system_options sys_opt;
 char* sysData = (char*)&sys_opt;
 uint8_t checkDevMode = 0;
 
+FILINFO cart_file_info;
+
 /*
 //Pinning:
 A0-A14,SWCTL - PC0-PC15
@@ -101,12 +105,19 @@ void uart_output_func(unsigned char c){
 extern void romemu(void);
 
 // Load a ROM into cartridge memory
+void loadMenu() {
+  bool use_embedded_menu = (f_stat("/multicart.bin", &cart_file_info) != FR_OK);
+
+  loadRomWithHighScore("/multicart.bin", false, use_embedded_menu);
+}
+
 void loadRom(char *fn) {
-	loadRomWithHighScore(fn, false); // by default, do not load high score mode
+	loadRomWithHighScore(fn, false, false); // by default, do not load high score mode
 }
-void loadRomWithHighScore(char *fn, bool load_hs_mode) {
+
+void loadRomWithHighScore(char *fn, bool load_hs_mode, bool use_embedded_menu) {
 	FIL f;
-	FRESULT fr;
+	FRESULT fr = FR_NO_FILE; // assume no file, so we can test if we ever opened the file later
 	UINT r = 0;
 	int n;
 	UINT x;
@@ -117,14 +128,20 @@ void loadRomWithHighScore(char *fn, bool load_hs_mode) {
 		// loaded menu data
 		n = sizeof(menuData);
 	}
-	fr = f_open(&f, fn, FA_READ);
-	if (fr) {
-		xprintf("Error opening file: %d\n", fr);
+	if (romData == menuData && use_embedded_menu == true) {
+		xprintf("Copying %lu bytes of menu data... ", &multicart_end - &multicart_start);
+		memcpy(menuData, &multicart_start, &multicart_end - &multicart_start);
+		xprintf("OK!\n");
 	} else {
-		xprintf("Opened file: %s\n", fn);
+		fr = f_open(&f, fn, FA_READ);
+		if (fr) {
+			xprintf("Error opening file: %d\n", fr);
+		} else {
+			xprintf("Opened file: %s\n", fn);
+		}
+		f_read(&f, romData, 64*1024, &r);
+		xprintf("Read %d bytes of rom data.\n", r);
 	}
-	f_read(&f, romData, 64*1024, &r);
-	xprintf("Read %d bytes of rom data.\n", r);
 	// It's a game and it's <= 32KB
 	if (n > 32*1024 && r <= 32*1024) {
 		// pad with 0x01 for Mine Storm II and Polar Rescue (and any
@@ -192,7 +209,9 @@ void loadRomWithHighScore(char *fn, bool load_hs_mode) {
 			parmRam[0xe0] = 0x66; // High Score flag (IDLE:0x66, LOAD2VEC:0x77, SAVE2STM:0x88)
 		}
 	}
-	f_close(&f);
+	if (fr != FR_NO_FILE) {
+		f_close(&f);
+	}
 }
 
 //Stream data, for the Bad Apple demo
@@ -258,7 +277,7 @@ void doChangeRom(char* basedir, int i) {
 
 		romData=c_and_l.cartData;
 		xprintf("Going to read rom image %s\n", buff);
-		loadRomWithHighScore(buff, true);
+		loadRomWithHighScore(buff, true, false);
 	}
 }
 
@@ -409,7 +428,6 @@ void ledsOff() {
 }
 
 static FATFS FatFs;
-FILINFO cart_file_info;
 FIL cart_file;
 void doRamDisk() {
 	/**
@@ -482,7 +500,7 @@ void doRamDisk() {
 
 			(void) highScoreOpenFile(); // Create/Open highscore file
 			romData=menuData; // Explicitly setting this here so we know WTF is going on in the background
-			loadRom("/multicart.bin");
+			loadMenu();
 			loadListing(menuDir, &c_and_l.listing, menuIndex+1 , menuIndex+1+0x200, romData);
 		}
 	} else if (sys_opt.usb_dev == USB_DEV_EXIT) {
@@ -497,7 +515,7 @@ void doRamDisk() {
 		(void) highScoreOpenFile(); // Create/Open highscore file
 		sys_opt.usb_dev = USB_DEV_DISABLED;
 		romData=menuData; // Explicitly setting this here so we know WTF is going on in the background
-		loadRom("/multicart.bin");
+		loadMenu();
 		loadListing(menuDir, &c_and_l.listing, menuIndex+1 , menuIndex+1+0x200, romData);
 	}
 
@@ -720,7 +738,7 @@ int main(void) {
 
 	// Load the Menu
 	romData=menuData; // Explicitly setting this here so we know WTF is going on in the background
-	loadRom("/multicart.bin");
+	loadMenu();
 	loadListing(menuDir, &c_and_l.listing, menuIndex+1 , menuIndex+1+0x200, romData);
 	sys_opt.usb_dev = USB_DEV_DISABLED;
 

code/veccart/main.h

@@ -2,8 +2,9 @@
 #define MAIN_H
 
 void uart_output_func(unsigned char c);
+void loadMenu(void);
 void loadRom(char *fn);
-void loadRomWithHighScore(char *fn, bool load_hs_mode);
+void loadRomWithHighScore(char *fn, bool load_hs_mode, bool use_embedded_menu);
 void loadStreamData(int addr, int len);
 void doUpDir(void);
 void doChangeDir(char* dirname);

code/veccart/stm32f411rct6.ld

@@ -7,3 +7,17 @@ ram (rwx) : ORIGIN = 0x20000400, LENGTH = 127K
 }
 /* Include the common ld script. */
 INCLUDE cortex-m-generic.ld
+
+SECTIONS {
+    .text : {
+
+        /* ... */
+
+        multicart_start = .;
+        INCLUDE "multicart.ld" ;
+        multicart_end = .;
+
+       /* ... */
+    }
+}
+