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

Return directly the driver error code

Browse Source
This commit is contained in:
Alex 2023-03-08 05:09:40 +02:00
parent 9a1a7b9955
commit a265cb59c8
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 7 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Core/Driver/DriverLoading/BindPCI.cpp
View File

@ -435,61 +435,19 @@ namespace Driver
switch (fexExtended->Driver.Type) switch (fexExtended->Driver.Type)
{ {
case FexDriverType::FexDriverType_Generic: case FexDriverType::FexDriverType_Generic:
{ return BindPCIGeneric(mem, fex, PCIDevice);
DriverCode ret = BindPCIGeneric(mem, fex, PCIDevice);
if (ret != DriverCode::OK &&
ret != DriverCode::DRIVER_CONFLICT)
continue;
return DriverCode::OK;
}
case FexDriverType::FexDriverType_Display: case FexDriverType::FexDriverType_Display:
{ return BindPCIDisplay(mem, fex, PCIDevice);
DriverCode ret = BindPCIDisplay(mem, fex, PCIDevice);
if (ret != DriverCode::OK &&
ret != DriverCode::DRIVER_CONFLICT)
continue;
return DriverCode::OK;
}
case FexDriverType::FexDriverType_Network: case FexDriverType::FexDriverType_Network:
{ return BindPCINetwork(mem, fex, PCIDevice);
DriverCode ret = BindPCINetwork(mem, fex, PCIDevice);
if (ret != DriverCode::OK &&
ret != DriverCode::DRIVER_CONFLICT)
continue;
return DriverCode::OK;
}
case FexDriverType::FexDriverType_Storage: case FexDriverType::FexDriverType_Storage:
{ return BindPCIStorage(mem, fex, PCIDevice);
DriverCode ret = BindPCIStorage(mem, fex, PCIDevice);
if (ret != DriverCode::OK &&
ret != DriverCode::DRIVER_CONFLICT)
continue;
return DriverCode::OK;
}
case FexDriverType::FexDriverType_FileSystem: case FexDriverType::FexDriverType_FileSystem:
{ return BindPCIFileSystem(mem, fex, PCIDevice);
DriverCode ret = BindPCIFileSystem(mem, fex, PCIDevice);
if (ret != DriverCode::OK &&
ret != DriverCode::DRIVER_CONFLICT)
continue;
return DriverCode::OK;
}
case FexDriverType::FexDriverType_Input: case FexDriverType::FexDriverType_Input:
{ return BindPCIInput(mem, fex, PCIDevice);
DriverCode ret = BindPCIInput(mem, fex, PCIDevice);
if (ret != DriverCode::OK &&
ret != DriverCode::DRIVER_CONFLICT)
continue;
return DriverCode::OK;
}
case FexDriverType::FexDriverType_Audio: case FexDriverType::FexDriverType_Audio:
{ return BindPCIAudio(mem, fex, PCIDevice);
DriverCode ret = BindPCIAudio(mem, fex, PCIDevice);
if (ret != DriverCode::OK &&
ret != DriverCode::DRIVER_CONFLICT)
continue;
return DriverCode::OK;
}
default: default:
{ {
warn("Unknown driver type: %d", fexExtended->Driver.Type); warn("Unknown driver type: %d", fexExtended->Driver.Type);