haiku: Patched to compile with new joystick interfaces.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index dff3a14..2a5b90b 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -64,6 +64,9 @@ static SDL_JoystickDriver *SDL_joystick_drivers[] = {
#ifdef SDL_JOYSTICK_EMSCRIPTEN
&SDL_EMSCRIPTEN_JoystickDriver,
#endif
+#ifdef SDL_JOYSTICK_HAIKU
+ &SDL_HAIKU_JoystickDriver,
+#endif
#ifdef SDL_JOYSTICK_USBHID /* !!! FIXME: "USBHID" is a generic name, and doubly-confusing with HIDAPI next to it. This is the *BSD interface, rename this. */
&SDL_BSD_JoystickDriver,
#endif
diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h
index 7a1f0d0..2b609db 100644
--- a/src/joystick/SDL_sysjoystick.h
+++ b/src/joystick/SDL_sysjoystick.h
@@ -142,6 +142,7 @@ extern SDL_JoystickDriver SDL_BSD_JoystickDriver;
extern SDL_JoystickDriver SDL_DARWIN_JoystickDriver;
extern SDL_JoystickDriver SDL_DUMMY_JoystickDriver;
extern SDL_JoystickDriver SDL_EMSCRIPTEN_JoystickDriver;
+extern SDL_JoystickDriver SDL_HAIKU_JoystickDriver;
extern SDL_JoystickDriver SDL_HIDAPI_JoystickDriver;
extern SDL_JoystickDriver SDL_IOS_JoystickDriver;
extern SDL_JoystickDriver SDL_LINUX_JoystickDriver;
diff --git a/src/joystick/haiku/SDL_haikujoystick.cc b/src/joystick/haiku/SDL_haikujoystick.cc
index 0832095..30f919c 100644
--- a/src/joystick/haiku/SDL_haikujoystick.cc
+++ b/src/joystick/haiku/SDL_haikujoystick.cc
@@ -50,13 +50,13 @@ extern "C"
int16 *new_axes;
};
- static int SDL_SYS_numjoysticks = 0;
+ static int numjoysticks = 0;
/* Function to scan the system for joysticks.
* Joystick 0 should be the system default joystick.
* It should return 0, or -1 on an unrecoverable fatal error.
*/
- int SDL_SYS_JoystickInit(void)
+ static int HAIKU_JoystickInit(void)
{
BJoystick joystick;
int i;
@@ -65,52 +65,54 @@ extern "C"
/* Search for attached joysticks */
nports = joystick.CountDevices();
- SDL_SYS_numjoysticks = 0;
+ numjoysticks = 0;
SDL_memset(SDL_joyport, 0, (sizeof SDL_joyport));
SDL_memset(SDL_joyname, 0, (sizeof SDL_joyname));
- for (i = 0; (SDL_SYS_numjoysticks < MAX_JOYSTICKS) && (i < nports); ++i)
+ for (i = 0; (numjoysticks < MAX_JOYSTICKS) && (i < nports); ++i)
{
if (joystick.GetDeviceName(i, name) == B_OK) {
if (joystick.Open(name) != B_ERROR) {
BString stick_name;
joystick.GetControllerName(&stick_name);
- SDL_joyport[SDL_SYS_numjoysticks] = SDL_strdup(name);
- SDL_joyname[SDL_SYS_numjoysticks] = SDL_strdup(stick_name.String());
- SDL_SYS_numjoysticks++;
+ SDL_joyport[numjoysticks] = SDL_strdup(name);
+ SDL_joyname[numjoysticks] = SDL_strdup(stick_name.String());
+ numjoysticks++;
joystick.Close();
}
}
}
- return (SDL_SYS_numjoysticks);
+ return (numjoysticks);
}
- int SDL_SYS_NumJoysticks(void)
+ static int HAIKU_JoystickGetCount(void)
{
- return SDL_SYS_numjoysticks;
+ return numjoysticks;
}
- void SDL_SYS_JoystickDetect(void)
+ static void HAIKU_JoystickDetect(void)
{
}
/* Function to get the device-dependent name of a joystick */
- const char *SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+ static const char *HAIKU_JoystickGetDeviceName(int device_index)
{
return SDL_joyname[device_index];
}
/* Function to perform the mapping from device index to the instance id for this index */
- SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+ static SDL_JoystickID HAIKU_JoystickGetDeviceInstanceID(int device_index)
{
return device_index;
}
+ static void HAIKU_JoystickClose(SDL_Joystick * joystick);
+
/* Function to open a joystick for use.
The joystick to open is specified by the device index.
This should fill the nbuttons and naxes fields of the joystick structure.
It returns 0, or -1 if there is an error.
*/
- int SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+ static int HAIKU_JoystickOpen(SDL_Joystick * joystick, int device_index)
{
BJoystick *stick;
@@ -127,7 +129,7 @@ extern "C"
/* Open the requested joystick for use */
if (stick->Open(SDL_joyport[device_index]) == B_ERROR) {
- SDL_SYS_JoystickClose(joystick);
+ HAIKU_JoystickClose(joystick);
return SDL_SetError("Unable to open joystick");
}
@@ -144,12 +146,12 @@ extern "C"
joystick->hwdata->new_hats = (uint8 *)
SDL_malloc(joystick->nhats * sizeof(uint8));
if (!joystick->hwdata->new_hats || !joystick->hwdata->new_axes) {
- SDL_SYS_JoystickClose(joystick);
+ HAIKU_JoystickClose(joystick);
return SDL_OutOfMemory();
}
/* We're done! */
- return (0);
+ return 0;
}
/* Function to update the state of a joystick - called as a device poll.
@@ -157,7 +159,7 @@ extern "C"
* but instead should call SDL_PrivateJoystick*() to deliver events
* and update joystick device state.
*/
- void SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+ static void HAIKU_JoystickUpdate(SDL_Joystick * joystick)
{
static const Uint8 hat_map[9] = {
SDL_HAT_CENTERED,
@@ -206,7 +208,7 @@ extern "C"
}
/* Function to close a joystick after use */
- void SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+ static void HAIKU_JoystickClose(SDL_Joystick * joystick)
{
if (joystick->hwdata) {
joystick->hwdata->stick->Close();
@@ -218,42 +220,52 @@ extern "C"
}
/* Function to perform any system-specific joystick related cleanup */
- void SDL_SYS_JoystickQuit(void)
+ static void HAIKU_JoystickQuit(void)
{
int i;
- for (i = 0; i < SDL_SYS_numjoysticks; ++i) {
+ for (i = 0; i < numjoysticks; ++i) {
SDL_free(SDL_joyport[i]);
}
SDL_joyport[0] = NULL;
- for (i = 0; i < SDL_SYS_numjoysticks; ++i) {
+ for (i = 0; i < numjoysticks; ++i) {
SDL_free(SDL_joyname[i]);
}
SDL_joyname[0] = NULL;
}
- SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+ static SDL_JoystickGUID HAIKU_JoystickGetDeviceGUID( int device_index )
{
SDL_JoystickGUID guid;
/* the GUID is just the first 16 chars of the name for now */
- const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+ const char *name = HAIKU_JoystickGetDeviceName( device_index );
SDL_zero( guid );
SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
return guid;
}
- SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+ static int HAIKU_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms)
{
- SDL_JoystickGUID guid;
- /* the GUID is just the first 16 chars of the name for now */
- const char *name = joystick->name;
- SDL_zero( guid );
- SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
- return guid;
+ return SDL_Unsupported();
}
-}; // extern "C"
+ SDL_JoystickDriver SDL_HAIKU_JoystickDriver =
+ {
+ HAIKU_JoystickInit,
+ HAIKU_JoystickGetCount,
+ HAIKU_JoystickDetect,
+ HAIKU_JoystickGetDeviceName,
+ HAIKU_JoystickGetDeviceGUID,
+ HAIKU_JoystickGetDeviceInstanceID,
+ HAIKU_JoystickOpen,
+ HAIKU_JoystickRumble,
+ HAIKU_JoystickUpdate,
+ HAIKU_JoystickClose,
+ HAIKU_JoystickQuit,
+ };
+
+} // extern "C"
#endif /* SDL_JOYSTICK_HAIKU */