dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Global.cs

Browse source
This commit is contained in:
Valentin Charbonnier 2018-01-06 20:26:42 +01:00 committed by GitHub
parent d8df4aab2e
commit ef3ce991f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
source/Cosmos.HAL2/Global.cs
View file

@ -1,5 +1,4 @@
using System; using System;
using Cosmos.Core; using Cosmos.Core;
using Cosmos.Debug.Kernel; using Cosmos.Debug.Kernel;
using Cosmos.HAL.BlockDevice; using Cosmos.HAL.BlockDevice;
@ -15,7 +14,6 @@ namespace Cosmos.HAL
public static TextScreenBase TextScreen = new TextScreen(); public static TextScreenBase TextScreen = new TextScreen();
public static PCI Pci; public static PCI Pci;
public static int atamode;
static public void Init(TextScreenBase textScreen) static public void Init(TextScreenBase textScreen)
{ {
@ -45,28 +43,12 @@ namespace Cosmos.HAL
mDebugger.Send("ACPI Init"); mDebugger.Send("ACPI Init");
ACPI.Start(); ACPI.Start();
IDE.InitDriver();
AHCI.InitDriver();
//EHCI.InitDriver();
mDebugger.Send("Done initializing Cosmos.HAL.Global"); mDebugger.Send("Done initializing Cosmos.HAL.Global");
if (atamode == 1)
{
//TODO Implement an AHCI Driver
}
else if (atamode == 2)
{
//TODO Implement a RAID Driver
}
else if (atamode == 3)
{
mDebugger.Send("ATA Primary Master");
InitAta(Ata.ControllerIdEnum.Primary, Ata.BusPositionEnum.Master);
//TODO Need to change code to detect if ATA controllers are present or not. How to do this? via PCI enum?
// They do show up in PCI space as well as the fixed space.
// Or is it always here, and was our compiler stack corruption issue?
mDebugger.Send("ATA Secondary Master");
InitAta(Ata.ControllerIdEnum.Secondary, Ata.BusPositionEnum.Master);
//InitAta(BlockDevice.Ata.ControllerIdEnum.Secondary, BlockDevice.Ata.BusPositionEnum.Slave);
}
} }
public static void EnableInterrupts() public static void EnableInterrupts()
@ -74,66 +56,6 @@ namespace Cosmos.HAL
CPU.EnableInterrupts(); CPU.EnableInterrupts();
} }
private static void InitAta(Ata.ControllerIdEnum aControllerID,
Ata.BusPositionEnum aBusPosition)
{
var xIO = aControllerID == Ata.ControllerIdEnum.Primary
? Core.Global.BaseIOGroups.ATA1
: Core.Global.BaseIOGroups.ATA2;
var xATA = new AtaPio(xIO, aControllerID, aBusPosition);
if (xATA.DriveType == AtaPio.SpecLevel.Null)
{
return;
}
if (xATA.DriveType == AtaPio.SpecLevel.ATA)
{
BlockDevice.BlockDevice.Devices.Add(xATA);
Ata.AtaDebugger.Send("ATA device with speclevel ATA found.");
}
else
{
//Ata.AtaDebugger.Send("ATA device with spec level " + (int)xATA.DriveType +
// " found, which is not supported!");
return;
}
var xMbrData = new byte[512];
xATA.ReadBlock(0UL, 1U, xMbrData);
var xMBR = new MBR(xMbrData);
if (xMBR.EBRLocation != 0)
{
//EBR Detected
var xEbrData = new byte[512];
xATA.ReadBlock(xMBR.EBRLocation, 1U, xEbrData);
var xEBR = new EBR(xEbrData);
for (int i = 0; i < xEBR.Partitions.Count; i++)
{
//var xPart = xEBR.Partitions[i];
//var xPartDevice = new BlockDevice.Partition(xATA, xPart.StartSector, xPart.SectorCount);
//BlockDevice.BlockDevice.Devices.Add(xPartDevice);
}
}
// TODO Change this to foreach when foreach is supported
Ata.AtaDebugger.Send("Number of MBR partitions found:");
Ata.AtaDebugger.SendNumber(xMBR.Partitions.Count);
for (int i = 0; i < xMBR.Partitions.Count; i++)
{
var xPart = xMBR.Partitions[i];
if (xPart == null)
{
Console.WriteLine("Null partition found at idx: " + i);
}
else
{
var xPartDevice = new Partition(xATA, xPart.StartSector, xPart.SectorCount);
BlockDevice.BlockDevice.Devices.Add(xPartDevice);
Console.WriteLine("Found partition at idx" + i);
}
}
}
public static bool InterruptsEnabled => CPU.mInterruptsEnabled; public static bool InterruptsEnabled => CPU.mInterruptsEnabled;
} }
} }