diff options
Diffstat (limited to 'dev/Kernel')
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/AHCI.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/DMA.cc | 6 | ||||
| -rw-r--r-- | dev/Kernel/SignalKit/Signals.h | 4 | ||||
| -rw-r--r-- | dev/Kernel/src/Variant.cc | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc index 6e0d86ad..79101a00 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc @@ -11,7 +11,7 @@ * @version 0.1 * @date 2024-02-02 * - * @Copyright (C) 2024, Amlal El Mahrouss, all rights reserved. + * @Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. * */ diff --git a/dev/Kernel/HALKit/AMD64/Storage/DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/DMA.cc index a4190065..2793c1ec 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/DMA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/DMA.cc @@ -21,7 +21,7 @@ #if defined(__ATA_DMA__) -#define kATADataLen 256 +#define kATADataLen (256) using namespace NeOS; using namespace NeOS::HAL; @@ -111,8 +111,8 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) for (SizeT i = 0; i < 40; i += 2) { - kCurrentDiskModel[i] = kATAData[54 + i] >> 8; - kCurrentDiskModel[i + 1] = kATAData[54 + i] & 0xFF; + kCurrentDiskModel[i] = kATAData[27 + i] >> 8; + kCurrentDiskModel[i + 1] = kATAData[27 + i] & 0xFF; } kCurrentDiskModel[40] = '\0'; diff --git a/dev/Kernel/SignalKit/Signals.h b/dev/Kernel/SignalKit/Signals.h index e5e94e69..09d392f6 100644 --- a/dev/Kernel/SignalKit/Signals.h +++ b/dev/Kernel/SignalKit/Signals.h @@ -16,3 +16,7 @@ typedef NeOS::UInt32 SignalKind; #define SIGTRAP 3 #define SIGABRT 4 #define SIGCONT 5 + +#define SIGBREK 666 +#define SIGATCH 661 +#define SIGDTCH 662
\ No newline at end of file diff --git a/dev/Kernel/src/Variant.cc b/dev/Kernel/src/Variant.cc index 0a0eb02f..79776c61 100644 --- a/dev/Kernel/src/Variant.cc +++ b/dev/Kernel/src/Variant.cc @@ -28,6 +28,6 @@ namespace NeOS /// @brief Leak variant's instance. VoidPtr Variant::Leak() { - return fPtr; + return this->fPtr; } } // namespace NeOS |