Fennix/Modules
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Drivers.git synced 2025-05-28 15:34:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update drivers after the new DAPI

Browse Source
This commit is contained in:
Alex 2023-03-23 20:46:35 +02:00
parent a3769735bc
commit 31c0898bff
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
12 changed files with 304 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Audio/AudioCodec97/AudioCodec97Driver.cpp
View File

@ -4,6 +4,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -16,6 +17,7 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.TypeFlags = FexDriverInputTypes_None, .TypeFlags = FexDriverInputTypes_None,
.OverrideOnConflict = false, .OverrideOnConflict = false,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_PCI, .Type = BIND_PCI,
.PCI = { .PCI = {
@ -99,13 +101,20 @@ int CallbackHandler(KernelCallback *Data)
DescriptorList = (BufferDescriptorList *)KAPI->Memory.RequestPage((sizeof(BufferDescriptorList) * DescriptorListLength) / KAPI->Memory.PageSize + 1); DescriptorList = (BufferDescriptorList *)KAPI->Memory.RequestPage((sizeof(BufferDescriptorList) * DescriptorListLength) / KAPI->Memory.PageSize + 1);
KAPI->Util.memset(DescriptorList, 0, sizeof(BufferDescriptorList) * DescriptorListLength); KAPI->Util.memset(DescriptorList, 0, sizeof(BufferDescriptorList) * DescriptorListLength);
uint16_t DLSampleCount = KAPI->Memory.PageSize / SampleSize;
char DLLogBuffer[128];
for (int i = 0; i < DescriptorListLength; i++) for (int i = 0; i < DescriptorListLength; i++)
{ {
DescriptorList[i] = { int DescriptorPages = sizeof(uint16_t *) / KAPI->Memory.PageSize + 1;
.Address = (uint32_t)(uint64_t)KAPI->Memory.RequestPage(sizeof(uint16_t *) / KAPI->Memory.PageSize + 1), DescriptorList[i].Address = (uint32_t)(uint64_t)KAPI->Memory.RequestPage(DescriptorPages);
.SampleCount = (uint16_t)(KAPI->Memory.PageSize / SampleSize), DescriptorList[i].SampleCount = DLSampleCount;
.Flags = 0, DescriptorList[i].Flags = 0;
}; KAPI->Util.sprintf(DLLogBuffer, "DescriptorList[%d] = { Address: 0x%x (%d %s), SampleCount: %d, Flags: 0x%x }",
i,
DescriptorList[i].Address, DescriptorPages, DescriptorPages == 1 ? "page" : "pages",
DescriptorList[i].SampleCount,
DescriptorList[i].Flags);
print(DLLogBuffer);
} }
outw(BAR.MixerAddress + NAM_MasterVolume, MixerVolume(Volume, Volume, Mute)); outw(BAR.MixerAddress + NAM_MasterVolume, MixerVolume(Volume, Volume, Mute));
@ -236,10 +245,19 @@ int CallbackHandler(KernelCallback *Data)
} }
case SendReason: case SendReason:
{ {
for (size_t i = 0; i < 10; i++)
KAPI->Util.Sleep(1000);
return OK;
unsigned char *Buffer = (unsigned char *)Data->AudioCallback.Send.Data; unsigned char *Buffer = (unsigned char *)Data->AudioCallback.Send.Data;
unsigned int Length = Data->AudioCallback.Send.Length; unsigned int Length = Data->AudioCallback.Send.Length;
if (Length % (SampleSize * Channels)) if (Buffer == nullptr)
{
print("Invalid buffer.");
return INVALID_DATA;
}
if ((Length == 0) || (Length % (SampleSize * Channels)))
{ {
print("Invalid buffer length."); print("Invalid buffer length.");
return INVALID_DATA; return INVALID_DATA;
@ -270,11 +288,8 @@ int CallbackHandler(KernelCallback *Data)
{ {
long SampleCount = DescriptorList[(CurrentBDL + 1) % DescriptorListLength].SampleCount / Channels; long SampleCount = DescriptorList[(CurrentBDL + 1) % DescriptorListLength].SampleCount / Channels;
if (SampleCount > 0) if (SampleCount > 0)
{
// KAPI->Util.Sleep(SampleCount * 1000000 / SampleRate); // microseconds
KAPI->Util.Sleep(SampleCount * 1000 / SampleRate); // milliseconds KAPI->Util.Sleep(SampleCount * 1000 / SampleRate); // milliseconds
} }
}
} while (RemainingBDL >= DescriptorListLength - 1 && !(inw(BAR.BusMasterAddress + PCMOUT_Status) & TC_DMAControllerControl)); } while (RemainingBDL >= DescriptorListLength - 1 && !(inw(BAR.BusMasterAddress + PCMOUT_Status) & TC_DMAControllerControl));
} }
@ -294,7 +309,7 @@ int CallbackHandler(KernelCallback *Data)
do do
{ {
int Wrote = ((KAPI->Memory.PageSize > Length) ? Length : KAPI->Memory.PageSize); int Wrote = (KAPI->Memory.PageSize > Length) ? Length : KAPI->Memory.PageSize;
if (Wrote == 0) if (Wrote == 0)
break; break;
@ -343,9 +358,17 @@ int CallbackHandler(KernelCallback *Data)
print("Driver stopped."); print("Driver stopped.");
break; break;
} }
case InterruptReason: default:
{
print("Unknown reason.");
break;
}
}
return OK;
}
int InterruptCallback(CPURegisters *)
{ {
break; // Not working as expected
uint16_t Status = inw(BAR.MixerAddress + PCMOUT_Status); uint16_t Status = inw(BAR.MixerAddress + PCMOUT_Status);
if (Status & TC_IOCInterruptEnable) if (Status & TC_IOCInterruptEnable)
@ -370,13 +393,5 @@ int CallbackHandler(KernelCallback *Data)
} }
outw(BAR.MixerAddress + PCMOUT_Status, 0xFFFF); outw(BAR.MixerAddress + PCMOUT_Status, 0xFFFF);
break;
}
default:
{
print("Unknown reason.");
break;
}
}
return OK; return OK;
} }

15
Generic/ExampleDriver/Example.cpp
View File

@ -3,6 +3,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
/* The driver is /* The driver is
* This is a driver for Fennix Driver Entry Extended Header * This is a driver for Fennix Driver Entry Extended Header
@ -18,10 +19,11 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.Name = "Example Driver", .Name = "Example Driver",
.Type = FexDriverType_Generic, .Type = FexDriverType_Generic,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_INTERRUPT, .Type = BIND_INTERRUPT,
.Interrupt = { .Interrupt = {
.Vector = {0xFF}, .Vector = {222}, // IRQ222
}}}}; }}}};
// Global variable that holds the kernel API // Global variable that holds the kernel API
@ -61,11 +63,6 @@ int CallbackHandler(KernelCallback *Data)
print("Kernel acknowledged the driver."); print("Kernel acknowledged the driver.");
break; break;
} }
case InterruptReason:
{
print("Interrupt received.");
break;
}
case StopReason: case StopReason:
{ {
print("Driver stopped."); print("Driver stopped.");
@ -79,3 +76,9 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *)
{
print("Interrupt received.");
return OK;
}

23
Input/PS2Mouse/PS2MouseDriver.cpp
View File

@ -6,6 +6,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -18,10 +19,11 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.TypeFlags = FexDriverInputTypes_Mouse, .TypeFlags = FexDriverInputTypes_Mouse,
.OverrideOnConflict = false, .OverrideOnConflict = false,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_INTERRUPT, .Type = BIND_INTERRUPT,
.Interrupt = { .Interrupt = {
.Vector = {0xC}, // IRQ12 .Vector = {12}, // IRQ12
}}}}; }}}};
KernelAPI *KAPI; KernelAPI *KAPI;
@ -156,7 +158,16 @@ int CallbackHandler(KernelCallback *Data)
print("Driver stopped."); print("Driver stopped.");
break; break;
} }
case InterruptReason: default:
{
print("Unknown reason.");
break;
}
}
return OK;
}
int InterruptCallback(CPURegisters *)
{ {
uint8_t Data = inb(0x60); uint8_t Data = inb(0x60);
@ -263,13 +274,5 @@ int CallbackHandler(KernelCallback *Data)
break; break;
} }
} }
break;
}
default:
{
print("Unknown reason.");
break;
}
}
return OK; return OK;
} }

24
Input/VMwareMouse/VMwareMouseDriver.cpp
View File

@ -6,6 +6,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -18,10 +19,11 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.TypeFlags = FexDriverInputTypes_Mouse, .TypeFlags = FexDriverInputTypes_Mouse,
.OverrideOnConflict = true, .OverrideOnConflict = true,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_INTERRUPT, .Type = BIND_INTERRUPT,
.Interrupt = { .Interrupt = {
.Vector = {0xC}, // IRQ12 .Vector = {12}, // IRQ12
}}}}; }}}};
KernelAPI *KAPI; KernelAPI *KAPI;
@ -240,7 +242,16 @@ int CallbackHandler(KernelCallback *Data)
print("Driver stopped."); print("Driver stopped.");
break; break;
} }
case InterruptReason: default:
{
print("Unknown reason.");
break;
}
}
return OK;
}
int InterruptCallback(CPURegisters *)
{ {
uint8_t Data = inb(0x60); uint8_t Data = inb(0x60);
(void)Data; (void)Data;
@ -269,14 +280,5 @@ int CallbackHandler(KernelCallback *Data)
MouseX = cmd.bx; /* Both X and Y are scaled from 0 to 0xFFFF */ MouseX = cmd.bx; /* Both X and Y are scaled from 0 to 0xFFFF */
MouseY = cmd.cx; /* You should map these somewhere to the actual resolution. */ MouseY = cmd.cx; /* You should map these somewhere to the actual resolution. */
MouseZ = (int8_t)cmd.dx; /* Z is a single signed byte indicating scroll direction. */ MouseZ = (int8_t)cmd.dx; /* Z is a single signed byte indicating scroll direction. */
break;
}
default:
{
print("Unknown reason.");
break;
}
}
return OK; return OK;
} }

12
Input/VirtualBoxMouse/VirtualBoxMouseDriver.cpp
View File

@ -6,6 +6,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -18,6 +19,7 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.TypeFlags = FexDriverInputTypes_Mouse, .TypeFlags = FexDriverInputTypes_Mouse,
.OverrideOnConflict = true, .OverrideOnConflict = true,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_PCI, .Type = BIND_PCI,
.PCI = { .PCI = {
@ -78,11 +80,6 @@ int CallbackHandler(KernelCallback *Data)
{ {
break; break;
} }
case InterruptReason:
{
break;
}
default: default:
{ {
break; break;
@ -90,3 +87,8 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *)
{
return OK;
}

11
Network/AMDPCNET/pcnet.cpp
View File

@ -7,6 +7,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -17,6 +18,7 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.Name = "AMD PCNET", .Name = "AMD PCNET",
.Type = FexDriverType_Network, .Type = FexDriverType_Network,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_PCI, .Type = BIND_PCI,
.PCI = { .PCI = {
@ -114,10 +116,6 @@ int CallbackHandler(KernelCallback *Data)
Data->NetworkCallback.Fetch.MAC = MAC.ToHex(); Data->NetworkCallback.Fetch.MAC = MAC.ToHex();
break; break;
} }
case InterruptReason:
{
break;
}
case SendReason: case SendReason:
{ {
break; break;
@ -136,3 +134,8 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *)
{
return OK;
}

39
Network/IntelGigabit/IntelGigabit.cpp
View File

@ -7,6 +7,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -17,6 +18,7 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.Name = "Intel Gigabit Ethernet Controller", .Name = "Intel Gigabit Ethernet Controller",
.Type = FexDriverType_Network, .Type = FexDriverType_Network,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_PCI, .Type = BIND_PCI,
.PCI = { .PCI = {
@ -469,24 +471,6 @@ int CallbackHandler(KernelCallback *Data)
Data->NetworkCallback.Fetch.MAC = MAC.ToHex(); Data->NetworkCallback.Fetch.MAC = MAC.ToHex();
break; break;
} }
case InterruptReason:
{
WriteCMD(REG::IMASK, 0x1);
uint32_t status = ReadCMD(0xC0);
UNUSED(status);
while ((RX[RXCurrent]->Status & 0x1))
{
uint8_t *Data = (uint8_t *)RX[RXCurrent]->Address;
uint16_t DataLength = RX[RXCurrent]->Length;
KAPI->Command.Network.ReceivePacket(KAPI->Info.DriverUID, Data, DataLength);
RX[RXCurrent]->Status = 0;
uint16_t OldRXCurrent = RXCurrent;
RXCurrent = (RXCurrent + 1) % E1000_NUM_RX_DESC;
WriteCMD(REG::RXDESCTAIL, OldRXCurrent);
}
break;
}
case SendReason: case SendReason:
{ {
TX[TXCurrent]->Address = (uint64_t)Data->NetworkCallback.Send.Data; TX[TXCurrent]->Address = (uint64_t)Data->NetworkCallback.Send.Data;
@ -532,3 +516,22 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *)
{
WriteCMD(REG::IMASK, 0x1);
uint32_t status = ReadCMD(0xC0);
UNUSED(status);
while ((RX[RXCurrent]->Status & 0x1))
{
uint8_t *Data = (uint8_t *)RX[RXCurrent]->Address;
uint16_t DataLength = RX[RXCurrent]->Length;
KAPI->Command.Network.ReceivePacket(KAPI->Info.DriverUID, Data, DataLength);
RX[RXCurrent]->Status = 0;
uint16_t OldRXCurrent = RXCurrent;
RXCurrent = (RXCurrent + 1) % E1000_NUM_RX_DESC;
WriteCMD(REG::RXDESCTAIL, OldRXCurrent);
}
return OK;
}

37
Network/RTL8139/rtl8139.cpp
View File

@ -7,6 +7,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -17,6 +18,7 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.Name = "RTL8139", .Name = "RTL8139",
.Type = FexDriverType_Network, .Type = FexDriverType_Network,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_PCI, .Type = BIND_PCI,
.PCI = { .PCI = {
@ -173,23 +175,6 @@ int CallbackHandler(KernelCallback *Data)
Data->NetworkCallback.Fetch.MAC = MAC.ToHex(); Data->NetworkCallback.Fetch.MAC = MAC.ToHex();
break; break;
} }
case InterruptReason:
{
uint16_t Status = RTLIW(0x3E);
UNUSED(Status);
uint16_t *Data = (uint16_t *)(RXBuffer + CurrentPacket);
uint16_t DataLength = *(Data + 1);
Data = Data + 2;
KAPI->Command.Network.ReceivePacket(KAPI->Info.DriverUID, (uint8_t *)Data, DataLength);
CurrentPacket = (CurrentPacket + DataLength + 4 + 3) & (~3);
if (CurrentPacket > 8192)
CurrentPacket -= 8192;
RTLOW(0x38, CurrentPacket - 0x10);
RTLOW(0x3E, (1 << 0) | (1 << 2));
break;
}
case SendReason: case SendReason:
{ {
RTLOL(TSAD[TXCurrent], static_cast<uint32_t>(reinterpret_cast<uint64_t>(Data->NetworkCallback.Send.Data))); RTLOL(TSAD[TXCurrent], static_cast<uint32_t>(reinterpret_cast<uint64_t>(Data->NetworkCallback.Send.Data)));
@ -212,3 +197,21 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *)
{
uint16_t Status = RTLIW(0x3E);
UNUSED(Status);
uint16_t *Data = (uint16_t *)(RXBuffer + CurrentPacket);
uint16_t DataLength = *(Data + 1);
Data = Data + 2;
KAPI->Command.Network.ReceivePacket(KAPI->Info.DriverUID, (uint8_t *)Data, DataLength);
CurrentPacket = (CurrentPacket + DataLength + 4 + 3) & (~3);
if (CurrentPacket > 8192)
CurrentPacket -= 8192;
RTLOW(0x38, CurrentPacket - 0x10);
RTLOW(0x3E, (1 << 0) | (1 << 2));
return OK;
}

11
Network/RTL8169/rtl8169.cpp
View File

@ -7,6 +7,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -17,6 +18,7 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.Name = "RTL8169", .Name = "RTL8169",
.Type = FexDriverType_Network, .Type = FexDriverType_Network,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_PCI, .Type = BIND_PCI,
.PCI = { .PCI = {
@ -84,10 +86,6 @@ int CallbackHandler(KernelCallback *Data)
Data->NetworkCallback.Fetch.MAC = MAC.ToHex(); Data->NetworkCallback.Fetch.MAC = MAC.ToHex();
break; break;
} }
case InterruptReason:
{
break;
}
case SendReason: case SendReason:
{ {
break; break;
@ -106,3 +104,8 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *)
{
return OK;
}

11
Network/Virtio/Virtio.cpp
View File

@ -7,6 +7,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -17,6 +18,7 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.Name = "Virtio Network", .Name = "Virtio Network",
.Type = FexDriverType_Network, .Type = FexDriverType_Network,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_PCI, .Type = BIND_PCI,
.PCI = { .PCI = {
@ -84,10 +86,6 @@ int CallbackHandler(KernelCallback *Data)
Data->NetworkCallback.Fetch.MAC = MAC.ToHex(); Data->NetworkCallback.Fetch.MAC = MAC.ToHex();
break; break;
} }
case InterruptReason:
{
break;
}
case SendReason: case SendReason:
{ {
break; break;
@ -106,3 +104,8 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *)
{
return OK;
}

8
Storage/AHCI/AHCI.cpp
View File

@ -7,6 +7,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -17,6 +18,7 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.Name = "AHCI", .Name = "AHCI",
.Type = FexDriverType_Storage, .Type = FexDriverType_Storage,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_PCI, .Type = BIND_PCI,
.PCI = { .PCI = {
@ -500,3 +502,9 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *)
{
/* There's no need to do anything here. */
return OK;
}

29
Storage/ATA/ATA.cpp
View File

@ -7,6 +7,7 @@
extern "C" int DriverEntry(void *Data); extern "C" int DriverEntry(void *Data);
int CallbackHandler(KernelCallback *Data); int CallbackHandler(KernelCallback *Data);
int InterruptCallback(CPURegisters *Registers);
HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry);
@ -17,10 +18,11 @@ __attribute__((section(".extended"))) FexExtended ExtendedHeader = {
.Name = "ATA", .Name = "ATA",
.Type = FexDriverType_Storage, .Type = FexDriverType_Storage,
.Callback = CallbackHandler, .Callback = CallbackHandler,
.InterruptCallback = InterruptCallback,
.Bind = { .Bind = {
.Type = BIND_INTERRUPT, .Type = BIND_INTERRUPT,
.Interrupt = { .Interrupt = {
.Vector = {0xE, 0xF}, // IRQ14, IRQ15 .Vector = {14, 15}, // IRQ14, IRQ15
}}}}; }}}};
KernelAPI *KAPI; KernelAPI *KAPI;
@ -57,18 +59,6 @@ int CallbackHandler(KernelCallback *Data)
{ {
break; break;
} }
case InterruptReason:
{
if (Data->InterruptInfo.Vector == 0xE)
{
print("IRQ14");
}
else if (Data->InterruptInfo.Vector == 0xF)
{
print("IRQ15");
}
break;
}
case SendReason: case SendReason:
case ReceiveReason: case ReceiveReason:
{ {
@ -88,3 +78,16 @@ int CallbackHandler(KernelCallback *Data)
} }
return OK; return OK;
} }
int InterruptCallback(CPURegisters *Registers)
{
if (Registers->InterruptNumber == 0xE)
{
print("IRQ14");
}
else if (Registers->InterruptNumber == 0xF)
{
print("IRQ15");
}
return OK;
}