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

Refactoring.

Browse Source
This commit is contained in:
sorgelig
2018-01-23 05:33:23 +08:00
parent d24aeec518
commit 64c218cff6
23 changed files with 194 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MiSTer.vcxproj
View File

@@ -40,36 +40,34 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="archie.c" />
<ClCompile Include="boot.c" />
<ClCompile Include="config.c" />
<ClCompile Include="cfg.c" />
<ClCompile Include="DiskImage.cpp" />
<ClCompile Include="file_io.c" />
<ClCompile Include="fdd.c" />
<ClCompile Include="fpga_io.c" />
<ClCompile Include="hardware.c" />
<ClCompile Include="hdd.c" />
<ClCompile Include="ikbd.c" />
<ClCompile Include="ini_parser.c" />
<ClCompile Include="input.c" />
<ClCompile Include="main.c" />
<ClCompile Include="menu.c" />
<ClCompile Include="mist_cfg.c" />
<ClCompile Include="minimig_boot.c" />
<ClCompile Include="minimig_config.c" />
<ClCompile Include="minimig_fdd.c" />
<ClCompile Include="minimig_hdd.c" />
<ClCompile Include="osd.c" />
<ClCompile Include="spi.c" />
<ClCompile Include="tos.c" />
<ClCompile Include="st_ikbd.c" />
<ClCompile Include="st_tos.c" />
<ClCompile Include="tzx2wav.c" />
<ClCompile Include="user_io.c" />
<ClCompile Include="x86.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="archie.h" />
<ClInclude Include="boot.h" />
<ClInclude Include="cfg.h" />
<ClInclude Include="charrom.h" />
<ClInclude Include="config.h" />
<ClInclude Include="debug.h" />
<ClInclude Include="DiskImage.h" />
<ClInclude Include="file_io.h" />
<ClInclude Include="fdd.h" />
<ClInclude Include="fpga_base_addr_ac5.h" />
<ClInclude Include="fpga_io.h" />
<ClInclude Include="fpga_manager.h" />
@@ -77,17 +75,19 @@
<ClInclude Include="fpga_reset_manager.h" />
<ClInclude Include="fpga_system_manager.h" />
<ClInclude Include="hardware.h" />
<ClInclude Include="hdd.h" />
<ClInclude Include="hdd_internal.h" />
<ClInclude Include="ikbd.h" />
<ClInclude Include="ini_parser.h" />
<ClInclude Include="input.h" />
<ClInclude Include="logo.h" />
<ClInclude Include="menu.h" />
<ClInclude Include="mist_cfg.h" />
<ClInclude Include="minimig_boot.h" />
<ClInclude Include="minimig_config.h" />
<ClInclude Include="minimig_fdd.h" />
<ClInclude Include="minimig_hdd.h" />
<ClInclude Include="minimig_hdd_internal.h" />
<ClInclude Include="osd.h" />
<ClInclude Include="spi.h" />
<ClInclude Include="tos.h" />
<ClInclude Include="st_ikbd.h" />
<ClInclude Include="st_tos.h" />
<ClInclude Include="tzx2wav.h" />
<ClInclude Include="user_io.h" />
<ClInclude Include="x86.h" />

90
MiSTer.vcxproj.filters
View File

@@ -14,27 +14,12 @@
<ClCompile Include="archie.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="boot.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="config.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="fdd.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="fpga_io.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="hardware.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="hdd.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ikbd.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ini_parser.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -47,18 +32,12 @@
<ClCompile Include="menu.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mist_cfg.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="osd.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="spi.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="tos.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="user_io.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -74,26 +53,38 @@
<ClCompile Include="DiskImage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="cfg.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="minimig_boot.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="minimig_config.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="minimig_fdd.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="minimig_hdd.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="st_ikbd.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="st_tos.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="archie.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="boot.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="charrom.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="debug.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="fdd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="fpga_base_addr_ac5.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -115,15 +106,6 @@
<ClInclude Include="hardware.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="hdd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="hdd_internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ikbd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ini_parser.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -136,18 +118,12 @@
<ClInclude Include="menu.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mist_cfg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="osd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="spi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="tos.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="user_io.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -163,6 +139,30 @@
<ClInclude Include="DiskImage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="cfg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="minimig_boot.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="minimig_config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="minimig_fdd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="minimig_hdd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="minimig_hdd_internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="st_ikbd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="st_tos.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="build.sh" />

47
cfg.c Normal file
View File

@@ -0,0 +1,47 @@
// cfg.c
// 2015, rok.krajnc@gmail.com
// 2017+, Sorgelig
#include <string.h>
#include "ini_parser.h"
#include "cfg.h"
#include "user_io.h"
cfg_t cfg;
void MiSTer_ini_parse()
{
memset(&cfg, 0, sizeof(cfg));
ini_parse(&ini_cfg);
}
// mist ini sections
const ini_section_t ini_sections[] =
{
{ 1, "MiSTer" }
};
// mist ini vars
const ini_var_t ini_vars[] = {
{ "YPBPR", (void*)(&(cfg.ypbpr)), UINT8, 0, 1, 1 },
{ "COMPOSITE_SYNC", (void*)(&(cfg.csync)), UINT8, 0, 1, 1 },
{ "FORCED_SCANDOUBLER", (void*)(&(cfg.forced_scandoubler)), UINT8, 0, 1, 1 },
{ "VGA_SCALER", (void*)(&(cfg.vga_scaler)), UINT8, 0, 1, 1 },
{ "KEYRAH_MODE", (void*)(&(cfg.keyrah_mode)), UINT32, 0, 0xFFFFFFFF, 1 },
{ "RESET_COMBO", (void*)(&(cfg.reset_combo)), UINT8, 0, 3, 1 },
{ "KEY_MENU_AS_RGUI", (void*)(&(cfg.key_menu_as_rgui)), UINT8, 0, 1, 1 },
{ "VIDEO_MODE", (void*)(cfg.video_conf), STRING, 0, sizeof(cfg.video_conf)-1, 1 },
{ "HDMI_AUDIO_96K", (void*)(&(cfg.hdmi_audio_96k)), UINT8, 0, 1, 1 },
{ "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 },
};
// mist ini config
const ini_cfg_t ini_cfg = {
CONFIG_DIR"/MiSTer.ini",
ini_sections,
ini_vars,
(int)(sizeof(ini_sections) / sizeof(ini_section_t)),
(int)(sizeof(ini_vars) / sizeof(ini_var_t))
};

19
mist_cfg.h → cfg.h
View File

@@ -1,9 +1,9 @@
// mist_cfg.h
// cfg.h
// 2015, rok.krajnc@gmail.com
// 2017+, Sorgelig
#ifndef __MIST_CFG_H__
#define __MIST_CFG_H__
#ifndef __CFG_H__
#define __CFG_H__
//// includes ////
@@ -26,15 +26,14 @@ typedef struct {
uint8_t kbd_nomouse;
uint8_t mouse_throttle;
char video_conf[1024];
} mist_cfg_t;
} cfg_t;
//// functions ////
void mist_ini_parse();
void MiSTer_ini_parse();
//// global variables ////
extern const ini_cfg_t mist_ini_cfg;
extern mist_cfg_t mist_cfg;
extern const ini_cfg_t ini_cfg;
extern cfg_t cfg;
#endif // __MIST_CFG_H__
#endif // __CFG_H__

18
input.c
View File

@@ -11,7 +11,7 @@
#include "user_io.h"
#include "menu.h"
#include "hardware.h"
#include "mist_cfg.h"
#include "cfg.h"
#include "fpga_io.h"
#include "osd.h"
@@ -1578,22 +1578,22 @@ static void input_cb(struct input_event *ev, int dev)
case EV_REL:
{
int msval;
if (!mist_cfg.mouse_throttle) mist_cfg.mouse_throttle = 1;
if (!cfg.mouse_throttle) cfg.mouse_throttle = 1;
switch (ev->code)
{
case 0:
input[dev].accx += ev->value;
msval = input[dev].accx / mist_cfg.mouse_throttle;
input[dev].accx -= msval * mist_cfg.mouse_throttle;
msval = input[dev].accx / cfg.mouse_throttle;
input[dev].accx -= msval * cfg.mouse_throttle;
//printf("Mouse PosX: %d\n", msval);
user_io_mouse(mouse_btn, msval, 0);
return;
case 1:
input[dev].accy += ev->value;
msval = input[dev].accy / mist_cfg.mouse_throttle;
input[dev].accy -= msval * mist_cfg.mouse_throttle;
msval = input[dev].accy / cfg.mouse_throttle;
input[dev].accy -= msval * cfg.mouse_throttle;
//printf("Mouse PosY: %d\n", msval);
user_io_mouse(mouse_btn, 0, msval);
@@ -1811,10 +1811,10 @@ static void input_cb(struct input_event *ev, int dev)
// replace MENU key by RGUI to allow using Right Amiga on reduced keyboards
// (it also disables the use of Menu for OSD)
if (mist_cfg.key_menu_as_rgui && code == 139) code = 126;
if (cfg.key_menu_as_rgui && code == 139) code = 126;
//Keyrah v2: USB\VID_18D8&PID_0002\A600/A1200_MULTIMEDIA_EXTENSION_VERSION
int keyrah = (mist_cfg.keyrah_mode && (((((uint32_t)input[dev].vid) << 16) | input[dev].pid) == mist_cfg.keyrah_mode));
int keyrah = (cfg.keyrah_mode && (((((uint32_t)input[dev].vid) << 16) | input[dev].pid) == cfg.keyrah_mode));
if (keyrah) code = keyrah_trans(code, ev->value);
uint32_t ps2code = get_ps2_code(code);
@@ -1823,7 +1823,7 @@ static void input_cb(struct input_event *ev, int dev)
uint16_t reset_m = (modifier & MODMASK) >> 8;
if (code == 111) reset_m |= 0x100;
user_io_check_reset(reset_m, (keyrah && !mist_cfg.reset_combo) ? 1 : mist_cfg.reset_combo);
user_io_check_reset(reset_m, (keyrah && !cfg.reset_combo) ? 1 : cfg.reset_combo);
if(!user_io_osd_is_visible() && ((user_io_get_kbdemu() == EMU_JOY0) || (user_io_get_kbdemu() == EMU_JOY1)))
{

16
menu.c
View File

@@ -37,19 +37,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "string.h"
#include "file_io.h"
#include "osd.h"
#include "fdd.h"
#include "hdd.h"
#include "minimig_fdd.h"
#include "minimig_hdd.h"
#include "hardware.h"
#include "config.h"
#include "minimig_config.h"
#include "menu.h"
#include "user_io.h"
#include "tos.h"
#include "st_tos.h"
#include "debug.h"
#include "boot.h"
#include "minimig_boot.h"
#include "archie.h"
#include "fpga_io.h"
#include <stdbool.h>
#include "mist_cfg.h"
#include "cfg.h"
#include "input.h"
#include "x86.h"
@@ -623,11 +623,11 @@ void HandleUI(void)
break;
/*
case 0x01: // 1: 1280x720 mode
if (user_io_osd_is_visible) mist_cfg.video_mode = 0;
if (user_io_osd_is_visible) cfg.video_mode = 0;
break;
case 0x02: // 2: 1280x1024 mode
if (user_io_osd_is_visible) mist_cfg.video_mode = 1;
if (user_io_osd_is_visible) cfg.video_mode = 1;
break;
*/
}

2
menu.h
View File

@@ -1,7 +1,7 @@
#ifndef MENU_H
#define MENU_H
#include "fdd.h" // for adfTYPE definition
#include "minimig_fdd.h" // for adfTYPE definition
// UI strings, used by boot messages
extern const char *config_filter_msg[];

6
boot.c → minimig_boot.c
View File

@@ -5,13 +5,13 @@
#include "string.h"
#include "stdio.h"
#include "boot.h"
#include "minimig_boot.h"
#include "hardware.h"
#include "osd.h"
#include "spi.h"
#include "file_io.h"
#include "config.h"
#include "fdd.h"
#include "minimig_config.h"
#include "minimig_fdd.h"
static uint8_t buffer[1024];

4
boot.h → minimig_boot.h
View File

@@ -3,8 +3,8 @@
// 2014, rok.krajnc@gmail.com
#ifndef __BOOT_H__
#define __BOOT_H__
#ifndef __MINIMIG_BOOT_H__
#define __MINIMIG_BOOT_H__
//// defines ////

8
config.c → minimig_config.c
View File

@@ -5,13 +5,13 @@
#include <stdbool.h>
#include "hardware.h"
#include "boot.h"
#include "minimig_boot.h"
#include "file_io.h"
#include "osd.h"
#include "fdd.h"
#include "hdd.h"
#include "minimig_fdd.h"
#include "minimig_hdd.h"
#include "menu.h"
#include "config.h"
#include "minimig_config.h"
#include "user_io.h"
#include "input.h"

6
config.h → minimig_config.h
View File

@@ -1,3 +1,7 @@
#ifndef __MINIMIG_CONFIG_H__
#define __MINIMIG_CONFIG_H__
#include "file_io.h"
typedef struct
@@ -47,3 +51,5 @@ unsigned char SaveConfiguration(int num); // Can supply NULL to use filename pre
unsigned char ConfigurationExists(int num);
void ApplyConfiguration(char reloadkickstart);
void MinimigReset();
#endif

4
fdd.c → minimig_fdd.c
View File

@@ -26,8 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdio.h>
#include "hardware.h"
#include "file_io.h"
#include "fdd.h"
#include "config.h"
#include "minimig_fdd.h"
#include "minimig_config.h"
#include "debug.h"
#include "fpga_io.h"
#include "menu.h"

4
fdd.h → minimig_fdd.h
View File

@@ -1,5 +1,5 @@
#ifndef FDD_H
#define FDD_H
#ifndef __MINIMIG_FDD_H__
#define __MINIMIG_FDD_H__
#include "file_io.h"

6
hdd.c → minimig_hdd.c
View File

@@ -24,10 +24,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <string.h>
#include "hardware.h"
#include "file_io.h"
#include "hdd.h"
#include "hdd_internal.h"
#include "minimig_hdd.h"
#include "minimig_hdd_internal.h"
#include "menu.h"
#include "config.h"
#include "minimig_config.h"
#include "debug.h"
#include "fpga_io.h"

4
hdd.h → minimig_hdd.h
View File

@@ -1,8 +1,8 @@
// hdd.h
#ifndef __HDD_H__
#define __HDD_H__
#ifndef __MINIMIG_HDD_H__
#define __MINIMIG_HDD_H__
// defines

4
hdd_internal.h → minimig_hdd_internal.h
View File

@@ -1,5 +1,5 @@
#ifndef HDD_INTERNAL_H
#define HDD_INTERNAL_H
#ifndef __MINIMIG_HDD_INTERNAL_H__
#define __MINIMIG_HDD_INTERNAL_H__
// Structure definitions for RDB emulation.
// For hardfiles that have no RDB information, we'll just create a single-partition RDB and Part block

47
mist_cfg.c
View File

@@ -1,47 +0,0 @@
// mist_cfg.c
// 2015, rok.krajnc@gmail.com
#include <string.h>
#include "ini_parser.h"
#include "mist_cfg.h"
#include "user_io.h"
mist_cfg_t mist_cfg;
void mist_ini_parse()
{
memset(&mist_cfg, 0, sizeof(mist_cfg));
ini_parse(&mist_ini_cfg);
}
// mist ini sections
const ini_section_t mist_ini_sections[] =
{
{ 1, "MiSTer" }
};
// mist ini vars
const ini_var_t mist_ini_vars[] = {
{ "YPBPR", (void*)(&(mist_cfg.ypbpr)), UINT8, 0, 1, 1 },
{ "COMPOSITE_SYNC", (void*)(&(mist_cfg.csync)), UINT8, 0, 1, 1 },
{ "FORCED_SCANDOUBLER", (void*)(&(mist_cfg.forced_scandoubler)), UINT8, 0, 1, 1 },
{ "VGA_SCALER", (void*)(&(mist_cfg.vga_scaler)), UINT8, 0, 1, 1 },
{ "KEYRAH_MODE", (void*)(&(mist_cfg.keyrah_mode)), UINT32, 0, 0xFFFFFFFF, 1 },
{ "RESET_COMBO", (void*)(&(mist_cfg.reset_combo)), UINT8, 0, 3, 1 },
{ "KEY_MENU_AS_RGUI", (void*)(&(mist_cfg.key_menu_as_rgui)), UINT8, 0, 1, 1 },
{ "VIDEO_MODE", (void*)(mist_cfg.video_conf), STRING, 0, sizeof(mist_cfg.video_conf)-1, 1 },
{ "HDMI_AUDIO_96K", (void*)(&(mist_cfg.hdmi_audio_96k)), UINT8, 0, 1, 1 },
{ "DVI_MODE", (void*)(&(mist_cfg.dvi)), UINT8, 0, 1, 1 },
{ "KBD_NOMOUSE", (void*)(&(mist_cfg.kbd_nomouse)), UINT8, 0, 1, 1 },
{ "MOUSE_THROTTLE", (void*)(&(mist_cfg.mouse_throttle)), UINT8, 1, 100, 1 },
};
// mist ini config
const ini_cfg_t mist_ini_cfg = {
CONFIG_DIR"/MiSTer.ini",
mist_ini_sections,
mist_ini_vars,
(int)(sizeof(mist_ini_sections) / sizeof(ini_section_t)),
(int)(sizeof(mist_ini_vars) / sizeof(ini_var_t))
};

2
osd.c
View File

@@ -45,7 +45,7 @@ as rotated copies of the first 128 entries. -- AMR
#include "logo.h"
#include "user_io.h"
#include "hardware.h"
#include "config.h"
#include "minimig_config.h"
static int osd_size = 8;

2
ikbd.c → st_ikbd.c
View File

@@ -29,7 +29,7 @@ M1 tank platoon/A_385 fixed
#include "user_io.h"
#include "spi.h"
#include "ikbd.h"
#include "st_ikbd.h"
#include "debug.h"
#define IKBD_AUTO_MS 20

4
ikbd.h → st_ikbd.h
View File

@@ -1,5 +1,5 @@
#ifndef IKBD_H
#define IKBD_H
#ifndef __ST_IKBD_H__
#define __ST_IKBD_H__
void ikbd_init(void);
void ikbd_poll(void);

4
tos.c → st_tos.c
View File

@@ -4,11 +4,11 @@
#include "hardware.h"
#include "menu.h"
#include "tos.h"
#include "st_tos.h"
#include "file_io.h"
#include "debug.h"
#include "user_io.h"
#include "ikbd.h"
#include "st_ikbd.h"
#include "fpga_io.h"
#define CONFIG_FILENAME "MIST.CFG"

4
tos.h → st_tos.h
View File

@@ -1,5 +1,5 @@
#ifndef TOS_H
#define TOS_H
#ifndef __ST_TOS_H__
#define __ST_TOS_H__
#include "file_io.h"

52
user_io.c
View File

@@ -11,21 +11,21 @@
#include "user_io.h"
#include "archie.h"
#include "debug.h"
#include "ikbd.h"
#include "st_ikbd.h"
#include "spi.h"
#include "mist_cfg.h"
#include "tos.h"
#include "cfg.h"
#include "st_tos.h"
#include "input.h"
#include "fpga_io.h"
#include "file_io.h"
#include "config.h"
#include "minimig_config.h"
#include "menu.h"
#include "x86.h"
#include "tzx2wav.h"
#include "DiskImage.h"
#include "boot.h"
#include "fdd.h"
#include "hdd.h"
#include "minimig_boot.h"
#include "minimig_fdd.h"
#include "minimig_hdd.h"
#define BREAK 0x8000
@@ -363,7 +363,7 @@ void user_io_init()
user_io_8bit_set_status(UIO_STATUS_RESET, UIO_STATUS_RESET);
}
mist_ini_parse();
MiSTer_ini_parse();
parse_video_mode();
user_io_send_buttons(1);
@@ -895,7 +895,7 @@ void user_io_send_buttons(char force)
static unsigned short key_map = 0;
unsigned short map = 0;
map = mist_cfg.video_mode;
map = cfg.video_mode;
map = (map << CONF_RES_SHIFT) & CONF_RES_MASK;
int btn = fpga_get_buttons();
@@ -904,12 +904,12 @@ void user_io_send_buttons(char force)
else if(btn & BUTTON_USR) map |= BUTTON2;
if (kbd_reset) map |= BUTTON2;
if (mist_cfg.vga_scaler) map |= CONF_VGA_SCALER;
if (mist_cfg.csync) map |= CONF_CSYNC;
if (mist_cfg.ypbpr) map |= CONF_YPBPR;
if (mist_cfg.forced_scandoubler) map |= CONF_FORCED_SCANDOUBLER;
if (mist_cfg.hdmi_audio_96k) map |= CONF_AUDIO_96K;
if (mist_cfg.dvi) map |= CONF_DVI;
if (cfg.vga_scaler) map |= CONF_VGA_SCALER;
if (cfg.csync) map |= CONF_CSYNC;
if (cfg.ypbpr) map |= CONF_YPBPR;
if (cfg.forced_scandoubler) map |= CONF_FORCED_SCANDOUBLER;
if (cfg.hdmi_audio_96k) map |= CONF_AUDIO_96K;
if (cfg.dvi) map |= CONF_DVI;
if ((map != key_map) || force)
{
@@ -1825,7 +1825,7 @@ void user_io_kbd(uint16_t key, int press)
else
{
emu_mode = (emu_mode + 1) & 3;
if(mist_cfg.kbd_nomouse && emu_mode == EMU_MOUSE) emu_mode = (emu_mode + 1) & 3;
if(cfg.kbd_nomouse && emu_mode == EMU_MOUSE) emu_mode = (emu_mode + 1) & 3;
}
break;
}
@@ -1948,18 +1948,18 @@ uint32_t vitems[32];
static int parse_custom_video_mode()
{
char *cfg = mist_cfg.video_conf;
char *vcfg = cfg.video_conf;
int cnt = 0;
while (*cfg)
while (*vcfg)
{
char *next;
if (cnt == 9 && vitems[0] == 1)
{
double Fout = strtod(cfg, &next);
if (cfg == next || (Fout < 20.f || Fout > 200.f))
double Fout = strtod(vcfg, &next);
if (vcfg == next || (Fout < 20.f || Fout > 200.f))
{
printf("Error parsing video_mode parameter: ""%s""\n", mist_cfg.video_conf);
printf("Error parsing video_mode parameter: ""%s""\n", cfg.video_conf);
return 0;
}
@@ -1981,16 +1981,16 @@ static int parse_custom_video_mode()
break;
}
uint32_t val = strtoul(cfg, &next, 0);
if (cfg == next || (*next != ',' && *next))
uint32_t val = strtoul(vcfg, &next, 0);
if (vcfg == next || (*next != ',' && *next))
{
printf("Error parsing video_mode parameter: ""%s""\n", mist_cfg.video_conf);
printf("Error parsing video_mode parameter: ""%s""\n", cfg.video_conf);
return 0;
}
if (cnt < 32) vitems[cnt] = val;
if (*next == ',') next++;
cfg = next;
vcfg = next;
cnt++;
}
@@ -2018,7 +2018,7 @@ static int parse_custom_video_mode()
void parse_video_mode()
{
// always 0. Use custom parameters.
mist_cfg.video_mode = 0;
cfg.video_mode = 0;
int mode = parse_custom_video_mode();
if (mode >= 0)