riscos: Increase the number of supported joystick buttons SDL-1.2
authorCameron Cawley <ccawley2011@gmail.com>
Thu, 13 Feb 2020 20:32:26 +0000
branchSDL-1.2
changeset 138022f82852644d1
parent 13688 ab7529cb9558
child 13920 1d55c02cc513
riscos: Increase the number of supported joystick buttons
README.RISCOS
WhatsNew
docs.html
src/joystick/riscos/SDL_sysjoystick.c
     1.1 --- a/README.RISCOS	Sun Apr 05 08:54:07 2020 -0700
     1.2 +++ b/README.RISCOS	Thu Feb 13 20:32:26 2020 +0000
     1.3 @@ -83,7 +83,7 @@
     1.4  video - Mostly done. Doesn't cover gamma, YUV-overlay or OpenGL.
     1.5  Window Manager - Mostly done. SetIcon not implemented.
     1.6  Events - Mostly done. Resize and some joystick events missing.
     1.7 -Joystick - Currently assumes a single joystick with 4 buttons.
     1.8 +Joystick - Currently assumes a single joystick with 8 buttons.
     1.9  Audio - Done
    1.10  CDROM - Not implemented.
    1.11  Threads - Done
    1.12 @@ -115,7 +115,7 @@
    1.13     Unicode translation used here is only really accurate for 7 bit characters.
    1.14  
    1.15  SDL_NumJoysticks/JoystickName etc.
    1.16 -   Hardcoded to expect only 1 joystick with 4 buttons if the Joystick module is loaded.
    1.17 +   Hardcoded to expect only 1 joystick with 8 buttons if the Joystick module is loaded.
    1.18  
    1.19  SDL_GetTicks
    1.20     Timer used has only a centisecond accuracy. This applies to other time related functions.
     2.1 --- a/WhatsNew	Sun Apr 05 08:54:07 2020 -0700
     2.2 +++ b/WhatsNew	Thu Feb 13 20:32:26 2020 +0000
     2.3 @@ -85,6 +85,7 @@
     2.4  - RISC OS: implement SDL_WM_IconifyWindow()
     2.5  - RISC OS: send SDL_APPACTIVE events when iconizing the window.
     2.6  - RISC OS: support creating windows with the SDL_NOFRAME flag set.
     2.7 +- RISC OS: increase the number of supported joystick buttons.
     2.8  - Configuration: fix library detection selecting wrong lib (bug 2795.)
     2.9  - Configuration: fix detecting dynamic library support on powerpc64le
    2.10    (bug 3481.)
     3.1 --- a/docs.html	Sun Apr 05 08:54:07 2020 -0700
     3.2 +++ b/docs.html	Thu Feb 13 20:32:26 2020 +0000
     3.3 @@ -210,6 +210,9 @@
     3.4    RISC OS: support creating windows with the SDL_NOFRAME flag set.
     3.5  </P>
     3.6  <P>
     3.7 +  RISC OS: increase the number of supported joystick buttons.
     3.8 +</P>
     3.9 +<P>
    3.10    Configuration: fix library detection selecting wrong lib (bug <a href="https://bugzilla.libsdl.org/show_bug.cgi?id=2795">2795</a>.)
    3.11  </P>
    3.12  <P>
     4.1 --- a/src/joystick/riscos/SDL_sysjoystick.c	Sun Apr 05 08:54:07 2020 -0700
     4.2 +++ b/src/joystick/riscos/SDL_sysjoystick.c	Thu Feb 13 20:32:26 2020 +0000
     4.3 @@ -27,7 +27,7 @@
     4.4     RISC OS - Joystick support by Alan Buckley (alan_baa@hotmail.com) - 10 April 2003
     4.5  
     4.6     Note: Currently assumes joystick is present if joystick module is loaded
     4.7 -   and that there is one joystick with four buttons.
     4.8 +   and that there is one joystick with eight buttons.
     4.9  */
    4.10  
    4.11  /* This is the system specific header for the SDL joystick API */
    4.12 @@ -94,8 +94,8 @@
    4.13  		return -1;
    4.14  	}
    4.15  
    4.16 -	/* Don't know how to get exact count of buttons so assume max of 4 for now */
    4.17 -	joystick->nbuttons=4;
    4.18 +	/* Don't know how to get exact count of buttons so assume max of 8 for now */
    4.19 +	joystick->nbuttons=8;
    4.20  
    4.21  	joystick->nhats=0;
    4.22  	joystick->nballs=0;