ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-enabled nvram saving and made to save as dc_flash.bin instead.

This commit is contained in:
Shaun Thompson 2013-12-22 17:30:44 -07:00
parent ddfc85280d
commit 21a19c024b
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
newdc/android/Android.cpp
View File

@ -186,7 +186,7 @@ JNIEXPORT void JNICALL Java_com_example_newdc_JNIdc_run(JNIEnv *env,jobject obj,
JNIEXPORT void JNICALL Java_com_example_newdc_JNIdc_stop(JNIEnv *env,jobject obj) JNIEXPORT void JNICALL Java_com_example_newdc_JNIdc_stop(JNIEnv *env,jobject obj)
{ {
//dc_stop(); dc_term();
} }
JNIEXPORT jint JNICALL Java_com_example_newdc_JNIdc_send(JNIEnv *env,jobject obj,jint cmd, jint param) JNIEXPORT jint JNICALL Java_com_example_newdc_JNIdc_send(JNIEnv *env,jobject obj,jint cmd, jint param)

2
newdc/hw/holly/sb_mem.cpp
View File

@ -52,7 +52,7 @@ bool LoadRomFiles(const string& root)
void SaveRomFiles(const string& root) void SaveRomFiles(const string& root)
{ {
sys_nvmem.Save(root,ROM_PREFIX,"nvmem.bin","nvmem"); sys_nvmem.Save(root,ROM_PREFIX,"dc_flash.bin","nvmem");
} }
#if (DC_PLATFORM == DC_PLATFORM_NORMAL) || (DC_PLATFORM == DC_PLATFORM_DEV_UNIT) || (DC_PLATFORM == DC_PLATFORM_NAOMI) || (DC_PLATFORM == DC_PLATFORM_NAOMI2) #if (DC_PLATFORM == DC_PLATFORM_NORMAL) || (DC_PLATFORM == DC_PLATFORM_DEV_UNIT) || (DC_PLATFORM == DC_PLATFORM_NAOMI) || (DC_PLATFORM == DC_PLATFORM_NAOMI2)

6
reicast/android/src/com/reicast/emulator/GL2JNIActivity.java
View File

@ -147,10 +147,8 @@ public class GL2JNIActivity extends Activity
// Call parent onCreate() // Call parent onCreate()
super.onCreate(icicle); super.onCreate(icicle);
/*int joys[] =InputDevice.getDeviceIds();
for(int i = 0;i<joys.length; i++){ int joys[] =InputDevice.getDeviceIds();
Log.d("reidc", "InputDevice ID: "+joys[i]);
Log.d("reidc", "InputDevice Name: "+ InputDevice.getDevice(joys[i]).getName());*/int joys[] =InputDevice.getDeviceIds();
for(int i = 0;i<joys.length; i++){ for(int i = 0;i<joys.length; i++){
Log.d("reidc", "InputDevice ID: "+joys[i]); Log.d("reidc", "InputDevice ID: "+joys[i]);
Log.d("reidc", "InputDevice Name: "+ InputDevice.getDevice(joys[i]).getName()); Log.d("reidc", "InputDevice Name: "+ InputDevice.getDevice(joys[i]).getName());