← Back to branch summary

~ubuntu-branches/ubuntu/vivid/libsdl2/vivid

~ubuntu-branches/ubuntu/vivid/libsdl2/vivid

« back to all changes in this revision

Viewing changes to src/haptic/linux/SDL_syshaptic.c

Committer: Package Import Robot
Author(s): Manuel A. Fernandez Montecelo, Felix Geyer
Date: 2013-12-28 12:31:19 UTC
mfrom: (1.1.3)
Revision ID: package-import@ubuntu.com-20131228123119-e0k27gckmnzskfgb

Tags: 2.0.1+dfsg1-1

http://bugs.debian.org/728974

* New upstream release (Closes: #728974)
- Remove patch applied upstream:
bug-723797-false_positives_in_mouse_wheel_code.patch
* Bump Standards-Version to 3.9.5, no changes needed.

[ Felix Geyer ]
* Import upstream gpg key for uscan to verify the orig tarball.

files added:
README-raspberrypi.txt

build-scripts/androidbuild.sh

build-scripts/raspberrypi-buildbot.sh

debian/source/include-binaries

debian/upstream-signing-key.pgp

include/SDL_filesystem.h

src/core/linux

src/core/linux/SDL_udev.c

src/core/linux/SDL_udev.h

src/filesystem

src/filesystem/beos

src/filesystem/beos/SDL_sysfilesystem.cc

src/filesystem/cocoa

src/filesystem/cocoa/SDL_sysfilesystem.m

src/filesystem/dummy

src/filesystem/dummy/SDL_sysfilesystem.c

src/filesystem/unix

src/filesystem/unix/SDL_sysfilesystem.c

src/filesystem/windows

src/filesystem/windows/SDL_sysfilesystem.c

src/input

src/input/evdev

src/input/evdev/SDL_evdev.c

src/input/evdev/SDL_evdev.h

src/video/SDL_egl.c

src/video/SDL_egl.h

src/video/raspberry

src/video/raspberry/SDL_rpievents.c

src/video/raspberry/SDL_rpievents_c.h

src/video/raspberry/SDL_rpimouse.c

src/video/raspberry/SDL_rpimouse.h

src/video/raspberry/SDL_rpiopengles.c

src/video/raspberry/SDL_rpiopengles.h

src/video/raspberry/SDL_rpivideo.c

src/video/raspberry/SDL_rpivideo.h

test/testdropfile.c

test/testfilesystem.c

files removed:
.pc/bug-723797-false_positives_in_mouse_wheel_code.patch

.pc/bug-723797-false_positives_in_mouse_wheel_code.patch/src

.pc/bug-723797-false_positives_in_mouse_wheel_code.patch/src/video

.pc/bug-723797-false_positives_in_mouse_wheel_code.patch/src/video/x11

.pc/bug-723797-false_positives_in_mouse_wheel_code.patch/src/video/x11/SDL_x11events.c

debian/patches/bug-723797-false_positives_in_mouse_wheel_code.patch

files modified:
.pc/applied-patches

.pc/fix_joystick_misc_axes.diff/src/joystick/linux/SDL_sysjoystick.c

CMakeLists.txt

CREDITS.txt

Makefile.in

Makefile.minimal

Makefile.pandora

Makefile.psp

README-android.txt

README-macosx.txt

SDL2.spec

TODO.txt

WhatsNew.txt

build-scripts/config.guess

cmake/sdlchecks.cmake

configure

configure.in

debian/changelog

debian/control

debian/patches/series

debian/rules

debian/watch

include/SDL.h

include/SDL_assert.h

include/SDL_atomic.h

include/SDL_audio.h

include/SDL_config.h.cmake

include/SDL_config.h.in

include/SDL_config_android.h

include/SDL_config_iphoneos.h

include/SDL_config_macosx.h

include/SDL_config_minimal.h

include/SDL_config_pandora.h

include/SDL_config_psp.h

include/SDL_config_windows.h

include/SDL_cpuinfo.h

include/SDL_endian.h

include/SDL_error.h

include/SDL_events.h

include/SDL_haptic.h

include/SDL_hints.h

include/SDL_joystick.h

include/SDL_main.h

include/SDL_mutex.h

include/SDL_pixels.h

include/SDL_platform.h

include/SDL_rect.h

include/SDL_render.h

include/SDL_revision.h

include/SDL_rwops.h

include/SDL_scancode.h

include/SDL_stdinc.h

include/SDL_surface.h

include/SDL_system.h

include/SDL_test_common.h

include/SDL_test_harness.h

include/SDL_thread.h

include/SDL_timer.h

include/SDL_version.h

include/SDL_video.h

include/begin_code.h

src/SDL.c

src/SDL_assert.c

src/SDL_hints.c

src/SDL_log.c

src/atomic/SDL_atomic.c

src/atomic/SDL_spinlock.c

src/audio/SDL_audio.c

src/audio/SDL_audiodev.c

src/audio/SDL_wave.c

src/audio/alsa/SDL_alsa_audio.c

src/audio/arts/SDL_artsaudio.c

src/audio/bsd/SDL_bsdaudio.c

src/audio/directsound/SDL_directsound.c

src/audio/disk/SDL_diskaudio.c

src/audio/dsp/SDL_dspaudio.c

src/audio/esd/SDL_esdaudio.c

src/audio/fusionsound/SDL_fsaudio.c

src/audio/nas/SDL_nasaudio.c

src/audio/paudio/SDL_paudio.c

src/audio/psp/SDL_pspaudio.c

src/audio/pulseaudio/SDL_pulseaudio.c

src/audio/qsa/SDL_qsa_audio.c

src/audio/sndio/SDL_sndioaudio.c

src/audio/sun/SDL_sunaudio.c

src/audio/winmm/SDL_winmm.c

src/audio/xaudio2/SDL_xaudio2.c

src/core/android/SDL_android.c

src/core/android/SDL_android.h

src/core/windows/SDL_windows.c

src/core/windows/SDL_windows.h

src/cpuinfo/SDL_cpuinfo.c

src/events/SDL_events.c

src/events/SDL_gesture.c

src/events/SDL_keyboard.c

src/events/SDL_keyboard_c.h

src/events/SDL_mouse.c

src/events/SDL_touch.c

src/events/scancodes_windows.h

src/file/SDL_rwops.c

src/haptic/SDL_haptic.c

src/haptic/darwin/SDL_syshaptic.c

src/haptic/linux/SDL_syshaptic.c

src/haptic/windows/SDL_syshaptic.c

src/joystick/SDL_gamecontroller.c

src/joystick/SDL_joystick.c

src/joystick/SDL_sysjoystick.h

src/joystick/beos/SDL_bejoystick.cc

src/joystick/bsd/SDL_sysjoystick.c

src/joystick/darwin/SDL_sysjoystick.c

src/joystick/iphoneos/SDL_sysjoystick.m

src/joystick/linux/SDL_sysjoystick.c

src/joystick/psp/SDL_sysjoystick.c

src/joystick/windows/SDL_dxjoystick.c

src/joystick/windows/SDL_dxjoystick_c.h

src/joystick/windows/SDL_mmjoystick.c

src/libm/e_atan2.c

src/libm/e_pow.c

src/libm/math_private.h

src/libm/s_scalbn.c

src/main/android/SDL_android_main.c

src/main/beos/SDL_BApp.h

src/main/windows/SDL_windows_main.c

src/main/windows/version.rc

src/power/uikit/SDL_syspower.m

src/render/SDL_render.c

src/render/SDL_sysrender.h

src/render/SDL_yuv_sw.c

src/render/SDL_yuv_sw_c.h

src/render/direct3d/SDL_render_d3d.c

src/render/opengl/SDL_glfuncs.h

src/render/opengl/SDL_render_gl.c

src/render/opengl/SDL_shaders_gl.c

src/render/opengles/SDL_glesfuncs.h

src/render/opengles/SDL_render_gles.c

src/render/opengles2/SDL_render_gles2.c

src/render/psp/SDL_render_psp.c

src/render/software/SDL_render_sw.c

src/render/software/SDL_rotate.c

src/render/software/SDL_rotate.h

src/stdlib/SDL_getenv.c

src/stdlib/SDL_iconv.c

src/stdlib/SDL_string.c

src/test/SDL_test_assert.c

src/test/SDL_test_common.c

src/test/SDL_test_font.c

src/test/SDL_test_fuzzer.c

src/test/SDL_test_harness.c

src/test/SDL_test_log.c

src/thread/SDL_systhread.h

src/thread/SDL_thread.c

src/thread/SDL_thread_c.h

src/thread/pthread/SDL_syssem.c

src/thread/windows/SDL_systhread.c

src/thread/windows/SDL_systls.c

src/timer/SDL_timer.c

src/timer/beos/SDL_systimer.c

src/timer/dummy/SDL_systimer.c

src/timer/psp/SDL_systimer.c

src/timer/unix/SDL_systimer.c

src/timer/windows/SDL_systimer.c

src/video/SDL_RLEaccel.c

src/video/SDL_blit_A.c

src/video/SDL_blit_copy.c

src/video/SDL_bmp.c

src/video/SDL_clipboard.c

src/video/SDL_fillrect.c

src/video/SDL_pixels.c

src/video/SDL_rect.c

src/video/SDL_shape.c

src/video/SDL_stretch.c

src/video/SDL_surface.c

src/video/SDL_sysvideo.h

src/video/SDL_video.c

src/video/android/SDL_androidevents.c

src/video/android/SDL_androidgl.c

src/video/android/SDL_androidtouch.c

src/video/android/SDL_androidtouch.h

src/video/android/SDL_androidvideo.c

src/video/android/SDL_androidwindow.c

src/video/android/SDL_androidwindow.h

src/video/bwindow/SDL_BWin.h

src/video/bwindow/SDL_bclipboard.cc

src/video/bwindow/SDL_bframebuffer.cc

src/video/bwindow/SDL_bmodes.cc

src/video/bwindow/SDL_bopengl.cc

src/video/bwindow/SDL_bopengl.h

src/video/bwindow/SDL_bwindow.cc

src/video/cocoa/SDL_cocoaclipboard.m

src/video/cocoa/SDL_cocoaevents.m

src/video/cocoa/SDL_cocoamodes.m

src/video/cocoa/SDL_cocoamouse.m

src/video/cocoa/SDL_cocoaopengl.h

src/video/cocoa/SDL_cocoaopengl.m

src/video/cocoa/SDL_cocoashape.m

src/video/cocoa/SDL_cocoavideo.m

src/video/cocoa/SDL_cocoawindow.h

src/video/cocoa/SDL_cocoawindow.m

src/video/directfb/SDL_DirectFB_WM.c

src/video/directfb/SDL_DirectFB_events.c

src/video/directfb/SDL_DirectFB_render.c

src/video/directfb/SDL_DirectFB_shape.c

src/video/directfb/SDL_DirectFB_video.c

src/video/directfb/SDL_DirectFB_video.h

src/video/directfb/SDL_DirectFB_window.c

src/video/directfb/SDL_DirectFB_window.h

src/video/dummy/SDL_nullframebuffer.c

src/video/dummy/SDL_nullvideo.c

src/video/psp/SDL_pspevents.c

src/video/psp/SDL_pspvideo.c

src/video/psp/SDL_pspvideo.h

src/video/uikit/SDL_uikitopenglview.m

src/video/uikit/SDL_uikitvideo.m

src/video/uikit/SDL_uikitview.m

src/video/uikit/SDL_uikitviewcontroller.h

src/video/uikit/SDL_uikitviewcontroller.m

src/video/uikit/SDL_uikitwindow.m

src/video/uikit/keyinfotable.h

src/video/windows/SDL_windowsclipboard.c

src/video/windows/SDL_windowsevents.c

src/video/windows/SDL_windowskeyboard.c

src/video/windows/SDL_windowsmessagebox.c

src/video/windows/SDL_windowsopengl.c

src/video/windows/SDL_windowsvideo.c

src/video/windows/SDL_windowsvideo.h

src/video/windows/SDL_windowswindow.c

src/video/x11/SDL_x11clipboard.c

src/video/x11/SDL_x11dyn.c

src/video/x11/SDL_x11dyn.h

src/video/x11/SDL_x11events.c

src/video/x11/SDL_x11framebuffer.c

src/video/x11/SDL_x11keyboard.c

src/video/x11/SDL_x11messagebox.c

src/video/x11/SDL_x11modes.c

src/video/x11/SDL_x11mouse.c

src/video/x11/SDL_x11opengl.c

src/video/x11/SDL_x11opengl.h

src/video/x11/SDL_x11opengles.c

src/video/x11/SDL_x11opengles.h

src/video/x11/SDL_x11shape.c

src/video/x11/SDL_x11sym.h

src/video/x11/SDL_x11video.c

src/video/x11/SDL_x11window.c

src/video/x11/SDL_x11window.h

src/video/x11/SDL_x11xinput2.c

src/video/x11/SDL_x11xinput2.h

src/video/x11/imKStoUCS.h

test/Makefile.in

test/checkkeys.c

test/configure

test/configure.in

test/loopwave.c

test/testatomic.c

test/testaudioinfo.c

test/testautomation.c

test/testautomation_audio.c

test/testautomation_clipboard.c

test/testautomation_events.c

test/testautomation_main.c

test/testautomation_pixels.c

test/testautomation_platform.c

test/testautomation_rect.c

test/testautomation_render.c

test/testautomation_rwops.c

test/testautomation_sdltest.c

test/testautomation_suites.h

test/testautomation_surface.c

test/testautomation_video.c

test/testdraw2.c

test/testdrawchessboard.c

test/testerror.c

test/testfile.c

test/testgamecontroller.c

test/testgesture.c

test/testgl2.c

test/testgles.c

test/testhaptic.c

test/testiconv.c

test/testime.c

test/testintersections.c

test/testjoystick.c

test/testkeys.c

test/testloadso.c

test/testlock.c

test/testmessage.c

test/testmultiaudio.c

test/testnative.c

test/testoverlay2.c

test/testplatform.c

test/testpower.c

test/testrelative.c

test/testrendercopyex.c

test/testrendertarget.c

test/testresample.c

test/testrumble.c

test/testscale.c

test/testsem.c

test/testshader.c

test/testshape.c

test/testsprite2.c

test/testspriteminimal.c

test/teststreaming.c

test/testthread.c

test/testtimer.c

test/testver.c

test/testwm2.c

test/torturethread.c

Show diffs side-by-side

added added

removed removed

src/haptic/linux/SDL_syshaptic.c

100

100

EV_TEST(FF_CONSTANT, SDL_HAPTIC_CONSTANT);

101

101

EV_TEST(FF_SINE, SDL_HAPTIC_SINE);

102

102

/* !!! FIXME: put this back when we have more bits in 2.1 */

103

/*EV_TEST(FF_SQUARE, SDL_HAPTIC_SQUARE);*/

103

/* EV_TEST(FF_SQUARE, SDL_HAPTIC_SQUARE); */

104

104

EV_TEST(FF_TRIANGLE, SDL_HAPTIC_TRIANGLE);

105

105

EV_TEST(FF_SAW_UP, SDL_HAPTIC_SAWTOOTHUP);

106

106

EV_TEST(FF_SAW_DOWN, SDL_HAPTIC_SAWTOOTHDOWN);

368

368

369

369

370

370

/*

371

* Checks to see if the haptic device and joystick and in reality the same.

371

* Checks to see if the haptic device and joystick are in reality the same.

372

372

*/

373

373

int

374

374

SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)

600

600

601

601

case SDL_HAPTIC_SINE:

602

602

/* !!! FIXME: put this back when we have more bits in 2.1 */

603

/*case SDL_HAPTIC_SQUARE:*/

603

/* case SDL_HAPTIC_SQUARE: */

604

604

case SDL_HAPTIC_TRIANGLE:

605

605

case SDL_HAPTIC_SAWTOOTHUP:

606

606

case SDL_HAPTIC_SAWTOOTHDOWN:

625

625

if (periodic->type == SDL_HAPTIC_SINE)

626

626

dest->u.periodic.waveform = FF_SINE;

627

627

/* !!! FIXME: put this back when we have more bits in 2.1 */

628

/*else if (periodic->type == SDL_HAPTIC_SQUARE)

629

dest->u.periodic.waveform = FF_SQUARE;*/

628

/* else if (periodic->type == SDL_HAPTIC_SQUARE)

629

dest->u.periodic.waveform = FF_SQUARE; */

630

630

else if (periodic->type == SDL_HAPTIC_TRIANGLE)

631

631

dest->u.periodic.waveform = FF_TRIANGLE;

632

632

else if (periodic->type == SDL_HAPTIC_SAWTOOTHUP)

Older »