mirror of
https://github.com/libretro/Mu.git
synced 2026-11-16 09:01:12 +00:00
Update the libretro port, add more error checking
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
#include "libretro.h"
|
||||
#include "libretro_params.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
@@ -25,19 +24,25 @@
|
||||
#define path_default_slash() "/"
|
||||
#endif
|
||||
|
||||
#define JOYSTICK_MULTIPLIER 1.0
|
||||
|
||||
retro_log_printf_t log_cb;
|
||||
retro_video_refresh_t video_cb;
|
||||
|
||||
#if 0
|
||||
static retro_audio_sample_t audio_cb;
|
||||
static retro_log_printf_t log_cb;
|
||||
static retro_video_refresh_t video_cb;
|
||||
//static retro_audio_sample_t audio_cb;
|
||||
static retro_audio_sample_batch_t audio_batch_cb;
|
||||
#endif
|
||||
|
||||
retro_environment_t environ_cb;
|
||||
static retro_environment_t environ_cb;
|
||||
static retro_input_poll_t input_poll_cb;
|
||||
static retro_input_state_t input_state_cb;
|
||||
|
||||
static uint16_t screenWidth;
|
||||
static uint16_t screenHeight;
|
||||
static uint32_t emuFeatures;
|
||||
static bool useJoystickAsMouse;
|
||||
static double touchCursorX;
|
||||
static double touchCursorY;
|
||||
|
||||
|
||||
static void fallback_log(enum retro_log_level level, const char *fmt, ...)
|
||||
{
|
||||
va_list va;
|
||||
@@ -49,6 +54,63 @@ static void fallback_log(enum retro_log_level level, const char *fmt, ...)
|
||||
va_end(va);
|
||||
}
|
||||
|
||||
static void check_variables(bool booting)
|
||||
{
|
||||
struct retro_variable var = {0};
|
||||
|
||||
if(booting){
|
||||
emuFeatures = FEATURE_ACCURATE;
|
||||
|
||||
var.key = "palm_emu_feature_ram_huge";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
if (!strcmp(var.value, "true"))
|
||||
emuFeatures |= FEATURE_RAM_HUGE;
|
||||
|
||||
var.key = "palm_emu_feature_fast_cpu";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
if (!strcmp(var.value, "true"))
|
||||
emuFeatures |= FEATURE_FAST_CPU;
|
||||
|
||||
var.key = "palm_emu_feature_hybrid_cpu";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
if (!strcmp(var.value, "true"))
|
||||
emuFeatures |= FEATURE_HYBRID_CPU;
|
||||
|
||||
var.key = "palm_emu_feature_320x320";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
if (!strcmp(var.value, "true"))
|
||||
emuFeatures |= FEATURE_320x320;
|
||||
|
||||
var.key = "palm_emu_feature_synced_rtc";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
if (!strcmp(var.value, "true"))
|
||||
emuFeatures |= FEATURE_SYNCED_RTC;
|
||||
|
||||
var.key = "palm_emu_feature_hle_apis";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
if (!strcmp(var.value, "true"))
|
||||
emuFeatures |= FEATURE_HLE_APIS;
|
||||
|
||||
var.key = "palm_emu_feature_emu_honest";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
if (!strcmp(var.value, "true"))
|
||||
emuFeatures |= FEATURE_EMU_HONEST;
|
||||
|
||||
var.key = "palm_emu_feature_ext_keys";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
if (!strcmp(var.value, "true"))
|
||||
emuFeatures |= FEATURE_EXT_KEYS;
|
||||
}
|
||||
|
||||
var.key = "palm_emu_use_joystick_as_mouse";
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value){
|
||||
if (!strcmp(var.value, "true"))
|
||||
useJoystickAsMouse = true;
|
||||
else
|
||||
useJoystickAsMouse = false;
|
||||
}
|
||||
}
|
||||
|
||||
void retro_init(void)
|
||||
{
|
||||
enum retro_pixel_format rgb565 = RETRO_PIXEL_FORMAT_RGB565;
|
||||
@@ -76,54 +138,64 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
|
||||
void retro_get_system_info(struct retro_system_info *info)
|
||||
{
|
||||
memset(info, 0, sizeof(*info));
|
||||
info->library_name = LR_CORENAME;
|
||||
info->library_name = "Mu";
|
||||
#ifndef GIT_VERSION
|
||||
#define GIT_VERSION ""
|
||||
#endif
|
||||
info->library_version = LR_LIBVERSION GIT_VERSION;
|
||||
info->need_fullpath = LR_NEEDFILEPATH;
|
||||
info->valid_extensions = LR_VALIDFILEEXT; /* Anything is fine, we don't care. */
|
||||
info->library_version = "0.86+" GIT_VERSION;
|
||||
info->need_fullpath = false;
|
||||
info->valid_extensions = "prc|pdb|pqa";
|
||||
}
|
||||
|
||||
void retro_get_system_av_info(struct retro_system_av_info *info)
|
||||
{
|
||||
info->timing.fps = LR_SCREENFPS;
|
||||
info->timing.sample_rate = LR_SOUNDRATE;
|
||||
info->timing.fps = 60.0;
|
||||
info->timing.sample_rate = 44100.0;
|
||||
|
||||
info->geometry.base_width = LR_SCREENWIDTH;
|
||||
info->geometry.base_height = LR_SCREENHEIGHT;
|
||||
info->geometry.max_width = LR_SCREENWIDTH;
|
||||
info->geometry.max_height = LR_SCREENHEIGHT;
|
||||
info->geometry.aspect_ratio = LR_SCREENASPECT;
|
||||
info->geometry.base_width = 160;
|
||||
info->geometry.base_height = 220;
|
||||
info->geometry.max_width = 320;
|
||||
info->geometry.max_height = 440;
|
||||
info->geometry.aspect_ratio = 160.0 / 220.0;
|
||||
}
|
||||
|
||||
void retro_set_environment(retro_environment_t cb)
|
||||
{
|
||||
struct retro_log_callback logging;
|
||||
bool no_rom = !LR_REQUIRESROM;
|
||||
bool no_rom = true;
|
||||
|
||||
environ_cb = cb;
|
||||
|
||||
cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_rom);
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_rom);
|
||||
|
||||
if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging))
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging))
|
||||
log_cb = logging.log;
|
||||
else
|
||||
log_cb = fallback_log;
|
||||
|
||||
struct retro_variable vars[] = {
|
||||
{ "palm_emu_feature_ram_huge", "Extra RAM Hack; false|true" },
|
||||
{ "palm_emu_feature_fast_cpu", "Overclock 2x; false|true" },
|
||||
{ "palm_emu_feature_hybrid_cpu", "Extra RAM Hack; false|true" },
|
||||
{ "palm_emu_feature_320x320", "Double Resolution; false|true" },
|
||||
{ "palm_emu_feature_synced_rtc", "Force Match System Clock; false|true" },
|
||||
{ "palm_emu_feature_hle_apis", "HLE API Implementations; false|true" },
|
||||
{ "palm_emu_feature_emu_honest", "Tell Programs Their In An Emulator(for test programs); false|true" },
|
||||
{ "palm_emu_feature_ext_keys", "Enable OS5 Keys; false|true" },
|
||||
{ "palm_emu_use_joystick_as_mouse", "Use Left Joystick As Mouse; false|true" },
|
||||
{ 0 }
|
||||
};
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, vars);
|
||||
}
|
||||
|
||||
void retro_set_audio_sample(retro_audio_sample_t cb)
|
||||
{
|
||||
#if 0
|
||||
audio_cb = cb;
|
||||
#endif
|
||||
//audio_cb = cb;
|
||||
}
|
||||
|
||||
void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb)
|
||||
{
|
||||
#if 0
|
||||
audio_batch_cb = cb;
|
||||
#endif
|
||||
}
|
||||
|
||||
void retro_set_input_poll(retro_input_poll_t cb)
|
||||
@@ -149,6 +221,19 @@ void retro_reset(void)
|
||||
void retro_run(void)
|
||||
{
|
||||
input_poll_cb();
|
||||
|
||||
//touchscreen
|
||||
if(useJoystickAsMouse){
|
||||
touchCursorX += input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) * JOYSTICK_MULTIPLIER;
|
||||
touchCursorY += input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) * JOYSTICK_MULTIPLIER;
|
||||
|
||||
palmInput.touchscreenX = touchCursorX;
|
||||
palmInput.touchscreenY = touchCursorY;
|
||||
palmInput.touchscreenTouched = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2);
|
||||
}
|
||||
else{
|
||||
//TODO use physical touchscreen of host device
|
||||
}
|
||||
|
||||
//dpad
|
||||
palmInput.buttonUp = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP);
|
||||
@@ -168,62 +253,83 @@ void retro_run(void)
|
||||
palmInput.buttonContrast = input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT);
|
||||
|
||||
emulateFrame();
|
||||
video_cb(palmFramebuffer, LR_SCREENWIDTH, LR_SCREENHEIGHT, LR_SCREENWIDTH * sizeof(uint16_t));
|
||||
|
||||
//draw mouse
|
||||
if(useJoystickAsMouse){
|
||||
//TODO make mouse cursor
|
||||
}
|
||||
|
||||
video_cb(palmFramebuffer, screenWidth, screenHeight, screenWidth * sizeof(uint16_t));
|
||||
}
|
||||
|
||||
bool retro_load_game(const struct retro_game_info *info)
|
||||
{
|
||||
const char* systemDirectory;
|
||||
char palmRomPath[PATH_MAX_LENGTH];
|
||||
char palmBootloaderPath[PATH_MAX_LENGTH];
|
||||
uint8_t palmRom[ROM_SIZE];
|
||||
uint8_t palmBootloader[BOOTLOADER_SIZE];
|
||||
buffer_t rom;
|
||||
buffer_t bootloader;
|
||||
FILE* romFile;
|
||||
size_t bytesRead;
|
||||
FILE* bootloaderFile;
|
||||
time_t rawTime;
|
||||
struct tm* timeInfo;
|
||||
|
||||
struct retro_input_descriptor desc[] = {
|
||||
{ 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Touchscreen Mouse X" },
|
||||
{ 0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Touchscreen Mouse Y" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "Touchscreen Mouse Click" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Dpad Left" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Dpad Up" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Dpad Down" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Dpad Right" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "Dpad Middle" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "Dpad Middle" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Power" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Contrast" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "Notes" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "ToDo" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "Todo" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "Address Book" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "Calender" },
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
|
||||
|
||||
environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &systemDirectory);
|
||||
strncpy(palmRomPath, systemDirectory, PATH_MAX_LENGTH);
|
||||
palmRomPath[PATH_MAX_LENGTH - 1] = '\0';
|
||||
strncat(palmRomPath, path_default_slash(), PATH_MAX_LENGTH - strlen(palmRomPath));
|
||||
strncat(palmRomPath, "palmos41-en-m515.rom", PATH_MAX_LENGTH - strlen(palmRomPath));
|
||||
strncpy(palmBootloaderPath, systemDirectory, PATH_MAX_LENGTH);
|
||||
palmBootloaderPath[PATH_MAX_LENGTH - 1] = '\0';
|
||||
strncat(palmBootloaderPath, path_default_slash(), PATH_MAX_LENGTH - strlen(palmBootloaderPath));
|
||||
strncat(palmBootloaderPath, "bootloader-en-m515.rom", PATH_MAX_LENGTH - strlen(palmBootloaderPath));
|
||||
|
||||
romFile = fopen(palmRomPath, "rb");
|
||||
if(romFile == NULL)
|
||||
return false;
|
||||
|
||||
bytesRead = fread(palmRom, 1, ROM_SIZE, romFile);
|
||||
rom.size = fread(palmRom, 1, ROM_SIZE, romFile);
|
||||
fclose(romFile);
|
||||
|
||||
if(bytesRead == ROM_SIZE){
|
||||
buffer_t rom;
|
||||
buffer_t bootloader;
|
||||
rom.data = palmRom;
|
||||
rom.size = ROM_SIZE;
|
||||
bootloader.data = NULL;
|
||||
bootloader.size = 0;
|
||||
uint32_t error = emulatorInit(rom, bootloader, FEATURE_ACCURATE);
|
||||
if(error != EMU_ERROR_NONE)
|
||||
return false;
|
||||
rom.data = palmRom;
|
||||
|
||||
bootloaderFile = fopen(palmBootloaderPath, "rb");
|
||||
if(bootloaderFile != NULL){
|
||||
bootloader.size = fread(palmBootloader, 1, BOOTLOADER_SIZE, bootloaderFile);
|
||||
fclose(bootloaderFile);
|
||||
bootloader.data = palmBootloader;
|
||||
}
|
||||
else{
|
||||
return false;
|
||||
bootloader.data = NULL;
|
||||
bootloader.size = 0;
|
||||
}
|
||||
|
||||
time_t rawTime;
|
||||
struct tm* timeInfo;
|
||||
//updates the emulator configuration
|
||||
check_variables(true);
|
||||
|
||||
uint32_t error = emulatorInit(rom, bootloader, emuFeatures);
|
||||
if(error != EMU_ERROR_NONE)
|
||||
return false;
|
||||
|
||||
time(&rawTime);
|
||||
timeInfo = localtime(&rawTime);
|
||||
emulatorSetRtc(timeInfo->tm_yday, timeInfo->tm_hour, timeInfo->tm_min, timeInfo->tm_sec);
|
||||
@@ -236,6 +342,11 @@ bool retro_load_game(const struct retro_game_info *info)
|
||||
if(prcSuccess != EMU_ERROR_NONE)
|
||||
return false;
|
||||
}
|
||||
|
||||
screenWidth = (emuFeatures & FEATURE_320x320) ? 320 : 160;
|
||||
screenHeight = (emuFeatures & FEATURE_320x320) ? 440 : 220;
|
||||
touchCursorX = screenWidth / 2;
|
||||
touchCursorY = screenHeight / 2;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -283,18 +394,20 @@ bool retro_unserialize(const void *data, size_t size)
|
||||
|
||||
void *retro_get_memory_data(unsigned id)
|
||||
{
|
||||
//palm m515 is too complicated for sram, use savestates
|
||||
//Palm m515 is too complicated for SRAM, use savestates
|
||||
return NULL;
|
||||
}
|
||||
|
||||
size_t retro_get_memory_size(unsigned id)
|
||||
{
|
||||
//palm m515 is too complicated for sram, use savestates
|
||||
//Palm m515 is too complicated for SRAM, use savestates
|
||||
return 0;
|
||||
}
|
||||
|
||||
void retro_cheat_reset(void)
|
||||
{}
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void retro_cheat_set(unsigned index, bool enabled, const char *code)
|
||||
{
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
#ifndef LREXPORTS_
|
||||
#define LREXPORTS_
|
||||
|
||||
#define LR_SCREENWIDTH 160
|
||||
#define LR_SCREENHEIGHT (160 + 60)
|
||||
#define LR_SCREENASPECT ((float)LR_SCREENWIDTH / (float)LR_SCREENHEIGHT) //square pixels
|
||||
#define LR_SCREENFPS 60.0
|
||||
|
||||
#define LR_SOUNDRATE 44100.0
|
||||
|
||||
#define LR_CORENAME "Mu"
|
||||
#define LR_LIBVERSION "0.86+"
|
||||
#define LR_VALIDFILEEXT "prc|pdb"
|
||||
#define LR_NEEDFILEPATH false
|
||||
#define LR_BLOCKARCEXTRACT false
|
||||
#define LR_REQUIRESROM false
|
||||
|
||||
#endif
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.6.1, 2018-05-23T18:30:00. -->
|
||||
<!-- Written by QtCreator 4.6.1, 2018-05-26T11:34:24. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
int main(int argc, char *argv[]){
|
||||
QApplication a(argc, argv);
|
||||
MainWindow w;
|
||||
|
||||
a.setOrganizationDomain("meepingsnesroms.github.com");
|
||||
a.setApplicationName("LocalTester");
|
||||
w.show();
|
||||
|
||||
return a.exec();
|
||||
|
||||
@@ -75,7 +75,7 @@ void MainWindow::launchJs(bool serialOverWifi){
|
||||
testEnv.finish();
|
||||
testEnv.execute(testProgram, ui->sendText->text(), true);
|
||||
ui->sendText->clear();
|
||||
testEnv.finish();
|
||||
//testEnv.finish();
|
||||
}
|
||||
|
||||
bool MainWindow::wifiValidate(QString location){
|
||||
@@ -93,7 +93,10 @@ void MainWindow::on_pickTestProgram_clicked(){
|
||||
uint64_t size;
|
||||
uint32_t error;
|
||||
uint8_t* data;
|
||||
QString programPath = QFileDialog::getOpenFileName(this, "Select Test Program", QDir::root().path(), 0);
|
||||
QString lastTestProgramPath = appSettings.value("lastTestProgramPath", QDir::root().path()).toString();
|
||||
QString programPath = QFileDialog::getOpenFileName(this, "Select Test Program", lastTestProgramPath, 0);
|
||||
|
||||
appSettings.setValue("lastTestProgramPath", programPath);
|
||||
data = getFileBuffer(programPath, size, error);
|
||||
if(error == FILE_ERR_NONE)
|
||||
testProgram = QString::fromLatin1((const char*)data, size);
|
||||
@@ -102,8 +105,6 @@ void MainWindow::on_pickTestProgram_clicked(){
|
||||
}
|
||||
|
||||
void MainWindow::on_startLocalTesting_clicked(){
|
||||
//ui->serialPort->setCurrentText("/dev/tty.Bluetooth-Incoming-Port");
|
||||
//testProgram = "userIo.writeStringJs(\"Wrote to terminal from js!\")";
|
||||
if(!testEnv.running() && ui->serialPort->currentText() != "")
|
||||
launchJs(false);
|
||||
}
|
||||
@@ -122,7 +123,10 @@ void MainWindow::on_pickDependencyBlob_clicked(){
|
||||
uint64_t size;
|
||||
uint32_t error;
|
||||
uint8_t* data;
|
||||
QString blobPath = QFileDialog::getOpenFileName(this, "Select Dependency Blob", QDir::root().path(), 0);
|
||||
QString lastDependencyBlobPath = appSettings.value("lastDependencyBlobPath", QDir::root().path()).toString();
|
||||
QString blobPath = QFileDialog::getOpenFileName(this, "Select Dependency Blob", lastDependencyBlobPath, 0);
|
||||
|
||||
appSettings.setValue("lastDependencyBlobPath", blobPath);
|
||||
data = getFileBuffer(blobPath, size, error);
|
||||
if(error == FILE_ERR_NONE)
|
||||
dependencyBlob = QString::fromLatin1((const char*)data, size);
|
||||
@@ -131,7 +135,10 @@ void MainWindow::on_pickDependencyBlob_clicked(){
|
||||
}
|
||||
|
||||
void MainWindow::on_pickSslCertificate_clicked(){
|
||||
sslCertPath = QFileDialog::getOpenFileName(this, "Select SSL Certificate", QDir::root().path(), 0);
|
||||
QString lastSslCertPath = appSettings.value("lastSslCertPath", QDir::root().path()).toString();
|
||||
|
||||
sslCertPath = QFileDialog::getOpenFileName(this, "Select SSL Certificate", lastSslCertPath, 0);
|
||||
appSettings.setValue("lastSslCertPath", sslCertPath);
|
||||
}
|
||||
|
||||
void MainWindow::on_refreshSerialPorts_clicked(){
|
||||
@@ -149,3 +156,10 @@ void MainWindow::on_refreshSerialPorts_clicked(){
|
||||
for(uint32_t port = 0; port < serialPorts.length(); port++)
|
||||
ui->serialPort->addItem("/dev/" + serialPorts[port]);
|
||||
}
|
||||
|
||||
void MainWindow::on_sendText_returnPressed(){
|
||||
if(testEnv.running()){
|
||||
userTerminal->writeStringCxx(ui->sendText->text());
|
||||
ui->sendText->clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QSslSocket>
|
||||
#include <QSettings>
|
||||
#include <QString>
|
||||
#include <QTimer>
|
||||
|
||||
@@ -38,11 +39,14 @@ private slots:
|
||||
void on_pickSslCertificate_clicked();
|
||||
void on_refreshSerialPorts_clicked();
|
||||
|
||||
void on_sendText_returnPressed();
|
||||
|
||||
private:
|
||||
SerialPortIO* serialOut;
|
||||
UserIO* userTerminal;
|
||||
JSSystem* systemInterface;
|
||||
TestExecutionEnviroment testEnv;
|
||||
QSettings appSettings;
|
||||
QString testProgram;
|
||||
QString dependencyBlob;
|
||||
QString sslCertPath;
|
||||
|
||||
5
localTester/jsTests/relayFromSerialPort.js
Normal file
5
localTester/jsTests/relayFromSerialPort.js
Normal file
@@ -0,0 +1,5 @@
|
||||
function main(args){
|
||||
userIo.writeString("Test Input Required");
|
||||
var inputTest = userIo.readString();
|
||||
userIo.writeString(inputTest + irdaCommands.IRDA_COMMAND_GET_BYTE);
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
function main(args){
|
||||
userIo.writeString("Test Input Required");
|
||||
userIo.writeStringJs("Test Input Required");
|
||||
while(!userIo.stringAvailableJs())
|
||||
jsSystem.uSleep(16666);
|
||||
var inputTest = userIo.readString();
|
||||
userIo.writeString(inputTest + irdaCommands.IRDA_COMMAND_GET_BYTE);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.6.1, 2018-05-23T18:41:14. -->
|
||||
<!-- Written by QtCreator 4.6.1, 2018-05-26T11:36:29. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
|
||||
@@ -90,12 +90,12 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event){
|
||||
}
|
||||
|
||||
void MainWindow::selectHomePath(){
|
||||
QString dir = QFileDialog::getOpenFileName(this, "New Home Directory \"~/Mu\" is default", QDir::root().path(), 0);
|
||||
QString dir = QFileDialog::getOpenFileName(this, "New Home Directory(\"~/Mu\" is default)", QDir::root().path(), 0);
|
||||
settings.setValue("resourceDirectory", dir);
|
||||
}
|
||||
|
||||
void MainWindow::on_install_pressed(){
|
||||
QString app = QFileDialog::getOpenFileName(this, "Open Prc/Pdb/Pqa", QDir::root().path(), 0);
|
||||
QString app = QFileDialog::getOpenFileName(this, "Open *.prc/pdb/pqa", QDir::root().path(), 0);
|
||||
uint32_t error = emu.installApplication(app);
|
||||
if(error != FILE_ERR_NONE)
|
||||
popupErrorDialog("Could not install app");
|
||||
@@ -172,7 +172,7 @@ void MainWindow::on_ctrlBtn_clicked(){
|
||||
ui->power->setEnabled(true);
|
||||
|
||||
/*
|
||||
//if FEATURE_EMU_EXT_KEYS enabled add OS 5 buttons
|
||||
//if FEATURE_EXT_KEYS enabled add OS 5 buttons
|
||||
ui->left->setEnabled(true);
|
||||
ui->right->setEnabled(true);
|
||||
ui->center->setEnabled(true);
|
||||
|
||||
@@ -11,15 +11,15 @@ These registers will do nothing it there corresponding feature bit is not set on
|
||||
#define EMU_REG_ADDR(x) (EMU_REGISTER_BASE | x)
|
||||
|
||||
/*features*/
|
||||
#define FEATURE_ACCURATE 0x00000000/*no hacks/addons*/
|
||||
#define FEATURE_RAM_HUGE 0x00000001/*128mb RAM*/
|
||||
#define FEATURE_FAST_CPU 0x00000002/*doubles CPU speed*/
|
||||
#define FEATURE_HYBRID_CPU 0x00000004/*allows running ARM opcodes in an OS 4 enviroment*/
|
||||
#define FEATURE_320x320 0x00000008/*creates a 320x320 framebuffer for hires mode, the 160x160 framebuffer is a transparent overlay over the 320x320 framebuffer*/
|
||||
#define FEATURE_SYNCED_RTC 0x00000010/*RTC always equals host system time*/
|
||||
#define FEATURE_HLE_APIS 0x00000020/*memcpy, memcmp, wait on timer will be replaced with the hosts function*/
|
||||
#define FEATURE_EMU_HONEST 0x00000040/*tell the OS that its running in an emu, does nothing else*/
|
||||
#define FEATURE_EMU_EXT_KEYS 0x00000080/*enables the OS 5 buttons, left, right and select*/
|
||||
#define FEATURE_ACCURATE 0x00000000/*no hacks/addons*/
|
||||
#define FEATURE_RAM_HUGE 0x00000001/*128mb RAM*/
|
||||
#define FEATURE_FAST_CPU 0x00000002/*doubles CPU speed*/
|
||||
#define FEATURE_HYBRID_CPU 0x00000004/*allows running ARM opcodes in an OS 4 enviroment*/
|
||||
#define FEATURE_320x320 0x00000008/*creates a 320x320 framebuffer for hires mode, the 160x160 framebuffer is a transparent overlay over the 320x320 framebuffer*/
|
||||
#define FEATURE_SYNCED_RTC 0x00000010/*RTC always equals host system time*/
|
||||
#define FEATURE_HLE_APIS 0x00000020/*memcpy, memcmp, wait on timer will be replaced with the hosts function*/
|
||||
#define FEATURE_EMU_HONEST 0x00000040/*tell the OS that its running in an emu, does nothing else*/
|
||||
#define FEATURE_EXT_KEYS 0x00000080/*enables the OS 5 buttons, left, right and select*/
|
||||
/*new features go here*/
|
||||
|
||||
/*registers*/
|
||||
|
||||
@@ -184,6 +184,9 @@ static void invalidBehaviorCheck(){
|
||||
uint32_t emulatorInit(buffer_t palmRomDump, buffer_t palmBootDump, uint32_t specialFeatures){
|
||||
if(emulatorInitialized)
|
||||
return EMU_ERROR_NONE;
|
||||
|
||||
if(palmRomDump.data == NULL)
|
||||
return EMU_ERROR_INVALID_PARAMETER;
|
||||
|
||||
//allocate the buffers
|
||||
palmRam = malloc((specialFeatures & FEATURE_RAM_HUGE) ? SUPERMASSIVE_RAM_SIZE : RAM_SIZE);
|
||||
|
||||
Reference in New Issue
Block a user