Skip to content

Commit

Permalink
- Updated QEMU (primarily)
Browse files Browse the repository at this point in the history
  • Loading branch information
tgiphil committed Oct 21, 2024
1 parent 380b954 commit 0be297a
Show file tree
Hide file tree
Showing 156 changed files with 60 additions and 4,039 deletions.
14 changes: 14 additions & 0 deletions Source/Mosa.DeviceDriver/PCI/Bochs/BochsGraphicsAdaptor.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) MOSA Project. Licensed under the New BSD License.

using Mosa.DeviceSystem.Framework;

namespace Mosa.DeviceDriver.PCI.Bochs;

/// <summary>
/// The southbridge of the generic Intel chipset <see cref="BochsGraphicsAdaptor"/>.
/// </summary>
//[PCIDeviceDriver(VendorID = 0x1234, DeviceID = 0x1111, Platforms = PlatformArchitecture.X86AndX64)]
public class BochsGraphicsAdaptor : BaseDeviceDriver
{
public override void Initialize() => Device.Name = "BochsGraphicsAdaptor";
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright (c) MOSA Project. Licensed under the New BSD License.

using Mosa.DeviceSystem.Framework;

namespace Mosa.DeviceDriver.PCI.Intel;

public class IntelEthernetController82540EM : BaseDeviceDriver
{
public override void Initialize() => Device.Name = "IntelEthernetController82540EM";
}
22 changes: 22 additions & 0 deletions Source/Mosa.DeviceDriver/Setup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,16 @@ public static class Setup
Factory = () => new PCI.Intel.Intel4SeriesChipsetIntegratedGraphicsController2E13()
},

new PCIDeviceDriverRegistryEntry
{
Name = "IntelEthernetController82540EM",
Platform = PlatformArchitecture.X86AndX64,
VendorID = 0x8086,
DeviceID = 0x100E,
PCIFields = PCIField.VendorID | PCIField.DeviceID,
Factory = () => new PCI.Intel.IntelEthernetController82540EM()
},

new PCIDeviceDriverRegistryEntry
{
Name = "Intel4SeriesChipsetPCIExpressRootPort",
Expand All @@ -138,6 +148,18 @@ public static class Setup
Factory = () => new PCI.Intel.Intel4SeriesChipsetPCIExpressRootPort()
},

new PCIDeviceDriverRegistryEntry
{
Name = "BochsGraphicsAdaptor",
Platform = PlatformArchitecture.X86AndX64,
VendorID = 0x1234,
DeviceID = 0x1111,
PCIFields = PCIField.VendorID | PCIField.DeviceID,
Factory = () => new PCI.Bochs.BochsGraphicsAdaptor()
},

//

new PCIDeviceDriverRegistryEntry
{
Name = "Intel440FX",
Expand Down
40 changes: 8 additions & 32 deletions Source/Mosa.Utility.Configuration/AppLocationsSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ private static string FindNdisasm()
return
IsWindows ? TryFind("ndisasm.exe",
new string[] {
@"%CURRENT%\..\Tools\ndisasm",
@"%CURRENT%\Tools\ndisasm",
@"%CURRENT%\..\Tools\nasm",
@"%CURRENT%\Tools\nasm",

@"%APPDIR%\Tools\ndisasm",
@"%APPDIR%\..\Tools\ndisasm"
@"%APPDIR%\Tools\nasm",
@"%APPDIR%\..\Tools\nasm"
})
: TryFind("ndisasm", LinuxDirectories);
}
Expand Down Expand Up @@ -209,22 +209,10 @@ private static string FindBochs()
return
IsWindows ? TryFind("bochs.exe",
new string[] {
@"%ProgramFiles%\Bochs-2.6.9",
@"%ProgramFiles(x86)%\Bochs-2.6.9",
@"%ProgramFiles%\Bochs-2.6.8",
@"%ProgramFiles(x86)%\Bochs-2.6.8",
@"%ProgramFiles%\Bochs-2.6.5",
@"%ProgramFiles(x86)%\Bochs-2.6.5",
@"%ProgramFiles%\Bochs-2.6.2",
@"%ProgramFiles(x86)%\Bochs-2.6.2",
@"%ProgramFiles%\Bochs-2.8",
@"%ProgramFiles(x86)%\Bochs-2.8",
@"%ProgramFiles%\Bochs-2.7",
@"%ProgramFiles(x86)%\Bochs-2.7",

@"%CURRENT%\..\Tools\Bochs",
@"%CURRENT%\Tools\Bochs",

@"%APPDIR%\Tools\Bochs",
@"%APPDIR%\..\Tools\Bochs"
})
: TryFind("bochs", LinuxDirectories);
}
Expand All @@ -234,22 +222,10 @@ private static string FindBochsBIOS()
return
IsWindows ? TryFind("BIOS-bochs-latest",
new string[] {
@"%ProgramFiles%\Bochs-2.6.9",
@"%ProgramFiles(x86)%\Bochs-2.6.9",
@"%ProgramFiles%\Bochs-2.6.8",
@"%ProgramFiles(x86)%\Bochs-2.6.8",
@"%ProgramFiles%\Bochs-2.6.5",
@"%ProgramFiles(x86)%\Bochs-2.6.5",
@"%ProgramFiles%\Bochs-2.6.2",
@"%ProgramFiles(x86)%\Bochs-2.6.2",
@"%ProgramFiles%\Bochs-2.8",
@"%ProgramFiles(x86)%\Bochs-2.8",
@"%ProgramFiles%\Bochs-2.7",
@"%ProgramFiles(x86)%\Bochs-2.7",

@"%CURRENT%\..\Tools\Bochs",
@"%CURRENT%\Tools\Bochs",

@"%APPDIR%\Tools\Bochs",
@"%APPDIR%\..\Tools\Bochs"
})
: TryFind("BIOS-bochs-latest",
new string[] {
Expand Down
Binary file removed Tools/Bochs/BIOS-bochs-latest
Binary file not shown.
263 changes: 0 additions & 263 deletions Tools/Bochs/VGABIOS-lgpl-README.txt

This file was deleted.

Binary file removed Tools/Bochs/VGABIOS-lgpl-latest
Binary file not shown.
Binary file removed Tools/Bochs/VGABIOS-lgpl-latest-banshee
Binary file not shown.
Binary file removed Tools/Bochs/VGABIOS-lgpl-latest-cirrus
Binary file not shown.
Binary file removed Tools/Bochs/VGABIOS-lgpl-latest-cirrus-debug
Binary file not shown.
Binary file removed Tools/Bochs/VGABIOS-lgpl-latest-debug
Binary file not shown.
Binary file removed Tools/Bochs/bochs.exe
Binary file not shown.
Binary file removed Tools/Bochs/bochs.ico
Binary file not shown.
Binary file removed Tools/Bochs/bochsdbg.exe
Binary file not shown.
Loading

0 comments on commit 0be297a

Please sign in to comment.