mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 21:47:43 +00:00
Move Lock from AK to Kernel, since it only works inside the kernel.
This commit is contained in:
parent
15657f0916
commit
313ee8dd19
12 changed files with 14 additions and 25 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include <AK/Types.h>
|
#include <AK/Types.h>
|
||||||
#include <AK/Vector.h>
|
#include <AK/Vector.h>
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
|
|
||||||
class DoubleBuffer {
|
class DoubleBuffer {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include <AK/AKString.h>
|
#include <AK/AKString.h>
|
||||||
#include <AK/Function.h>
|
#include <AK/Function.h>
|
||||||
#include <AK/kstdio.h>
|
#include <AK/kstdio.h>
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
#include <AK/WeakPtr.h>
|
#include <AK/WeakPtr.h>
|
||||||
#include <Kernel/KResult.h>
|
#include <Kernel/KResult.h>
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#include "IO.h"
|
#include "IO.h"
|
||||||
#include "Scheduler.h"
|
#include "Scheduler.h"
|
||||||
#include "PIC.h"
|
#include "PIC.h"
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
|
|
||||||
//#define DISK_DEBUG
|
//#define DISK_DEBUG
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
#include <AK/RetainPtr.h>
|
#include <AK/RetainPtr.h>
|
||||||
#include <Kernel/DiskDevice.h>
|
#include <Kernel/DiskDevice.h>
|
||||||
#include "IRQHandler.h"
|
#include "IRQHandler.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <Kernel/DoubleBuffer.h>
|
#include <Kernel/DoubleBuffer.h>
|
||||||
#include <Kernel/IPv4.h>
|
#include <Kernel/IPv4.h>
|
||||||
#include <AK/HashMap.h>
|
#include <AK/HashMap.h>
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
#include <AK/SinglyLinkedList.h>
|
#include <AK/SinglyLinkedList.h>
|
||||||
|
|
||||||
class IPv4SocketHandle;
|
class IPv4SocketHandle;
|
||||||
|
|
|
@ -1,19 +1,13 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Assertions.h"
|
#include <AK/Assertions.h>
|
||||||
#include "Types.h"
|
#include <AK/Types.h>
|
||||||
#include "i386.h"
|
#include <Kernel/i386.h>
|
||||||
#include <Kernel/Scheduler.h>
|
#include <Kernel/Scheduler.h>
|
||||||
|
|
||||||
class Process;
|
class Process;
|
||||||
extern Process* current;
|
extern Process* current;
|
||||||
|
|
||||||
#ifndef KERNEL
|
|
||||||
#error This thing is kernel-only right now.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace AK {
|
|
||||||
|
|
||||||
static inline dword CAS(volatile dword* mem, dword newval, dword oldval)
|
static inline dword CAS(volatile dword* mem, dword newval, dword oldval)
|
||||||
{
|
{
|
||||||
dword ret;
|
dword ret;
|
||||||
|
@ -117,8 +111,3 @@ private:
|
||||||
Lock m_lock;
|
Lock m_lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
using AK::Lock;
|
|
||||||
using AK::Locker;
|
|
||||||
using AK::Lockable;
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <Kernel/kmalloc.h>
|
#include <Kernel/kmalloc.h>
|
||||||
#include <Kernel/EtherType.h>
|
#include <Kernel/EtherType.h>
|
||||||
#include <AK/HashTable.h>
|
#include <AK/HashTable.h>
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
|
|
||||||
static Lockable<HashTable<NetworkAdapter*>>& all_adapters()
|
static Lockable<HashTable<NetworkAdapter*>>& all_adapters()
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include <Kernel/UDPSocket.h>
|
#include <Kernel/UDPSocket.h>
|
||||||
#include <Kernel/Process.h>
|
#include <Kernel/Process.h>
|
||||||
#include <Kernel/EtherType.h>
|
#include <Kernel/EtherType.h>
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
|
|
||||||
//#define ETHERNET_DEBUG
|
//#define ETHERNET_DEBUG
|
||||||
#define IPV4_DEBUG
|
#define IPV4_DEBUG
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include <Kernel/CharacterDevice.h>
|
#include <Kernel/CharacterDevice.h>
|
||||||
#include <AK/Badge.h>
|
#include <AK/Badge.h>
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
|
|
||||||
class MasterPTY;
|
class MasterPTY;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
#include <AK/Types.h>
|
#include <AK/Types.h>
|
||||||
#include <Kernel/FileSystem.h>
|
#include <Kernel/FileSystem.h>
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#include <AK/Vector.h>
|
#include <AK/Vector.h>
|
||||||
#include <AK/WeakPtr.h>
|
#include <AK/WeakPtr.h>
|
||||||
#include <AK/Weakable.h>
|
#include <AK/Weakable.h>
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
|
|
||||||
class FileDescriptor;
|
class FileDescriptor;
|
||||||
class PageDirectory;
|
class PageDirectory;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <AK/Lock.h>
|
#include <Kernel/Lock.h>
|
||||||
#include <AK/Retainable.h>
|
#include <AK/Retainable.h>
|
||||||
#include <AK/RetainPtr.h>
|
#include <AK/RetainPtr.h>
|
||||||
#include <AK/HashTable.h>
|
#include <AK/HashTable.h>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue