Mercurial > sdl-ios-xcode

changeset 2749:1c5f440a60fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial work for NDS haptic support.
author Darren Alton <dalton@stevens.edu>
date Sat, 06 Sep 2008 00:10:16 +0000
parents 5668c3dfe7bc
children e3affc66d963
files Makefile.ds src/haptic/nds/SDL_syshaptic.c src/joystick/nds/SDL_sysjoystick.c src/video/nds/SDL_ndsevents.c
diffstat 4 files changed, 361 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.ds	Thu Sep 04 13:43:39 2008 +0000
+++ b/Makefile.ds	Sat Sep 06 00:10:16 2008 +0000
@@ -55,6 +55,8 @@
 src/events/SDL_quit.c \
 src/events/SDL_windowevents.c \
 src/file/SDL_rwops.c \
+src/haptic/SDL_haptic.c \
+src/haptic/nds/SDL_syshaptic.c \
 src/joystick/nds/SDL_sysjoystick.c \
 src/joystick/SDL_joystick.c \
 src/stdlib/SDL_getenv.c \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haptic/nds/SDL_syshaptic.c	Sat Sep 06 00:10:16 2008 +0000
@@ -0,0 +1,334 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 2008 Edgar Simo
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifdef SDL_HAPTIC_NDS
+
+#include "SDL_haptic.h"
+#include "../SDL_syshaptic.h"
+#include "SDL_joystick.h"
+#include <nds/arm9/rumble.h>
+#include <nds/memory.h>
+
+#define MAX_HAPTICS  1
+/* right now only the ezf3in1 (and maybe official rumble pak) are supported
+   and there can only be one of those in at a time (in GBA slot.) */
+
+SDL_Haptic *nds_haptic = NULL;
+
+typedef struct
+{
+    enum
+    { NONE, OFFICIAL, EZF3IN1 } type;
+    int pos;
+} NDS_HapticData;
+
+
+
+void NDS_EZF_OpenNorWrite()
+{
+    GBA_BUS[0x0FF0000] = 0xD200;
+    GBA_BUS[0x0000000] = 0x1500;
+    GBA_BUS[0x0010000] = 0xD200;
+    GBA_BUS[0x0020000] = 0x1500;
+    GBA_BUS[0x0E20000] = 0x1500;
+    GBA_BUS[0x0FE0000] = 0x1500;
+}
+
+
+void NDS_EZF_CloseNorWrite()
+{
+    GBA_BUS[0x0FF0000] = 0xD200;
+    GBA_BUS[0x0000000] = 0x1500;
+    GBA_BUS[0x0010000] = 0xD200;
+    GBA_BUS[0x0020000] = 0x1500;
+    GBA_BUS[0x0E20000] = 0xD200;
+    GBA_BUS[0x0FE0000] = 0x1500;
+}
+
+void NDS_EZF_ChipReset()
+{
+    GBA_BUS[0x0000] = 0x00F0 ;
+    GBA_BUS[0x1000] = 0x00F0 ;
+}
+uint32 NDS_EZF_IsPresent()
+{
+    vuint16 id1,id2;
+
+    NDS_EZF_OpenNorWrite();
+
+    GBA_BUS[0x0555] = 0x00AA;
+    GBA_BUS[0x02AA] = 0x0055;
+    GBA_BUS[0x0555] = 0x0090;
+    GBA_BUS[0x1555] = 0x00AA;
+    GBA_BUS[0x12AA] = 0x0055;
+    GBA_BUS[0x1555] = 0x0090;
+
+    id1 = GBA_BUS[0x0001];
+    id2 = GBA_BUS[0x1001];
+
+    if((id1!=0x227E)|| (id2!=0x227E)) {
+        NDS_EZF_CloseNorWrite();
+        return 0;
+    }
+
+    id1 = GBA_BUS[0x000E];
+    id2 = GBA_BUS[0x100E];
+
+    NDS_EZF_CloseNorWrite();
+
+    if(id1==0x2218 && id2==0x2218) {
+        return 1;
+    }
+
+    return 0;
+}
+
+void NDS_EZF_SetShake(u8 pos)
+{
+    u16 data = ((pos%3)|0x00F0);
+
+    GBA_BUS[0x0FF0000] = 0xD200;
+    GBA_BUS[0x0000000] = 0x1500;
+    GBA_BUS[0x0010000] = 0xD200;
+    GBA_BUS[0x0020000] = 0x1500;
+    GBA_BUS[0x0F10000] = data;
+    GBA_BUS[0x0FE0000] = 0x1500;
+
+    GBA_BUS[0] = 0x0000; /* write any value for vibration. */
+    GBA_BUS[0] = 0x0002;
+}
+
+static int
+SDL_SYS_LogicError(void)
+{
+    SDL_SetError("Logic error: No haptic devices available.");
+    return 0;
+}
+
+
+int
+SDL_SYS_HapticInit(void)
+{
+    int ret = 0;
+    if(isRumbleInserted()) {
+        /* official rumble pak is present. */
+        ret = 1;
+        printf("debug: haptic present: nintendo\n");
+    } else if(NDS_EZF_IsPresent()) {
+        /* ezflash 3-in-1 pak is present. */
+        ret = 1;
+        printf("debug: haptic present: ezf3in1\n");
+        NDS_EZF_ChipReset();
+    } else {
+        printf("debug: no haptic found\n");
+    }
+
+    return ret;
+}
+
+
+const char *
+SDL_SYS_HapticName(int index)
+{
+    if(nds_haptic) {
+        switch(nds_haptic->hwdata->type) {
+            case OFFICIAL: return "Nintendo DS Rumble Pak";
+            case EZF3IN1: return "EZFlash 3-in-1 Rumble";
+            default: return NULL;
+        }
+    }
+    return NULL;
+}
+
+
+int
+SDL_SYS_HapticOpen(SDL_Haptic * haptic)
+{
+    if(!haptic) {
+        return -1;
+    }
+
+    haptic->hwdata = SDL_malloc(sizeof(NDS_HapticData));
+    if(!haptic->hwdata) {
+        SDL_OutOfMemory();
+        return -1;
+    }
+    nds_haptic = haptic;
+
+    haptic->supported = SDL_HAPTIC_CONSTANT;
+
+    /* determine what is here, if anything */
+    haptic->hwdata->type = NONE;
+    if(isRumbleInserted()) {
+        /* official rumble pak is present. */
+        haptic->hwdata->type = OFFICIAL;
+    } else if(NDS_EZF_IsPresent()) {
+        /* ezflash 3-in-1 pak is present. */
+        haptic->hwdata->type = EZF3IN1;
+        NDS_EZF_ChipReset();
+    } else {
+        /* no haptic present */
+        SDL_SYS_LogicError();
+        return -1;
+    }
+
+    return 0;
+}
+
+
+int
+SDL_SYS_HapticMouse(void)
+{
+    return -1;
+}
+
+
+int
+SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
+{
+    return 0;
+}
+
+
+int
+SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    /*SDL_SYS_LogicError();*/
+    return -1;
+}
+
+
+int
+SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    return 0;
+}
+
+
+void
+SDL_SYS_HapticClose(SDL_Haptic * haptic)
+{
+    return;
+}
+
+
+void
+SDL_SYS_HapticQuit(void)
+{
+    return;
+}
+
+
+int
+SDL_SYS_HapticNewEffect(SDL_Haptic * haptic,
+                        struct haptic_effect *effect, SDL_HapticEffect * base)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+
+int
+SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
+                           struct haptic_effect *effect,
+                           SDL_HapticEffect * data)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+
+int
+SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
+                        Uint32 iterations)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+
+int
+SDL_SYS_HapticStopEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+
+void
+SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    SDL_SYS_LogicError();
+    return;
+}
+
+
+int
+SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
+                              struct haptic_effect *effect)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+
+int
+SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+
+int
+SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+int
+SDL_SYS_HapticPause(SDL_Haptic * haptic)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+int
+SDL_SYS_HapticUnpause(SDL_Haptic * haptic)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+int
+SDL_SYS_HapticStopAll(SDL_Haptic * haptic)
+{
+    SDL_SYS_LogicError();
+    return -1;
+}
+
+
+
+#endif /* SDL_HAPTIC_NDS */
+/* vi: set ts=4 sw=4 expandtab: */
--- a/src/joystick/nds/SDL_sysjoystick.c	Thu Sep 04 13:43:39 2008 +0000
+++ b/src/joystick/nds/SDL_sysjoystick.c	Sat Sep 06 00:10:16 2008 +0000
@@ -44,8 +44,7 @@
 int
 SDL_SYS_JoystickInit(void)
 {
-    SDL_numjoysticks = 1;
-    
return (1);
+    SDL_numjoysticks = 1;
    return (1);
 }
 
 /* Function to get the device-dependent name of a joystick */
@@ -79,14 +78,14 @@
  * but instead should call SDL_PrivateJoystick*() to deliver events
  * and update joystick device state.
  */
-    void
+void
 SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
 {
     u32 keysd, keysu;
     int magnitude = 16384;
     
-        /*scanKeys(); */ 
-        keysd = keysDown();
+    /*scanKeys(); - this is done in PumpEvents, because touch uses it too */
+    keysd = keysDown();
     keysu = keysUp();
 
     if ((keysd & KEY_UP)) {
@@ -101,58 +100,58 @@
     if ((keysd & KEY_RIGHT)) {
         SDL_PrivateJoystickAxis(joystick, 0, magnitude);
     }
-    
if ((keysu & (KEY_UP | KEY_DOWN))) {
+
    if ((keysu & (KEY_UP | KEY_DOWN))) {
         SDL_PrivateJoystickAxis(joystick, 1, 0);
     }
-    
if ((keysu & (KEY_LEFT | KEY_RIGHT))) {
+
    if ((keysu & (KEY_LEFT | KEY_RIGHT))) {
         SDL_PrivateJoystickAxis(joystick, 0, 0);
     }
-    
if ((keysd & KEY_A)) {
+    
    if ((keysd & KEY_A)) {
         SDL_PrivateJoystickButton(joystick, 0, SDL_PRESSED);
     }
-    
if ((keysd & KEY_B)) {
+    
    if ((keysd & KEY_B)) {
         SDL_PrivateJoystickButton(joystick, 1, SDL_PRESSED);
     }
-    
if ((keysd & KEY_X)) {
+    
    if ((keysd & KEY_X)) {
         SDL_PrivateJoystickButton(joystick, 2, SDL_PRESSED);
     }
-    
if ((keysd & KEY_Y)) {
+    
    if ((keysd & KEY_Y)) {
         SDL_PrivateJoystickButton(joystick, 3, SDL_PRESSED);
     }
-    
if ((keysd & KEY_L)) {
+    
    if ((keysd & KEY_L)) {
         SDL_PrivateJoystickButton(joystick, 4, SDL_PRESSED);
     }
-    
if ((keysd & KEY_R)) {
+    
    if ((keysd & KEY_R)) {
         SDL_PrivateJoystickButton(joystick, 5, SDL_PRESSED);
     }
-    
if ((keysd & KEY_SELECT)) {
+    
    if ((keysd & KEY_SELECT)) {
         SDL_PrivateJoystickButton(joystick, 6, SDL_PRESSED);
     }
-    
if ((keysd & KEY_START)) {
+    
    if ((keysd & KEY_START)) {
         SDL_PrivateJoystickButton(joystick, 7, SDL_PRESSED);
     }
-    
if ((keysu & KEY_A)) {
+    
    if ((keysu & KEY_A)) {
         SDL_PrivateJoystickButton(joystick, 0, SDL_RELEASED);
     }
-    
if ((keysu & KEY_B)) {
+    
    if ((keysu & KEY_B)) {
         SDL_PrivateJoystickButton(joystick, 1, SDL_RELEASED);
     }
-    
if ((keysu & KEY_X)) {
+    
    if ((keysu & KEY_X)) {
         SDL_PrivateJoystickButton(joystick, 2, SDL_RELEASED);
     }
-    
if ((keysu & KEY_Y)) {
+    
    if ((keysu & KEY_Y)) {
         SDL_PrivateJoystickButton(joystick, 3, SDL_RELEASED);
     }
-    
if ((keysu & KEY_L)) {
+    
    if ((keysu & KEY_L)) {
         SDL_PrivateJoystickButton(joystick, 4, SDL_RELEASED);
     }
-    
if ((keysu & KEY_R)) {
+    
    if ((keysu & KEY_R)) {
         SDL_PrivateJoystickButton(joystick, 5, SDL_RELEASED);
     }
-    
if ((keysu & KEY_SELECT)) {
+    
    if ((keysu & KEY_SELECT)) {
         SDL_PrivateJoystickButton(joystick, 6, SDL_RELEASED);
     }
-    
if ((keysu & KEY_START)) {
+    
    if ((keysu & KEY_START)) {
         SDL_PrivateJoystickButton(joystick, 7, SDL_RELEASED);
     }
 
}
@@ -170,3 +169,4 @@
 }
 
 #endif /* SDL_JOYSTICK_NDS */
+
--- a/src/video/nds/SDL_ndsevents.c	Thu Sep 04 13:43:39 2008 +0000
+++ b/src/video/nds/SDL_ndsevents.c	Sat Sep 06 00:10:16 2008 +0000
@@ -47,7 +47,8 @@
     }
     if (keysHeld() & KEY_TOUCH) {
         touchPosition t = touchReadXY();
-        SDL_SendMouseMotion(0, 0, t.px, t.py);
+        SDL_SendMouseMotion(0, 0, t.px, t.py, 1); /* last arg is pressure,
+                                                     hardcoded 1 for now */
     }
 }