Cleanup some vi footer comments, rename new PRIVATE_* funcs to MacHaptic_*.
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
diff --git a/src/haptic/SDL_syshaptic.h b/src/haptic/SDL_syshaptic.h
index bc0dae8..b2918be 100644
--- a/src/haptic/SDL_syshaptic.h
+++ b/src/haptic/SDL_syshaptic.h
@@ -205,3 +205,6 @@ extern int SDL_SYS_HapticUnpause(SDL_Haptic * haptic);
* Returns 0 on success, -1 on error.
*/
extern int SDL_SYS_HapticStopAll(SDL_Haptic * haptic);
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c
index 6df950b..75bafc0 100644
--- a/src/haptic/darwin/SDL_syshaptic.c
+++ b/src/haptic/darwin/SDL_syshaptic.c
@@ -173,7 +173,7 @@ SDL_SYS_HapticInit(void)
}
while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) {
- PRIVATE_MaybeAddDevice(device);
+ MacHaptic_MaybeAddDevice(device);
/* always release as the AddDevice will retain IF it's a forcefeedback device */
IOObjectRelease(device);
}
@@ -207,7 +207,7 @@ HapticByDevIndex(int device_index)
}
int
-PRIVATE_MaybeAddDevice( io_object_t device )
+MacHaptic_MaybeAddDevice( io_object_t device )
{
IOReturn result;
CFMutableDictionaryRef hidProperties;
@@ -283,7 +283,7 @@ PRIVATE_MaybeAddDevice( io_object_t device )
}
int
-PRIVATE_MaybeRemoveDevice( io_object_t device )
+MacHaptic_MaybeRemoveDevice( io_object_t device )
{
SDL_hapticlist_item *item;
SDL_hapticlist_item *prev = NULL;
diff --git a/src/haptic/darwin/SDL_syshaptic_c.h b/src/haptic/darwin/SDL_syshaptic_c.h
index 0e86253..f807207 100644
--- a/src/haptic/darwin/SDL_syshaptic_c.h
+++ b/src/haptic/darwin/SDL_syshaptic_c.h
@@ -1,26 +1,26 @@
/*
- Simple DirectMedia Layer
- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
- */
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
-int
-PRIVATE_MaybeAddDevice( io_object_t device );
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+extern int MacHaptic_MaybeAddDevice( io_object_t device );
+extern int MacHaptic_MaybeRemoveDevice( io_object_t device );
+
+/* vi: set ts=4 sw=4 expandtab: */
-int
-PRIVATE_MaybeRemoveDevice( io_object_t device );
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index f57bcf8..4be0162 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/src/joystick/darwin/SDL_sysjoystick.c
@@ -124,7 +124,7 @@ HIDRemovalCallback(void *target, IOReturn result, void *refcon, void *sender)
recDevice *device = (recDevice *) refcon;
device->removed = 1;
#if SDL_HAPTIC_IOKIT
- PRIVATE_MaybeRemoveDevice(device->ffservice);
+ MacHaptic_MaybeRemoveDevice(device->ffservice);
#endif
s_bDeviceRemoved = SDL_TRUE;
}
@@ -139,7 +139,7 @@ void JoystickDeviceWasRemovedCallback( void * refcon, io_service_t service, natu
recDevice *device = (recDevice *) refcon;
device->removed = 1;
#if SDL_HAPTIC_IOKIT
- PRIVATE_MaybeRemoveDevice(device->ffservice);
+ MacHaptic_MaybeRemoveDevice(device->ffservice);
#endif
s_bDeviceRemoved = SDL_TRUE;
}
@@ -687,7 +687,7 @@ AddDeviceHelper( io_object_t ioHIDDeviceObject )
if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) {
device->ffservice = ioHIDDeviceObject;
#if SDL_HAPTIC_IOKIT
- PRIVATE_MaybeAddDevice(ioHIDDeviceObject);
+ MacHaptic_MaybeAddDevice(ioHIDDeviceObject);
#endif
} else {
device->ffservice = 0;