ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9049 from Ebola16/GCAC 

GCAdapter_Android: Minor cleanup
This commit is contained in:
Jordan Woyak 2020-08-30 19:48:07 -05:00 committed by GitHub
parent 0a63340c20 acd717ffae
commit e0b64e0ef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/InputCommon/GCAdapter_Android.cpp
View File

@ -33,7 +33,7 @@ static jclass s_adapter_class;
static bool s_detected = false; static bool s_detected = false;
static int s_fd = 0; static int s_fd = 0;
static u8 s_controller_type[SerialInterface::MAX_SI_CHANNELS] = { static std::array<u8, SerialInterface::MAX_SI_CHANNELS> s_controller_type = {
ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE,
ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE}; ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE};
static u8 s_controller_rumble[4]; static u8 s_controller_rumble[4];
@ -96,7 +96,7 @@ static void Write()
if (write_size) if (write_size)
{ {
jbyteArray jrumble_array = env->NewByteArray(5); jbyteArray jrumble_array = env->NewByteArray(5);
jbyte* jrumble = env->GetByteArrayElements(jrumble_array, NULL); jbyte* jrumble = env->GetByteArrayElements(jrumble_array, nullptr);
{ {
std::lock_guard<std::mutex> lk(s_write_mutex); std::lock_guard<std::mutex> lk(s_write_mutex);
@ -129,7 +129,7 @@ static void Read()
jfieldID payload_field = env->GetStaticFieldID(s_adapter_class, "controller_payload", "[B"); jfieldID payload_field = env->GetStaticFieldID(s_adapter_class, "controller_payload", "[B");
jobject payload_object = env->GetStaticObjectField(s_adapter_class, payload_field); jobject payload_object = env->GetStaticObjectField(s_adapter_class, payload_field);
jbyteArray* java_controller_payload = reinterpret_cast<jbyteArray*>(&payload_object); auto* java_controller_payload = reinterpret_cast<jbyteArray*>(&payload_object);
// Get function pointers // Get function pointers
jmethodID getfd_func = env->GetStaticMethodID(s_adapter_class, "GetFD", "()I"); jmethodID getfd_func = env->GetStaticMethodID(s_adapter_class, "GetFD", "()I");
@ -225,8 +225,7 @@ static void Reset()
if (s_read_adapter_thread_running.TestAndClear()) if (s_read_adapter_thread_running.TestAndClear())
s_read_adapter_thread.join(); s_read_adapter_thread.join();
for (int i = 0; i < SerialInterface::MAX_SI_CHANNELS; i++) s_controller_type.fill(ControllerTypes::CONTROLLER_NONE);
s_controller_type[i] = ControllerTypes::CONTROLLER_NONE;
s_detected = false; s_detected = false;
s_fd = 0; s_fd = 0;
@ -260,7 +259,7 @@ GCPadStatus Input(int chan)
return {}; return {};
int payload_size = 0; int payload_size = 0;
std::array<u8, 37> controller_payload_copy; std::array<u8, 37> controller_payload_copy{};
{ {
std::lock_guard<std::mutex> lk(s_read_mutex); std::lock_guard<std::mutex> lk(s_read_mutex);