diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/Kernel/CompilerKit/Detail.h | 8 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/ATA.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/KernelKit/PCI/Iterator.h | 4 | ||||
| -rw-r--r-- | dev/Kernel/NewKit/Macros.h | 4 | ||||
| -rw-r--r-- | dev/Kernel/src/DriveMgr.cc | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/dev/Kernel/CompilerKit/Detail.h b/dev/Kernel/CompilerKit/Detail.h index ecc50360..ecd88042 100644 --- a/dev/Kernel/CompilerKit/Detail.h +++ b/dev/Kernel/CompilerKit/Detail.h @@ -10,18 +10,18 @@ #include <NewKit/Defines.h> #endif // ifdef __NEOSKRNL__ -#define NE_COPY_DELETE(KLASS) \ +#define NE_COPY_DELETE(KLASS) \ KLASS& operator=(const KLASS&) = delete; \ KLASS(const KLASS&) = delete; -#define NE_COPY_DEFAULT(KLASS) \ +#define NE_COPY_DEFAULT(KLASS) \ KLASS& operator=(const KLASS&) = default; \ KLASS(const KLASS&) = default; -#define NE_MOVE_DELETE(KLASS) \ +#define NE_MOVE_DELETE(KLASS) \ KLASS& operator=(KLASS&&) = delete; \ KLASS(KLASS&&) = delete; -#define NE_MOVE_DEFAULT(KLASS) \ +#define NE_MOVE_DEFAULT(KLASS) \ KLASS& operator=(KLASS&&) = default; \ KLASS(KLASS&&) = default; diff --git a/dev/Kernel/HALKit/AMD64/Storage/ATA.cc b/dev/Kernel/HALKit/AMD64/Storage/ATA.cc index 9b16d866..b21d5d19 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/ATA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/ATA.cc @@ -77,6 +77,8 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) return false; } + rt_out8(IO + ATA_REG_NEIN, 1); + // Step 2: Send IDENTIFY command rt_out8(IO + ATA_REG_COMMAND, ATA_CMD_IDENTIFY); diff --git a/dev/Kernel/KernelKit/PCI/Iterator.h b/dev/Kernel/KernelKit/PCI/Iterator.h index d5044c1e..360a135b 100644 --- a/dev/Kernel/KernelKit/PCI/Iterator.h +++ b/dev/Kernel/KernelKit/PCI/Iterator.h @@ -13,8 +13,8 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -#define NE_BUS_COUNT (256) -#define NE_DEVICE_COUNT (33) +#define NE_BUS_COUNT (256) +#define NE_DEVICE_COUNT (33) #define NE_FUNCTION_COUNT (8) namespace Kernel::PCI diff --git a/dev/Kernel/NewKit/Macros.h b/dev/Kernel/NewKit/Macros.h index 02005988..78f1512b 100644 --- a/dev/Kernel/NewKit/Macros.h +++ b/dev/Kernel/NewKit/Macros.h @@ -113,7 +113,7 @@ #define CONST const -#define STRINGIFY(X) #X +#define STRINGIFY(X) #X #define NE_UNUSED(X) ((Kernel::Void)X) #ifndef RGB @@ -126,7 +126,7 @@ #define dbg_break_point() ((void)0) #endif -#define RTL_ENDIAN(address, value) \ +#define RTL_ENDIAN(address, value) \ (((reinterpret_cast<Kernel::Char*>(address)[0]) == (value)) \ ? (Kernel::Endian::kEndianBig) \ : (Kernel::Endian::kEndianLittle)) diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc index 3ac3d69a..9f15eea7 100644 --- a/dev/Kernel/src/DriveMgr.cc +++ b/dev/Kernel/src/DriveMgr.cc @@ -44,8 +44,6 @@ namespace Kernel if (pckt.fPacketReadOnly) return; - kcout << "Writing blob to disk...\r"; - #ifdef __AHCI__ drv_std_write(pckt.fPacketLba, (Char*)pckt.fPacketContent, kAHCISectorSize, pckt.fPacketSize); #elif defined(__ATA_PIO__) || defined(__ATA_DMA__) |