eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sharpmz: remove volume control.

Browse Source
This commit is contained in:
sorgelig
2020-05-18 08:27:07 +08:00
parent fa435d7186
commit e5f97d77b4
2 changed files with 12 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
support/sharpmz/sharpmz.cpp
View File

@@ -1135,56 +1135,6 @@ void sharpmz_set_audio_source(short on, short setStatus)
sharpmz_set_config_register(REGISTER_AUDIO, config.system_reg[REGISTER_AUDIO]);
}
// Return audio volume setting. The value is inverse, ie. it is an attenuation, 15 is highest, 0 is off.
//
int sharpmz_get_audio_volume(void)
{
return ((config.volume) & 0x0f);
}
// Return string showing Audio volume setting - this is inversed.
//
const char *sharpmz_get_audio_volume_string(void)
{
return(SHARPMZ_AUDIO_VOLUME[ config.volume & 0x0f ]);
}
// Set audio volume level. 15 = high attenuation, 0 = no attenuation.
//
void sharpmz_set_audio_volume(short volume, short setStatus)
{
config.volume &= 0x10;
config.volume |= volume & 0x0f;
if(setStatus)
spi_uio_cmd8(UIO_AUDVOL, config.volume);
}
// Return audio mute setting.
//
int sharpmz_get_audio_mute(void)
{
return ((config.volume & 0x10) >> 4);
}
// Return string showing Audio mute setting.
//
const char *sharpmz_get_audio_mute_string(void)
{
return(SHARPMZ_AUDIO_MUTE[ (config.volume & 0x10) >> 4 ]);
}
// Set audio mute level.
//
void sharpmz_set_audio_mute(short mute, short setStatus)
{
config.volume &= 0x0f;
config.volume |= mute << 4;
if(setStatus)
spi_uio_cmd8(UIO_AUDVOL, config.volume);
}
// Set BOOT_RESET, ie. initiate an IPL boot.
//
void sharpmz_set_boot_reset(void)
@@ -2357,7 +2307,6 @@ void sharpmz_ui(int idleState, int idle2State, int system
static short romType;
static short machineModel = sharpmz_get_next_machine_model();
static short scrollPos = 0;
static short volumeDir = 0;
#ifdef __SHARPMZ_DEBUG__
static short memoryBank = sharpmz_get_next_memory_bank();
static short fileDumped = 0;
@@ -2956,16 +2905,6 @@ void sharpmz_ui(int idleState, int idle2State, int system
OsdWrite(menuItem++, sBuf, *menusub == subItem++, 0);
*menumask = (*menumask << 1) | 1;
strcpy(sBuf, " Audio Volume: ");
strcat(sBuf, sharpmz_get_audio_volume_string());
OsdWrite(menuItem++, sBuf, *menusub == subItem++, 0);
*menumask = (*menumask << 1) | 1;
strcpy(sBuf, " Audio Mute: ");
strcat(sBuf, sharpmz_get_audio_mute_string());
OsdWrite(menuItem++, sBuf, *menusub == subItem++, 0);
*menumask = (*menumask << 1) | 1;
OsdWrite(menuItem++, "", 0, 0);
OsdWrite(menuItem++, " Rom Management \x16", *menusub == subItem++, 0);
*menumask = (*menumask << 1) | 1;
@@ -3008,26 +2947,14 @@ void sharpmz_ui(int idleState, int idle2State, int system
*menustate = MENU_SHARPMZ_MACHINE1;
break;
case 3: // Audio Volume
sharpmz_set_audio_volume((sharpmz_get_audio_volume() + (volumeDir ? -1 : +1)) & 0x0f, 1);
if(sharpmz_get_audio_volume() == 15) volumeDir = 1;
if(sharpmz_get_audio_volume() == 0) volumeDir = 0;
*menustate = MENU_SHARPMZ_MACHINE1;
break;
case 4: // Audio Mute
sharpmz_set_audio_mute(sharpmz_get_audio_mute() ? 0 : 1, 1);
*menustate = MENU_SHARPMZ_MACHINE1;
break;
case 5: // Roms
case 3: // Roms
*menustate = MENU_SHARPMZ_ROMS1;
*menusub_last = *menusub;
*menusub = 0;
if(right) select = true;
break;
case 6: // Exit
case 4: // Exit
*menustate = MENU_SHARPMZ_MAIN1;
*menusub = 1; //*menusub_last;
break;

24
support/sharpmz/sharpmz.h
View File

@@ -7,8 +7,8 @@
// This module is an extension to the MiSTer control program. It adds extensions to
// the menu system and additional I/O control specific to the Sharp MZ series
// emulation.
//
// Credits:
//
// Credits:
// Copyright: (c) 2018 Philip Smart <philip.smart@net2net.org>
//
// History: July 2018 - Initial module written.
@@ -157,12 +157,12 @@
#define REGISTER_CMT2 7
#define REGISTER_USERROM 8
#define REGISTER_FDCROM 9
#define REGISTER_10 10
#define REGISTER_11 11
#define REGISTER_12 12
#define REGISTER_10 10
#define REGISTER_11 11
#define REGISTER_12 12
#define REGISTER_SETUP 13
#define REGISTER_DEBUG 14
#define REGISTER_DEBUG2 15
#define REGISTER_DEBUG2 15
#define MAX_REGISTERS 16
// Numeric id of bit for a given CMT register flag.
@@ -191,7 +191,7 @@ static const unsigned int MZLOADADDR[MAX_IMAGE_TYPES][MAX_MZMACHINES] =
// Default size of roms.
//
static const unsigned int MZLOADSIZE[MAX_IMAGE_TYPES][MAX_MZMACHINES] =
static const unsigned int MZLOADSIZE[MAX_IMAGE_TYPES][MAX_MZMACHINES] =
{
{ 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x0800, 0x0800 }, // MROM
{ 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x0800, 0x0800 }, // MROM 80C
@@ -212,7 +212,7 @@ const char *SHARPMZ_FAST_TAPE[] = { "Off", "2x", "4x", "8x", "16x", "32
"Off", "2x", "4x", "8x", "16x", "Off", "Off", "Off"
};
const char *SHARPMZ_CPU_SPEED[] = { "2MHz", "4MHz", "8MHz", "16MHz", "32MHz", "64MHz", "2MHz", "2MHz",
"3.5MHz", "7MHz", "14MHz", "28MHz", "56MHz", "3.5MHz", "3.5MHz", "3.5MHz",
"3.5MHz", "7MHz", "14MHz", "28MHz", "56MHz", "3.5MHz", "3.5MHz", "3.5MHz",
"4MHz", "8MHz", "16MHz", "32MHz", "64MHz", "4MHz", "4MHz", "4MHz"
};
const char *SHARPMZ_TAPE_BUTTONS[] = { "Off", "Play", "Record", "Auto" };
@@ -237,7 +237,7 @@ const char *SHARPMZ_MACHINE_MODEL[] = { "MZ80K", "MZ80C", "MZ1200", "MZ80A"
const char *SHARPMZ_DEBUG_ENABLE[] = { "Off", "On" };
const char *SHARPMZ_DEBUG_LEDS[] = { "Off", "On" };
const char *SHARPMZ_DEBUG_LEDS_BANK[] = { "T80", "I/O", "IOCTL", "Config", "MZ80C I", "MZ80C II", "MZ80B I", "MZ80B II" };
const char *SHARPMZ_DEBUG_LEDS_SUBBANK[] = { "Auto", "A7-0", "A15-8", "DI", "Signals", "", "", "",
const char *SHARPMZ_DEBUG_LEDS_SUBBANK[] = { "Auto", "A7-0", "A15-8", "DI", "Signals", "", "", "",
"Auto", "Video", "PS2Key", "Signals", "CMT 1", "CMT 2", "CMT 3", "CMT 4",
"Auto", "A23-16", "A15-8", "A7-0", "Signals", "", "", "",
"Auto", "Config 1", "Config 2", "Config 3", "Config 4", "Config 5", "", "",
@@ -363,7 +363,7 @@ enum SHARPMZ_MENU
MENU_SHARPMZ_ROMS2 = 0xb5,
MENU_SHARPMZ_ROM_FILE_SELECTED = 0xb6,
MENU_SHARPMZ_DEBUG1 = 0xb7,
MENU_SHARPMZ_DEBUG2 = 0xb8
MENU_SHARPMZ_DEBUG2 = 0xb8
};
// Prototypes.
@@ -393,8 +393,6 @@ int sharpmz_get_vga_mode(void);
int sharpmz_get_machine_model(void);
int sharpmz_get_cpu_speed(void);
int sharpmz_get_audio_source(void);
int sharpmz_get_audio_volume(void);
int sharpmz_get_audio_mute(void);
int sharpmz_get_tape_buttons(void);
int sharpmz_get_cmt_ascii_mapping(void);
short sharpmz_get_next_memory_bank(void);
@@ -411,8 +409,6 @@ void sharpmz_set_vga_mode(short on, short setStatus);
void sharpmz_set_machine_model(short, short);
void sharpmz_set_cpu_speed(short, short);
void sharpmz_set_audio_source(short, short);
void sharpmz_set_audio_volume(short, short);
void sharpmz_set_audio_mute(short, short);
void sharpmz_set_boot_reset(short, short);
void sharpmz_set_tape_buttons(short, short);
void sharpmz_set_cmt_ascii_mapping(short, short);