Skip to content

Commit d5b31ff

Browse files
Cleanup RazerController transaction ID by adding transaction ID to device table rather than using a switch statement
1 parent 6c7f0df commit d5b31ff

File tree

3 files changed

+154
-74
lines changed

3 files changed

+154
-74
lines changed

Controllers/RazerController/RazerController.cpp

Lines changed: 2 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -55,88 +55,16 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha
5555
/*-----------------------------------------------------------------*\
5656
| Determine transaction ID for device |
5757
\*-----------------------------------------------------------------*/
58+
dev_transaction_id = device_list[device_index]->transaction_id;
59+
5860
switch(dev_pid)
5961
{
60-
case RAZER_BASE_STATION_V2_CHROMA_PID:
61-
case RAZER_BASILISK_V3_PID:
62-
case RAZER_BASILISK_V3_PRO_BLUETOOTH_PID:
63-
case RAZER_BASILISK_V3_PRO_WIRED_PID:
64-
case RAZER_BASILISK_V3_PRO_WIRELESS_PID:
65-
case RAZER_BLACKWIDOW_2019_PID:
66-
case RAZER_BLACKWIDOW_ELITE_PID:
67-
case RAZER_BLACKWIDOW_V3_MINI_WIRED_PID:
68-
case RAZER_BLADE_14_2022_PID:
69-
case RAZER_BLADE_15_2022_PID:
70-
case RAZER_BLADE_2021_BASE_V2_PID:
71-
case RAZER_CYNOSA_V2_PID:
72-
case RAZER_DEATHADDER_CHROMA_PID:
73-
case RAZER_DEATHADDER_ESSENTIAL_V2_PID:
74-
case RAZER_DEATHADDER_V2_MINI_PID:
75-
case RAZER_DEATHSTALKER_V2_PID:
76-
case RAZER_KRAKEN_KITTY_EDITION_PID:
77-
case RAZER_LAPTOP_STAND_CHROMA_PID:
78-
case RAZER_LAPTOP_STAND_CHROMA_V2_PID:
79-
case RAZER_LEVIATHAN_V2X_PID:
80-
case RAZER_MAMBA_ELITE_PID:
81-
case RAZER_MOUSE_BUNGEE_V3_CHROMA_PID:
82-
case RAZER_NAGA_CLASSIC_PID:
83-
case RAZER_NAGA_EPIC_CHROMA_PID:
84-
case RAZER_NAGA_LEFT_HANDED_PID:
85-
case RAZER_NAGA_PRO_WIRED_PID:
86-
case RAZER_NAGA_PRO_WIRELESS_PID:
87-
case RAZER_O11_DYNAMIC_PID:
88-
case RAZER_ORNATA_CHROMA_V2_PID:
89-
case RAZER_ORNATA_V3_PID:
90-
case RAZER_ORNATA_V3_REV2_PID:
91-
case RAZER_ORNATA_V3_X_PID:
92-
case RAZER_TARTARUS_CHROMA_PID:
93-
case RAZER_TARTARUS_PRO_PID:
94-
case RAZER_TARTARUS_V2_PID:
95-
case RAZER_VIPER_8KHZ_PID:
96-
dev_transaction_id = 0x1F;
97-
break;
98-
9962
case RAZER_CHARGING_PAD_CHROMA_PID:
100-
{
101-
razer_set_device_mode(RAZER_DEVICE_MODE_SOFTWARE);
102-
dev_transaction_id = 0x1F;
103-
}
104-
break;
105-
10663
case RAZER_CHROMA_MUG_PID:
10764
{
10865
razer_set_device_mode(RAZER_DEVICE_MODE_SOFTWARE);
109-
dev_transaction_id = 0x3F;
11066
}
11167
break;
112-
113-
case RAZER_BLACKWIDOW_V3_MINI_WIRELESS_PID:
114-
case RAZER_DEATHSTALKER_V2_PRO_WIRED_PID:
115-
case RAZER_DEATHSTALKER_V2_PRO_WIRELESS_PID:
116-
{
117-
dev_transaction_id = 0x9F;
118-
break;
119-
}
120-
121-
case RAZER_MOUSE_DOCK_PRO_PID:
122-
dev_transaction_id = 0xFF;
123-
break;
124-
125-
case RAZER_GOLIATHUS_CHROMA_PID:
126-
case RAZER_GOLIATHUS_CHROMA_EXTENDED_PID:
127-
case RAZER_BASE_STATION_CHROMA_PID:
128-
case RAZER_CHROMA_HDK_PID:
129-
case RAZER_CORE_PID:
130-
case RAZER_CORE_X_PID:
131-
case RAZER_FIREFLY_PID:
132-
case RAZER_FIREFLY_HYPERFLUX_PID:
133-
case RAZER_FIREFLY_V2_PID:
134-
case RAZER_NOMMO_CHROMA_PID:
135-
case RAZER_NOMMO_PRO_PID:
136-
case RAZER_STRIDER_CHROMA_PID:
137-
default:
138-
dev_transaction_id = 0x3F;
139-
break;
14068
}
14169

14270
/*-----------------------------------------------------------------*\

0 commit comments

Comments
 (0)