From f638d49693df4edd63162b2377881cf2ae646378 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sun, 22 Oct 2023 14:45:58 +0200 Subject: [PATCH] port: fit the CK_ enum back into 32 bits --- port/include/input.h | 12 ++++-------- port/src/input.c | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/port/include/input.h b/port/include/input.h index 89144224c..49c94de0e 100644 --- a/port/include/input.h +++ b/port/include/input.h @@ -59,10 +59,10 @@ enum contkey { CK_ZTRIG, CK_B, CK_A, - CK_0001, - CK_0002, - CK_0004, - CK_0008, + CK_STICK_XNEG, + CK_STICK_XPOS, + CK_STICK_YNEG, + CK_STICK_YPOS, CK_0010, CK_0020, CK_0040, @@ -75,10 +75,6 @@ enum contkey { CK_2000, CK_4000, CK_8000, - CK_STICK_XNEG, - CK_STICK_XPOS, - CK_STICK_YNEG, - CK_STICK_YPOS, CK_TOTAL_COUNT }; diff --git a/port/src/input.c b/port/src/input.c index def2330a0..c11c6a8e0 100644 --- a/port/src/input.c +++ b/port/src/input.c @@ -73,10 +73,10 @@ static const char *ckNames[CK_TOTAL_COUNT] = { "Z_TRIG", "B_BUTTON", "A_BUTTON", - "CK_0001", - "CK_0002", - "CK_0004", - "CK_0008", + "STICK_XNEG", + "STICK_XPOS", + "STICK_YNEG", + "STICK_YPOS", "CK_0010", "CK_0020", "CK_0040", @@ -89,10 +89,6 @@ static const char *ckNames[CK_TOTAL_COUNT] = { "CK_2000", "CK_4000", "CK_8000" - "STICK_XNEG", - "STICK_XPOS", - "STICK_YNEG", - "STICK_YPOS", }; static const char *vkPunctNames[] = {