diff --git a/source/Boot/KudzuTest/PCITest.cs b/source/Boot/KudzuTest/PCITest.cs index e81dd279c..4bf6b2136 100644 --- a/source/Boot/KudzuTest/PCITest.cs +++ b/source/Boot/KudzuTest/PCITest.cs @@ -17,8 +17,9 @@ namespace KudzuTest { var xPCIDevice = Cosmos.Hardware.PC.Bus.PCIBus.Devices[d]; string xVendor = xDeviceIDs.FindVendor(xPCIDevice.VendorID); - if (xVendor == default(string)) + if (xVendor == null) { xVendor = ToHex(xPCIDevice.VendorID, 4); + } System.Console.Write(xPCIDevice.Bus + "-" + xPCIDevice.Slot + "-" + xPCIDevice.Function); System.Console.Write(" " + xVendor + ":" + ToHex(xPCIDevice.DeviceID, 4)); diff --git a/source/Cosmos.Kernel.FileSystems/Old/Fat16.cs b/source/Cosmos.Kernel.FileSystems/Old/Fat16.cs index 93024642d..7ed19f12e 100644 --- a/source/Cosmos.Kernel.FileSystems/Old/Fat16.cs +++ b/source/Cosmos.Kernel.FileSystems/Old/Fat16.cs @@ -134,9 +134,6 @@ namespace Cosmos.Kernel.FileSystem } } - private ATA _ata; - private Header _header; - public Fat16(ATA ata) { } @@ -147,7 +144,7 @@ namespace Cosmos.Kernel.FileSystem public void Open() { - _header = new Header(); + //_header = new Header(); // TODO: Read the header. } diff --git a/source/Cosmos/Cosmos.Hardware/Cosmos.Hardware.csproj b/source/Cosmos/Cosmos.Hardware/Cosmos.Hardware.csproj index 06b65965e..fbadd179c 100644 --- a/source/Cosmos/Cosmos.Hardware/Cosmos.Hardware.csproj +++ b/source/Cosmos/Cosmos.Hardware/Cosmos.Hardware.csproj @@ -56,8 +56,6 @@ - - diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs index 1ca4b5217..ee1f3da96 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs @@ -4,7 +4,7 @@ using System.Text; using Cosmos.Hardware.Network; using Cosmos.Hardware.PC.Bus; using Cosmos.Hardware; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139 { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/CommandRegister.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/CommandRegister.cs index 2aedcc007..05836ff56 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/CommandRegister.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/CommandRegister.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Cosmos.Hardware; using Cosmos.Hardware.PC.Bus; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139.Register { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ConfigurationRegister1.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ConfigurationRegister1.cs index d780855cc..ba2b89be5 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ConfigurationRegister1.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ConfigurationRegister1.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -//using System.Linq; using System.Text; using Cosmos.Hardware.PC.Bus; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139.Register { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/InterruptMaskRegister.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/InterruptMaskRegister.cs index a0a08bda6..8a707eb3f 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/InterruptMaskRegister.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/InterruptMaskRegister.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Cosmos.Hardware; using Cosmos.Hardware.PC.Bus; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139.Register { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/InterruptStatusRegister.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/InterruptStatusRegister.cs index dbbedd564..9b8e9642e 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/InterruptStatusRegister.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/InterruptStatusRegister.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Cosmos.Hardware; using Cosmos.Hardware.PC.Bus; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139.Register { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/MediaStatusRegister.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/MediaStatusRegister.cs index 7f4becd8d..864f08816 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/MediaStatusRegister.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/MediaStatusRegister.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; //using System.Linq; using System.Text; using Cosmos.Hardware.PC.Bus; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139.Register { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ReceiveConfigurationRegister.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ReceiveConfigurationRegister.cs index 9df6169db..8ecb508f2 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ReceiveConfigurationRegister.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ReceiveConfigurationRegister.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Cosmos.Hardware; using Cosmos.Hardware.PC.Bus; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139.Register { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/TransmitConfigurationRegister.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/TransmitConfigurationRegister.cs index 7066a606e..0f81b52b6 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/TransmitConfigurationRegister.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/TransmitConfigurationRegister.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Cosmos.Hardware; using Cosmos.Hardware.PC.Bus; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139.Register { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/TransmitStatusDescriptor.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/TransmitStatusDescriptor.cs index 231cf4d0a..4aaca379c 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/TransmitStatusDescriptor.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/TransmitStatusDescriptor.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Cosmos.Hardware; using Cosmos.Hardware.PC.Bus; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.Devices.RTL8139.Register { diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ValueTypeRegisters.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ValueTypeRegisters.cs index e42e4beab..a20645f15 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ValueTypeRegisters.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/Register/ValueTypeRegisters.cs @@ -136,7 +136,6 @@ namespace Cosmos.Hardware.Network.Devices.RTL8139.Register break; default: throw new Exception("Illegal Transmit Status Descriptor"); - break; } return xMem.Read32(address); diff --git a/source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs b/source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs index e4b0b01be..bff826938 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network { diff --git a/source/Cosmos/Cosmos.Hardware/Network/TCPIPModel/NetworkLayer/IPv4/IPv4Packet.cs b/source/Cosmos/Cosmos.Hardware/Network/TCPIPModel/NetworkLayer/IPv4/IPv4Packet.cs index 536f9d854..796bd12a7 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/TCPIPModel/NetworkLayer/IPv4/IPv4Packet.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/TCPIPModel/NetworkLayer/IPv4/IPv4Packet.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -//using System.Linq; using System.Text; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.TCPIPModel.NetworkLayer.IPv4 { @@ -21,12 +20,12 @@ namespace Cosmos.Hardware.Network.TCPIPModel.NetworkLayer.IPv4 //TODO: Get the correct bits and bytes... //TODO: Maybe some endinan conversions are needed. - var p = new IPv4Packet(); - p.Version = data[0]; - p.HeaderLength = data[1]; + //var p = new IPv4Packet(); + //p.Version = data[0]; + //p.HeaderLength = data[1]; //etc... - return p; + //return p; } diff --git a/source/Cosmos/Cosmos.Hardware/Network/TCPIPModel/PhysicalLayer/Ethernet2/Ethernet2Frame.cs b/source/Cosmos/Cosmos.Hardware/Network/TCPIPModel/PhysicalLayer/Ethernet2/Ethernet2Frame.cs index 520ee626c..e0ff804ff 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/TCPIPModel/PhysicalLayer/Ethernet2/Ethernet2Frame.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/TCPIPModel/PhysicalLayer/Ethernet2/Ethernet2Frame.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; //using System.Linq; using System.Text; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace Cosmos.Hardware.Network.TCPIPModel.PhysicalLayer.Ethernet2 { diff --git a/source/Cosmos/Cosmos.Kernel/Cosmos.Kernel.csproj b/source/Cosmos/Cosmos.Kernel/Cosmos.Kernel.csproj index 0bfaad63e..6d6935a76 100644 --- a/source/Cosmos/Cosmos.Kernel/Cosmos.Kernel.csproj +++ b/source/Cosmos/Cosmos.Kernel/Cosmos.Kernel.csproj @@ -61,6 +61,8 @@ + + diff --git a/source/Cosmos/Cosmos.Hardware/Extension/NumberSystem/Binary.cs b/source/Cosmos/Cosmos.Kernel/Extension/Binary.cs similarity index 93% rename from source/Cosmos/Cosmos.Hardware/Extension/NumberSystem/Binary.cs rename to source/Cosmos/Cosmos.Kernel/Extension/Binary.cs index fb312c8ae..9f6e2feb4 100644 --- a/source/Cosmos/Cosmos.Hardware/Extension/NumberSystem/Binary.cs +++ b/source/Cosmos/Cosmos.Kernel/Extension/Binary.cs @@ -2,10 +2,8 @@ using System.Collections.Generic; using System.Text; -namespace Cosmos.Hardware.Extension.NumberSystem -{ - public static class Binary - { +namespace Cosmos.Kernel { + public static class BinaryExtension { #region Extension methods public static string ToBinary(this byte n) diff --git a/source/Cosmos/Cosmos.Hardware/Extension/NumberSystem/Hex.cs b/source/Cosmos/Cosmos.Kernel/Extension/Hex.cs similarity index 93% rename from source/Cosmos/Cosmos.Hardware/Extension/NumberSystem/Hex.cs rename to source/Cosmos/Cosmos.Kernel/Extension/Hex.cs index 5995cf814..507ef3de5 100644 --- a/source/Cosmos/Cosmos.Hardware/Extension/NumberSystem/Hex.cs +++ b/source/Cosmos/Cosmos.Kernel/Extension/Hex.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Text; -namespace Cosmos.Hardware.Extension.NumberSystem -{ - public static class Hex +namespace Cosmos.Kernel { + public static class HexExtension { #region C# 3.0 Extension Methods diff --git a/source/FrodeTest/Shell/Session.cs b/source/FrodeTest/Shell/Session.cs index 3fd783881..c04b976e6 100644 --- a/source/FrodeTest/Shell/Session.cs +++ b/source/FrodeTest/Shell/Session.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using Cosmos.Hardware.Network.Devices.RTL8139; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace FrodeTest.Shell { diff --git a/source/FrodeTest/Test/IPv4Test.cs b/source/FrodeTest/Test/IPv4Test.cs index df52f97a3..d4aca1b33 100644 --- a/source/FrodeTest/Test/IPv4Test.cs +++ b/source/FrodeTest/Test/IPv4Test.cs @@ -4,7 +4,7 @@ using System.Text; using Cosmos.Hardware.Network.TCPIPModel.NetworkLayer.IPv4; using Cosmos.Hardware.Network.TCPIPModel.PhysicalLayer.Ethernet2; using Cosmos.Hardware.Network.Devices.RTL8139; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; using Cosmos.Hardware.Network; namespace FrodeTest.Test diff --git a/source/FrodeTest/Test/NumberSystemTest.cs b/source/FrodeTest/Test/NumberSystemTest.cs index e6c0d18d2..4a6b6931a 100644 --- a/source/FrodeTest/Test/NumberSystemTest.cs +++ b/source/FrodeTest/Test/NumberSystemTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Cosmos.Hardware.Extension.NumberSystem; +using Cosmos.Kernel; namespace FrodeTest.Test { diff --git a/source/SteveKernel/Program.cs b/source/SteveKernel/Program.cs index cb4020f14..a1bac0f24 100644 --- a/source/SteveKernel/Program.cs +++ b/source/SteveKernel/Program.cs @@ -83,7 +83,7 @@ namespace SteveKernel Console.WriteLine("dumping memory space:"); - for (uint i = 0; i < mas.Size; i++) + //for (uint i = 0; i < mas.Size; i++) // Conver to extensino method as per your commetns. :) //Console.Write(PCIBus.ToHex(mas.Read8Unchecked(i),2) +" ");