i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ps2: Use a real mutex for the controller lock rather than a semaphore.

Browse Source
This commit is contained in:
Augustin Cavalier
2024-09-19 13:41:59 -04:00
parent ad4f2d20a1
commit 805208b667
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ps2/ps2_common.cpp
+8 -8
View File
@@ -31,7 +31,7 @@
isa_module_info *gIsa = NULL; isa_module_info *gIsa = NULL;
bool gActiveMultiplexingEnabled = false; bool gActiveMultiplexingEnabled = false;
bool gSetupComplete = false; bool gSetupComplete = false;
sem_id gControllerSem; mutex gControllerLock;
static int32 sIgnoreInterrupts = 0; static int32 sIgnoreInterrupts = 0;
@@ -102,7 +102,7 @@ ps2_flush(void)
{ {
int i; int i;
acquire_sem(gControllerSem); mutex_lock(&gControllerLock);
atomic_add(&sIgnoreInterrupts, 1); atomic_add(&sIgnoreInterrupts, 1);
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
@@ -117,7 +117,7 @@ ps2_flush(void)
} }
atomic_add(&sIgnoreInterrupts, -1); atomic_add(&sIgnoreInterrupts, -1);
release_sem(gControllerSem); mutex_unlock(&gControllerLock);
} }
@@ -242,7 +242,7 @@ ps2_command(uint8 cmd, const uint8 *out, int outCount, uint8 *in, int inCount)
status_t res; status_t res;
int i; int i;
acquire_sem(gControllerSem); mutex_lock(&gControllerLock);
atomic_add(&sIgnoreInterrupts, 1); atomic_add(&sIgnoreInterrupts, 1);
#ifdef TRACE_PS2_COMMON #ifdef TRACE_PS2_COMMON
@@ -278,7 +278,7 @@ ps2_command(uint8 cmd, const uint8 *out, int outCount, uint8 *in, int inCount)
#endif #endif
atomic_add(&sIgnoreInterrupts, -1); atomic_add(&sIgnoreInterrupts, -1);
release_sem(gControllerSem); mutex_unlock(&gControllerLock);
return res; return res;
} }
@@ -355,7 +355,7 @@ ps2_init(void)
if (status < B_OK) if (status < B_OK)
return status; return status;
gControllerSem = create_sem(1, "ps/2 keyb ctrl"); mutex_init(&gControllerLock, "ps/2 keyb ctrl");
ps2_flush(); ps2_flush();
@@ -439,7 +439,7 @@ err3:
err2: err2:
ps2_dev_exit(); ps2_dev_exit();
err1: err1:
delete_sem(gControllerSem); mutex_destroy(&gControllerLock);
put_module(B_ISA_MODULE_NAME); put_module(B_ISA_MODULE_NAME);
TRACE("ps2: init failed!\n"); TRACE("ps2: init failed!\n");
return B_ERROR; return B_ERROR;
@@ -454,6 +454,6 @@ ps2_uninit(void)
remove_io_interrupt_handler(INT_PS2_KEYBOARD, &ps2_interrupt, NULL); remove_io_interrupt_handler(INT_PS2_KEYBOARD, &ps2_interrupt, NULL);
ps2_service_exit(); ps2_service_exit();
ps2_dev_exit(); ps2_dev_exit();
delete_sem(gControllerSem); mutex_destroy(&gControllerLock);
put_module(B_ISA_MODULE_NAME); put_module(B_ISA_MODULE_NAME);
} }
src/add-ons/kernel/bus_managers/ps2/ps2_common.h
+2 -2
View File
@@ -17,7 +17,7 @@
#include <ISA.h> #include <ISA.h>
#include <Drivers.h> #include <Drivers.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <OS.h> #include <lock.h>
#include "ps2_defs.h" #include "ps2_defs.h"
#include "ps2_dev.h" #include "ps2_dev.h"
@@ -52,7 +52,7 @@ extern device_hooks gPointingDeviceHooks;
extern bool gActiveMultiplexingEnabled; extern bool gActiveMultiplexingEnabled;
extern bool gSetupComplete; extern bool gSetupComplete;
extern sem_id gControllerSem; extern mutex gControllerLock;
#ifdef __cplusplus #ifdef __cplusplus
src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
+2 -2
View File
@@ -407,7 +407,7 @@ standard_command_timeout(ps2_dev* dev, uint8 cmd, const uint8* out,
atomic_and(&dev->flags, atomic_and(&dev->flags,
~(PS2_FLAG_ACK | PS2_FLAG_NACK | PS2_FLAG_GETID | PS2_FLAG_RESEND)); ~(PS2_FLAG_ACK | PS2_FLAG_NACK | PS2_FLAG_GETID | PS2_FLAG_RESEND));
acquire_sem(gControllerSem); mutex_lock(&gControllerLock);
if (!(atomic_get(&dev->flags) & PS2_FLAG_KEYB)) { if (!(atomic_get(&dev->flags) & PS2_FLAG_KEYB)) {
uint8 prefix_cmd; uint8 prefix_cmd;
@@ -435,7 +435,7 @@ standard_command_timeout(ps2_dev* dev, uint8 cmd, const uint8* out,
} }
} }
release_sem(gControllerSem); mutex_unlock(&gControllerLock);
#ifdef TRACE_PS2_DEV #ifdef TRACE_PS2_DEV
start = system_time(); start = system_time();
#endif #endif