[ADAPTER] Combine flags & PNP based quirks in same function

Author: darthcloud

main/adapter/mapping_quirks.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023, Jacques Gagnon
+ * Copyright (c) 2021-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -265,7 +265,20 @@ static void ouya(struct raw_src_mapping *map) {
     map->btns_mask[PAD_RJ] = BIT(OUYA_R3);
 }
 
+static void mapping_quirks_apply_pnp(struct bt_data *bt_data) {
+    switch (bt_data->base.vid) {
+        case 0x18D1: /* Google */
+            switch (bt_data->base.pid) {
+                case 0x9400: /* Stadia */
+                    stadia(&bt_data->raw_src_mappings[PAD]);
+                    break;
+            }
+            break;
+    }
+}
+
 void mapping_quirks_apply(struct bt_data *bt_data) {
+    mapping_quirks_apply_pnp(bt_data);
     if (atomic_test_bit(&bt_data->base.flags[PAD], BT_QUIRK_FACE_BTNS_INVERT)) {
         face_btns_invert(&bt_data->raw_src_mappings[PAD]);
     }
@@ -311,16 +324,4 @@ void mapping_quirks_apply(struct bt_data *bt_data) {
     if (atomic_test_bit(&bt_data->base.flags[PAD], BT_QUIRK_8BITDO_GBROS)) {
         gc_gbros_8bitdo(&bt_data->raw_src_mappings[PAD]);
     }
-}
-
-void mapping_quirks_apply_pnp(struct bt_data *bt_data) {
-    switch (bt_data->base.vid) {
-        case 0x18D1: /* Google */
-            switch (bt_data->base.pid) {
-                case 0x9400: /* Stadia */
-                    stadia(&bt_data->raw_src_mappings[PAD]);
-                    break;
-            }
-            break;
-    }
 }

main/adapter/mapping_quirks.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Jacques Gagnon
+ * Copyright (c) 2021-2025, Jacques Gagnon
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,6 +8,5 @@
 #include "adapter.h"
 
 void mapping_quirks_apply(struct bt_data *bt_data);
-void mapping_quirks_apply_pnp(struct bt_data *bt_data);
 
 #endif /* _MAPPING_QUIRKS_H_ */

main/bluetooth/att_hid.c

@@ -151,7 +151,6 @@ static void bt_att_hid_process_pnp(struct bt_dev *device,
     }
     printf("%s: VID: 0x%04X PID: 0x%04X\n", __FUNCTION__, bt_data->base.vid, bt_data->base.pid);
     bt_mon_log(true, "%s: VID: 0x%04X PID: 0x%04X\n", __FUNCTION__, bt_data->base.vid, bt_data->base.pid);
-    mapping_quirks_apply_pnp(bt_data);
     bt_att_hid_start_next_state(device, hid_data);
 }
 

main/bluetooth/sdp.c

@@ -182,7 +182,6 @@ void bt_sdp_parser(struct bt_data *bt_data) {
     }
     printf("%s: VID: 0x%04X PID: 0x%04X\n", __FUNCTION__, bt_data->base.vid, bt_data->base.pid);
     bt_mon_log(true, "%s: VID: 0x%04X PID: 0x%04X\n", __FUNCTION__, bt_data->base.vid, bt_data->base.pid);
-    mapping_quirks_apply_pnp(bt_data);
 
     hid_desc = memmem(bt_data->base.sdp_data, bt_data->base.sdp_len, sdp_hid_desc_list, sizeof(sdp_hid_desc_list));
     hid_offset = hid_desc - bt_data->base.sdp_data;