eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Created a support folder and move core ARM support code for minimig into it. Updated menu, osd, and user_io. Makefile also updated to account for new support folder

Browse Source
This commit is contained in:
karllurman
2018-10-31 23:11:07 +11:00
parent 7614950f67
commit 94e560fa58
14 changed files with 467 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
menu.cpp
View File

@@ -38,17 +38,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "string.h"
#include "file_io.h"
#include "osd.h"
#include "minimig_fdd.h"
#include "minimig_hdd.h"
#include "hardware.h"
#include "minimig_config.h"
#include "menu.h"
#include "user_io.h"
#include "st_tos.h"
#include "debug.h"
#include "minimig_boot.h"
#include "support.h"
#include "archie.h"
#include "sharpmz.h"
#include "sharpmz.h"
#include "fpga_io.h"
#include <stdbool.h>
#include "cfg.h"
@@ -655,7 +652,7 @@ void HandleUI(void)
case CORE_TYPE_MIST:
case CORE_TYPE_MINIMIG2:
case CORE_TYPE_8BIT:
case CORE_TYPE_SHARPMZ:
case CORE_TYPE_SHARPMZ:
case CORE_TYPE_ARCHIE:
break;
@@ -807,12 +804,12 @@ void HandleUI(void)
}
// SHARPMZ Series Menu - This has been located within the sharpmz.cpp code base in order to keep updates to common code
// base to a minimum and shrink its size. The UI is called with the basic state data and it handles everything internally,
// only updating values in this function as necessary.
//
if (user_io_core_type() == CORE_TYPE_SHARPMZ)
sharpmz_ui(MENU_NONE1, MENU_NONE2, MENU_8BIT_SYSTEM1, MENU_FILE_SELECT1, &parentstate, &menustate, &menusub, &menusub_last, &menumask, SelectedPath, &helptext, helptext_custom, &fs_ExtLen, &fs_Options, &fs_MenuSelect, &fs_MenuCancel, fs_pFileExt, menu, select, up, down, left, right, plus, minus);
// SHARPMZ Series Menu - This has been located within the sharpmz.cpp code base in order to keep updates to common code
// base to a minimum and shrink its size. The UI is called with the basic state data and it handles everything internally,
// only updating values in this function as necessary.
//
if (user_io_core_type() == CORE_TYPE_SHARPMZ)
sharpmz_ui(MENU_NONE1, MENU_NONE2, MENU_8BIT_SYSTEM1, MENU_FILE_SELECT1, &parentstate, &menustate, &menusub, &menusub_last, &menumask, SelectedPath, &helptext, helptext_custom, &fs_ExtLen, &fs_Options, &fs_MenuSelect, &fs_MenuCancel, fs_pFileExt, menu, select, up, down, left, right, plus, minus);
// Switch to current menu screen
switch (menustate)
@@ -1313,19 +1310,19 @@ void HandleUI(void)
break;
case MENU_8BIT_SYSTEM2:
if (menu)
{
switch (user_io_core_type())
{
case CORE_TYPE_SHARPMZ:
menusub = menusub_last;
menustate = sharpmz_default_ui_state();
break;
default:
menustate = MENU_NONE1;
break;
};
}
if (menu)
{
switch (user_io_core_type())
{
case CORE_TYPE_SHARPMZ:
menusub = menusub_last;
menustate = sharpmz_default_ui_state();
break;
default:
menustate = MENU_NONE1;
break;
};
}
if (select)
{
@@ -1378,11 +1375,11 @@ void HandleUI(void)
menustate = MENU_RESET1;
menusub = 1;
}
else if (user_io_core_type() == CORE_TYPE_SHARPMZ)
{
menustate = sharpmz_reset_config(1);
menusub = 0;
}
else if (user_io_core_type() == CORE_TYPE_SHARPMZ)
{
menustate = sharpmz_reset_config(1);
menusub = 0;
}
break;
case 5:
// Save settings
@@ -1394,10 +1391,10 @@ void HandleUI(void)
archie_save_config();
menustate = MENU_ARCHIE_MAIN1;
}
else if (user_io_core_type() == CORE_TYPE_SHARPMZ)
{
menustate = sharpmz_save_config();
}
else if (user_io_core_type() == CORE_TYPE_SHARPMZ)
{
menustate = sharpmz_save_config();
}
else
{
char *filename = user_io_create_config_name();
@@ -1445,10 +1442,10 @@ void HandleUI(void)
menusub = 0;
menustate = MENU_8BIT_MAIN1;
break;
case CORE_TYPE_SHARPMZ:
menusub = menusub_last;
menustate = sharpmz_default_ui_state();
break;
case CORE_TYPE_SHARPMZ:
menusub = menusub_last;
menustate = sharpmz_default_ui_state();
break;
}
}
@@ -2444,7 +2441,7 @@ void HandleUI(void)
case MENU_RESET2:
m = 0;
if (user_io_core_type() == CORE_TYPE_MINIMIG2) m = 1;
if (user_io_core_type() == CORE_TYPE_SHARPMZ) m = 2;
if (user_io_core_type() == CORE_TYPE_SHARPMZ) m = 2;
if (select && menusub == 0)
{
@@ -2453,11 +2450,11 @@ void HandleUI(void)
menustate = MENU_NONE1;
MinimigReset();
}
else if(m == 2)
{
menustate = MENU_8BIT_SYSTEM1;
sharpmz_reset_config(1);
}
else if(m == 2)
{
menustate = MENU_8BIT_SYSTEM1;
sharpmz_reset_config(1);
}
else
{
char *filename = user_io_create_config_name();
@@ -2736,7 +2733,7 @@ void HandleUI(void)
break;
case MENU_ROMFILE_SELECTED:
SetKickstart(SelectedPath);
SetKickstart(SelectedPath);
menustate = MENU_SETTINGS_MEMORY1;
break;