Skip to content

Commit

Permalink
INI option to disable boot screen of some cores.
Browse files Browse the repository at this point in the history
  • Loading branch information
sorgelig committed May 9, 2018
1 parent db8c74d commit ab05a80
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 21 deletions.
1 change: 1 addition & 0 deletions MiSTer.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ composite_sync=0 ; set to 1 for composite sync on HSync signal of VGA outp
vga_scaler=0 ; set to 1 to connect VGA to scaler output.
hdmi_audio_96k=0 ; set to 1 for 96khz/16bit HDMI audio (48khz/16bit otherwise)
keyrah_mode=0x18d80002 ; VIDPID of keyrah for special code translation (0x23418037 for Arduino Micro)
;bootscreen=0 ; uncomment to disable boot screen of some cores like Minimig.

; USER button emulation by keybaord. Usually it's reset button.
; 0 - lctrl+lalt+ralt (lctrl+lgui+rgui on keyrah)
Expand Down
2 changes: 2 additions & 0 deletions cfg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ cfg_t cfg;
void MiSTer_ini_parse()
{
memset(&cfg, 0, sizeof(cfg));
cfg.bootscreen = 1;
ini_parse(&ini_cfg);
}

Expand All @@ -37,6 +38,7 @@ const ini_var_t ini_vars[] = {
{ "DVI_MODE", (void*)(&(cfg.dvi)), UINT8, 0, 1, 1 },
{ "KBD_NOMOUSE", (void*)(&(cfg.kbd_nomouse)), UINT8, 0, 1, 1 },
{ "MOUSE_THROTTLE", (void*)(&(cfg.mouse_throttle)), UINT8, 1, 100, 1 },
{ "BOOTSCREEN", (void*)(&(cfg.bootscreen)), UINT8, 0, 1, 1 },
};

// mist ini config
Expand Down
1 change: 1 addition & 0 deletions cfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ typedef struct {
uint8_t vsync_adjust;
uint8_t kbd_nomouse;
uint8_t mouse_throttle;
uint8_t bootscreen;
char video_conf[1024];
} cfg_t;

Expand Down
46 changes: 25 additions & 21 deletions minimig_boot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "file_io.h"
#include "minimig_config.h"
#include "minimig_fdd.h"
#include "cfg.h"

static uint8_t buffer[1024];

Expand Down Expand Up @@ -433,27 +434,30 @@ void BootInit()
spi8(rstval);
DisableOsd();

//default video config till real config loaded.
ConfigVideo(0,0, 0x40);
ConfigAudio(0);

WaitTimer(100);

BootEnableMem();
BootClearScreen(SCREEN_ADDRESS, SCREEN_MEM_SIZE);
BootUploadLogo();
BootUploadBall();
BootUploadCopper();
BootCustomInit();

WaitTimer(500);
char rtl_ver[128];
sprintf(rtl_ver, "MINIMIG-AGA%s v%d.%d.%d by Rok Krajnc. MiSTer port by Sorgelig.", ver_beta ? " BETA" : "", ver_major, ver_minor, ver_minion);
BootPrintEx(rtl_ver);
BootPrintEx(" ");
BootPrintEx("Original Minimig by Dennis van Weeren");
BootPrintEx("Updates by Jakub Bednarski, Tobias Gubener, Sascha Boing, A.M. Robinson & others");
BootPrintEx(" ");
if (cfg.bootscreen)
{
//default video config till real config loaded.
ConfigVideo(0, 0, 0x40);
ConfigAudio(0);

WaitTimer(100);

BootEnableMem();
BootClearScreen(SCREEN_ADDRESS, SCREEN_MEM_SIZE);
BootUploadLogo();
BootUploadBall();
BootUploadCopper();
BootCustomInit();

WaitTimer(500);
char rtl_ver[128];
sprintf(rtl_ver, "MINIMIG-AGA%s v%d.%d.%d by Rok Krajnc. MiSTer port by Sorgelig.", ver_beta ? " BETA" : "", ver_major, ver_minor, ver_minion);
BootPrintEx(rtl_ver);
BootPrintEx(" ");
BootPrintEx("Original Minimig by Dennis van Weeren");
BootPrintEx("Updates by Jakub Bednarski, Tobias Gubener, Sascha Boing, A.M. Robinson & others");
BootPrintEx(" ");
}

//eject all disk
df[0].status = 0;
Expand Down

0 comments on commit ab05a80

Please sign in to comment.