ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-01 23:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpica: use Mutex

Browse Source 
Issue #3801
This commit is contained in:
Alexander Boettcher 2020-07-06 10:26:27 +02:00 committed by Norman Feske
parent 5af4552511
commit 5936d00b5e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/libports/src/lib/acpica/iomem.cc
View File

@ -15,6 +15,7 @@
#include <base/attached_io_mem_dataspace.h> #include <base/attached_io_mem_dataspace.h>
#include <base/attached_rom_dataspace.h> #include <base/attached_rom_dataspace.h>
#include <base/log.h> #include <base/log.h>
#include <base/sleep.h>
#include <util/misc_math.h> #include <util/misc_math.h>
#include <io_mem_session/connection.h> #include <io_mem_session/connection.h>
@ -31,8 +32,7 @@ extern "C" {
#define FAIL(retval) \ #define FAIL(retval) \
{ \ { \
Genode::error(__func__, ":", __LINE__, " called - dead"); \ Genode::error(__func__, ":", __LINE__, " called - dead"); \
Genode::Lock lock; \ while (1) Genode::sleep_forever(); \
while (1) lock.lock(); \
return retval; \ return retval; \
} }

14
repos/libports/src/lib/acpica/osl.cc
View File

@ -12,6 +12,7 @@
*/ */
#include <base/log.h> #include <base/log.h>
#include <base/sleep.h>
#include <util/misc_math.h> #include <util/misc_math.h>
#include <io_port_session/connection.h> #include <io_port_session/connection.h>
@ -30,8 +31,7 @@ extern "C" {
#define FAIL(retval) \ #define FAIL(retval) \
{ \ { \
Genode::error(__func__, ":", __LINE__, " called - dead"); \ Genode::error(__func__, ":", __LINE__, " called - dead"); \
Genode::Lock lock; \ while (1) Genode::sleep_forever(); \
while (1) lock.lock(); \
return retval; \ return retval; \
} }
@ -56,26 +56,26 @@ void AcpiOsFree (void *ptr)
ACPI_STATUS AcpiOsCreateLock (ACPI_SPINLOCK *spin_lock) ACPI_STATUS AcpiOsCreateLock (ACPI_SPINLOCK *spin_lock)
{ {
*spin_lock = new (Acpica::heap()) Genode::Lock(); *spin_lock = new (Acpica::heap()) Genode::Mutex();
return AE_OK; return AE_OK;
} }
ACPI_CPU_FLAGS AcpiOsAcquireLock (ACPI_SPINLOCK h) ACPI_CPU_FLAGS AcpiOsAcquireLock (ACPI_SPINLOCK h)
{ {
Genode::Lock *lock = reinterpret_cast<Genode::Lock *>(h); Genode::Mutex *mutex = reinterpret_cast<Genode::Mutex *>(h);
lock->lock(); mutex->acquire();
return AE_OK; return AE_OK;
} }
void AcpiOsReleaseLock (ACPI_SPINLOCK h, ACPI_CPU_FLAGS flags) void AcpiOsReleaseLock (ACPI_SPINLOCK h, ACPI_CPU_FLAGS flags)
{ {
Genode::Lock *lock = reinterpret_cast<Genode::Lock *>(h); Genode::Mutex *mutex = reinterpret_cast<Genode::Mutex *>(h);
if (flags != AE_OK) if (flags != AE_OK)
Genode::warning("warning - unknown flags in ", __func__); Genode::warning("warning - unknown flags in ", __func__);
lock->unlock(); mutex->release();
return; return;
} }