Added multitap core option & style nits

[pcsx_rearmed.git] / maemo / hildon.c

diff --git a/maemo/hildon.c b/maemo/hildon.c
index bd895c9..6fbdcf5 100644 (file)
--- a/maemo/hildon.c
+++ b/maemo/hildon.c
@@ -484,31 +484,31 @@ inline void key_press_event(int key2,int type)
                        switch (psxkey1){
                                case DKEY_CROSS:
                                        in_state_gun |= SACTION_GUN_A;
-                                       break;          
+                                       break;
                                case DKEY_CIRCLE:
                                        in_state_gun |= SACTION_GUN_B;
-                                       break;          
+                                       break;
                                case DKEY_TRIANGLE:
                                        in_state_gun |= SACTION_GUN_TRIGGER2;
-                                       break;          
+                                       break;
                                case DKEY_SQUARE:
                                        in_state_gun |= SACTION_GUN_TRIGGER;
-                                       break;          
+                                       break;
                        }
                }else if (type == 2) {
                        switch (psxkey1){
                                case DKEY_CROSS:
                                        in_state_gun &= ~SACTION_GUN_A;
-                                       break;          
+                                       break;
                                case DKEY_CIRCLE:
                                        in_state_gun &= ~SACTION_GUN_B;
-                                       break;          
+                                       break;
                                case DKEY_TRIANGLE:
                                        in_state_gun &= ~SACTION_GUN_TRIGGER2;
-                                       break;          
+                                       break;
                                case DKEY_SQUARE:
                                        in_state_gun &= ~SACTION_GUN_TRIGGER;
-                                       break;          
+                                       break;
                        }
                }
        }else{
@@ -533,7 +533,7 @@ inline void key_press_event(int key2,int type)
                                                in_a1[1] = 255;
                                                break;
                                }
-       }
+                       }
                }
                else if (type == 2) {
                if (psxkey1 >= 0)
@@ -554,7 +554,7 @@ inline void key_press_event(int key2,int type)
                                }
                        }
                emu_set_action(SACTION_NONE);
-       }
+               }
        }
 }
 
@@ -599,7 +599,7 @@ int maemo_init(int *argc, char ***argv)
                }
                fclose(pFile);
        }
-       
+
        switch (in_type1){
                case PSE_PAD_TYPE_GUNCON:
                        memset(cornerActions, 0, sizeof(cornerActions));
@@ -610,7 +610,7 @@ int maemo_init(int *argc, char ***argv)
                        break;
                case PSE_PAD_TYPE_ANALOGPAD:
                        printf("Controller set to analog (SCPH-1150)\n");
-                       break;  
+                       break;
        }
 
        if (in_enable_vibration)
@@ -664,7 +664,7 @@ int maemo_init(int *argc, char ***argv)
 
        if (bKeepDisplayOn){
                if (pthread_create(&display_thread, NULL, displayThread, NULL))
-                       printf("Failed to create display thread.\n");           
+                       printf("Failed to create display thread.\n");
        }
 
        pl_rearmed_cbs.only_16bpp = 1;
@@ -805,7 +805,7 @@ void plat_step_volume(int is_up)
 {
 }
 
-void plat_trigger_vibrate(int is_strong)
+void plat_trigger_vibrate(int pad, int low, int high)
 {
        const int vDuration = 10;
 
@@ -817,7 +817,8 @@ void plat_trigger_vibrate(int is_strong)
                                                                                                   "req_start_manual_vibration");
        if (msg) {
                dbus_message_iter_init_append(msg, &args);
-               int speed = is_strong ? 200 : 150;
+               // FIXME: somebody with hardware should tune this
+               int speed = high; // is_strong ? 200 : 150;
                int duration = vDuration;
                if (dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &speed)) {
                        if (dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &duration)) {