From 8afe705fbb03fc1c7d1fa6e2deb0453600f20ce2 Mon Sep 17 00:00:00 2001 From: Gerald Schnabel Date: Sun, 11 Oct 2020 22:47:21 +0200 Subject: [PATCH] OSD: show Minimig version --- fpga.c | 15 ++++++++++----- menu.c | 13 ++++++++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/fpga.c b/fpga.c index 48e6a20..c755af8 100644 --- a/fpga.c +++ b/fpga.c @@ -54,6 +54,11 @@ extern unsigned long iCurrentDirectory; extern char s[40]; extern adfTYPE df[4]; +char minimig_ver_beta; +char minimig_ver_major; +char minimig_ver_minor; +char minimig_ver_minion; + char BootPrint(const char *text); #ifdef XILINX_CCLK @@ -938,10 +943,10 @@ void fpga_init(char *name) { WaitTimer(100); EnableOsd(); SPI(OSD_CMD_VERSION); - char ver_beta = SPI(0xff); - char ver_major = SPI(0xff); - char ver_minor = SPI(0xff); - char ver_minion = SPI(0xff); + minimig_ver_beta = SPI(0xff); + minimig_ver_major = SPI(0xff); + minimig_ver_minor = SPI(0xff); + minimig_ver_minion = SPI(0xff); DisableOsd(); SPIN(); SPIN(); SPIN(); SPIN(); SPI(OSD_CMD_RST); @@ -959,7 +964,7 @@ void fpga_init(char *name) { BootInit(); WaitTimer(500); char rtl_ver[45]; - siprintf(rtl_ver, "**** MINIMIG-AGA%s v%d.%d.%d for MiST ****", ver_beta ? " BETA" : "", ver_major, ver_minor, ver_minion); + siprintf(rtl_ver, "**** MINIMIG-AGA%s v%d.%d.%d for MiST ****", minimig_ver_beta ? " BETA" : "", minimig_ver_major, minimig_ver_minor, minimig_ver_minion); BootPrintEx(rtl_ver); BootPrintEx(" "); BootPrintEx("MINIMIG-AGA for MiST by Rok Krajnc (rok.krajnc@gmail.com)"); diff --git a/menu.c b/menu.c index 381fbc0..09112bf 100644 --- a/menu.c +++ b/menu.c @@ -96,6 +96,11 @@ char DirEntryInfo[MAXDIRENTRIES][5]; // disk number info of dir entries char DiskInfo[5]; // disk number info of selected entry +extern char minimig_ver_beta; +extern char minimig_ver_major; +extern char minimig_ver_minor; +extern char minimig_ver_minion; + extern const char version[]; const char *config_tos_mem[] = {"512 kB", "1 MB", "2 MB", "4 MB", "8 MB", "14 MB", "--", "--" }; const char *config_tos_wrprot[] = {"none", "A:", "B:", "A: and B:"}; @@ -1955,7 +1960,13 @@ void HandleUI(void) case MENU_MAIN1 : menumask=0x70; // b01110000 Floppy turbo, Harddisk options & Exit. OsdSetTitle("Minimig",OSD_ARROW_RIGHT); - helptext=helptexts[HELPTEXT_MAIN]; + // set helptext with core display on top of basic info + siprintf(helptext_custom, HELPTEXT_SPACER); + strcat(helptext_custom, OsdCoreName()); + siprintf(s, "%s v%d.%d.%d", minimig_ver_beta ? " BETA" : "", minimig_ver_major, minimig_ver_minor, minimig_ver_minion); + strcat(helptext_custom, s); + strcat(helptext_custom, helptexts[HELPTEXT_MAIN]); + helptext=helptext_custom; // floppy drive info // We display a line for each drive that's active