From: Lawrence S. <ljs...@us...> - 2022-08-18 00:59:57
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "A pseudo Operating System for the Dreamcast.". The branch, master has been updated via 9e6c35a3fe8be09619fd02d9feb0eee64cf44d23 (commit) via a26009baf8b20e8d08087baffd0bbcfc554c57a6 (commit) from 1d1d49eddcf4f3041bda9b44c7464641ede77a6f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9e6c35a3fe8be09619fd02d9feb0eee64cf44d23 Merge: 1d1d49e a26009b Author: Lawrence Sebald <ljs...@us...> Date: Wed Aug 17 20:58:38 2022 -0400 Merge pull request #76 from ArtemioUrbina/master Fixed controller capability Masks commit a26009baf8b20e8d08087baffd0bbcfc554c57a6 Author: Artemio Urbina <au...@ju...> Date: Thu Jun 16 00:08:19 2022 -0500 - Fixed controller capability Masks. Confirmed with a several official controllers in hardware using the 240p Test Suite Controller Test ----------------------------------------------------------------------- Summary of changes: .../arch/dreamcast/include/dc/maple/controller.h | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/kernel/arch/dreamcast/include/dc/maple/controller.h b/kernel/arch/dreamcast/include/dc/maple/controller.h index c0ae950..a4204ee 100644 --- a/kernel/arch/dreamcast/include/dc/maple/controller.h +++ b/kernel/arch/dreamcast/include/dc/maple/controller.h @@ -143,28 +143,28 @@ void cont_btn_callback(uint8 addr, uint32 btns, cont_btn_callback_t cb); @{ */ -#define CONT_CAPABILITY_C (1<<0) -#define CONT_CAPABILITY_B (1<<1) -#define CONT_CAPABILITY_A (1<<2) -#define CONT_CAPABILITY_START (1<<3) -#define CONT_CAPABILITY_DPAD_UP (1<<4) -#define CONT_CAPABILITY_DPAD_DOWN (1<<5) -#define CONT_CAPABILITY_DPAD_LEFT (1<<6) -#define CONT_CAPABILITY_DPAD_RIGHT (1<<7) -#define CONT_CAPABILITY_Z (1<<8) -#define CONT_CAPABILITY_Y (1<<9) -#define CONT_CAPABILITY_X (1<<10) -#define CONT_CAPABILITY_D (1<<11) -#define CONT_CAPABILITY_DPAD2_UP (1<<12) -#define CONT_CAPABILITY_DPAD2_DOWN (1<<13) -#define CONT_CAPABILITY_DPAD2_LEFT (1<<14) -#define CONT_CAPABILITY_DPAD2_RIGHT (1<<15) -#define CONT_CAPABILITY_RTRIG (1<<16) -#define CONT_CAPABILITY_LTRIG (1<<17) -#define CONT_CAPABILITY_ANALOG_X (1<<18) -#define CONT_CAPABILITY_ANALOG_Y (1<<19) -#define CONT_CAPABILITY_ANALOG2_X (1<<20) -#define CONT_CAPABILITY_ANALOG2_Y (1<<21) +#define CONT_CAPABILITY_C (1<<24) +#define CONT_CAPABILITY_B (1<<25) +#define CONT_CAPABILITY_A (1<<26) +#define CONT_CAPABILITY_START (1<<27) +#define CONT_CAPABILITY_DPAD_UP (1<<28) +#define CONT_CAPABILITY_DPAD_DOWN (1<<29) +#define CONT_CAPABILITY_DPAD_LEFT (1<<30) +#define CONT_CAPABILITY_DPAD_RIGHT (1<<31) +#define CONT_CAPABILITY_Z (1<<16) +#define CONT_CAPABILITY_Y (1<<17) +#define CONT_CAPABILITY_X (1<<18) +#define CONT_CAPABILITY_D (1<<19) +#define CONT_CAPABILITY_DPAD2_UP (1<<20) +#define CONT_CAPABILITY_DPAD2_DOWN (1<<21) +#define CONT_CAPABILITY_DPAD2_LEFT (1<<22) +#define CONT_CAPABILITY_DPAD2_RIGHT (1<<23) +#define CONT_CAPABILITY_RTRIG (1<<8) +#define CONT_CAPABILITY_LTRIG (1<<9) +#define CONT_CAPABILITY_ANALOG_X (1<<10) +#define CONT_CAPABILITY_ANALOG_Y (1<<11) +#define CONT_CAPABILITY_ANALOG2_X (1<<12) +#define CONT_CAPABILITY_ANALOG2_Y (1<<13) /** @} */ __END_DECLS hooks/post-receive -- A pseudo Operating System for the Dreamcast. |