Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-30 00:08:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disk drivers are now loading

Browse Source
This commit is contained in:
Alex 2022-11-01 04:31:16 +02:00
parent 92a13c777a
commit 9b043d4b34
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Core/Driver.cpp
View File

@ -50,12 +50,30 @@ namespace Driver
KernelAllocator.FreePages(Page, Size); KernelAllocator.FreePages(Page, Size);
} }
void MapMemory(void *VirtualAddress, void *PhysicalAddress, unsigned long Flags)
{
SmartLock(DriverDisplayPrintLock);
Memory::Virtual().Map(VirtualAddress, PhysicalAddress, Flags);
}
void UnmapMemory(void *VirtualAddress)
{
SmartLock(DriverDisplayPrintLock);
Memory::Virtual().Unmap(VirtualAddress);
}
void *Drivermemcpy(void *Destination, void *Source, unsigned long Size) void *Drivermemcpy(void *Destination, void *Source, unsigned long Size)
{ {
SmartLock(DriverDisplayPrintLock); SmartLock(DriverDisplayPrintLock);
return memcpy(Destination, Source, Size); return memcpy(Destination, Source, Size);
} }
void *Drivermemset(void *Destination, int Value, unsigned long Size)
{
SmartLock(DriverDisplayPrintLock);
return memset(Destination, Value, Size);
}
KernelAPI KAPI = { KernelAPI KAPI = {
.Version = { .Version = {
.Major = 0, .Major = 0,
@ -69,6 +87,8 @@ namespace Driver
.PageSize = PAGE_SIZE, .PageSize = PAGE_SIZE,
.RequestPage = RequestPage, .RequestPage = RequestPage,
.FreePage = FreePage, .FreePage = FreePage,
.Map = MapMemory,
.Unmap = UnmapMemory,
}, },
.PCI = { .PCI = {
.GetDeviceName = nullptr, .GetDeviceName = nullptr,
@ -78,6 +98,7 @@ namespace Driver
.DebugPrint = DriverDebugPrint, .DebugPrint = DriverDebugPrint,
.DisplayPrint = DriverDisplayPrint, .DisplayPrint = DriverDisplayPrint,
.memcpy = Drivermemcpy, .memcpy = Drivermemcpy,
.memset = Drivermemset,
}, },
.Commmand = { .Commmand = {
.Network = { .Network = {
@ -130,11 +151,12 @@ namespace Driver
if (DrvExtHdr->Driver.Bind.PCI.VendorID[Vidx] == 0 || DrvExtHdr->Driver.Bind.PCI.DeviceID[Didx] == 0) if (DrvExtHdr->Driver.Bind.PCI.VendorID[Vidx] == 0 || DrvExtHdr->Driver.Bind.PCI.DeviceID[Didx] == 0)
continue; continue;
debug("VendorID: %#x; DeviceID: %#x", DrvExtHdr->Driver.Bind.PCI.VendorID[Vidx], DrvExtHdr->Driver.Bind.PCI.DeviceID[Didx]);
Vector<PCI::PCIDeviceHeader *> devices = PCIManager->FindPCIDevice(DrvExtHdr->Driver.Bind.PCI.VendorID[Vidx], DrvExtHdr->Driver.Bind.PCI.DeviceID[Didx]); Vector<PCI::PCIDeviceHeader *> devices = PCIManager->FindPCIDevice(DrvExtHdr->Driver.Bind.PCI.VendorID[Vidx], DrvExtHdr->Driver.Bind.PCI.DeviceID[Didx]);
if (devices.size() == 0)
continue;
foreach (auto PCIDevice in devices) foreach (auto PCIDevice in devices)
{ {
debug("[%ld] VendorID: %#x; DeviceID: %#x", devices.size(), PCIDevice->VendorID, PCIDevice->DeviceID);
Fex *fex = (Fex *)KernelAllocator.RequestPages(TO_PAGES(Size)); Fex *fex = (Fex *)KernelAllocator.RequestPages(TO_PAGES(Size));
memcpy(fex, (void *)DriverAddress, Size); memcpy(fex, (void *)DriverAddress, Size);
FexExtended *fexExtended = (FexExtended *)((uint64_t)fex + EXTENDED_SECTION_ADDRESS); FexExtended *fexExtended = (FexExtended *)((uint64_t)fex + EXTENDED_SECTION_ADDRESS);
@ -197,7 +219,31 @@ namespace Driver
} }
case FexDriverType::FexDriverType_Storage: case FexDriverType::FexDriverType_Storage:
{ {
fixme("Storage driver: %s", fexExtended->Driver.Name); KCallback->RawPtr = PCIDevice;
KCallback->Reason = CallbackReason::ConfigurationReason;
int callbackret = ((int (*)(KernelCallback *))((uint64_t)fexExtended->Driver.Callback + (uint64_t)fex))(KCallback);
if (callbackret == DriverReturnCode::NOT_IMPLEMENTED)
{
KernelAllocator.FreePages(fex, TO_PAGES(Size));
KernelAllocator.FreePages(KCallback, TO_PAGES(sizeof(KernelCallback)));
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
continue;
}
else if (callbackret == DriverReturnCode::OK)
trace("Device found for driver: %s", fexExtended->Driver.Name);
else
{
KernelAllocator.FreePages(fex, TO_PAGES(Size));
KernelAllocator.FreePages(KCallback, TO_PAGES(sizeof(KernelCallback)));
error("Driver %s returned error %d", fexExtended->Driver.Name, callbackret);
continue;
}
DriverFile *drvfile = new DriverFile;
drvfile->DriverUID = KAPI.Info.DriverUID;
drvfile->Address = (void *)fex;
drvfile->InterruptHook = nullptr;
Drivers.push_back(drvfile);
break; break;
} }
case FexDriverType::FexDriverType_FileSystem: case FexDriverType::FexDriverType_FileSystem: