daniel/MontaukOS
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup: namespace Montauk (capital M) => montauk::abi

Browse Source
This commit is contained in:
Daniel Hammer
2026-06-16 09:09:16 +02:00
parent b091af7653
commit e3dc1e881d
165 changed files with 758 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/src/installer/actions.cpp
+17 -17
View File
@@ -11,8 +11,8 @@
// ============================================================================
// EFI System Partition: C12A7328-F81F-11D2-BA4B-00A0C93EC93B
static Montauk::PartGuid esp_type_guid() {
Montauk::PartGuid g;
static montauk::abi::PartGuid esp_type_guid() {
montauk::abi::PartGuid g;
g.Data1 = 0xC12A7328;
g.Data2 = 0xF81F;
g.Data3 = 0x11D2;
@@ -24,8 +24,8 @@ static Montauk::PartGuid esp_type_guid() {
}
// Linux Filesystem: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
static Montauk::PartGuid linux_fs_type_guid() {
Montauk::PartGuid g;
static montauk::abi::PartGuid linux_fs_type_guid() {
montauk::abi::PartGuid g;
g.Data1 = 0x0FC63DAF;
g.Data2 = 0x8483;
g.Data3 = 0x4772;
@@ -52,7 +52,7 @@ void installer_refresh_disks() {
auto& st = g_state;
st.disk_count = 0;
for (int port = 0; port < MAX_DISKS; port++) {
Montauk::DiskInfo info;
montauk::abi::DiskInfo info;
montauk::memset(&info, 0, sizeof(info));
int r = montauk::diskinfo(&info, port);
if (r == 0 && info.type != 0) {
@@ -272,7 +272,7 @@ static bool copy_recursive(const char* src_dir, const char* dst_dir,
// GPT + partition helper
// ============================================================================
static void set_gpt_name(Montauk::GptAddParams& params, const char* name) {
static void set_gpt_name(montauk::abi::GptAddParams& params, const char* name) {
int i = 0;
for (; name[i] && i < 71; i++) params.name[i] = name[i];
params.name[i] = '\0';
@@ -306,7 +306,7 @@ static void install_efi_ext2(int disk) {
add_log("Creating EFI partition (128 MB)...");
flush_ui();
{
Montauk::GptAddParams params;
montauk::abi::GptAddParams params;
montauk::memset(&params, 0, sizeof(params));
params.blockDev = disk;
params.startLba = FIRST_USABLE_LBA;
@@ -327,7 +327,7 @@ static void install_efi_ext2(int disk) {
add_log("Creating ext2 partition...");
flush_ui();
{
Montauk::GptAddParams params;
montauk::abi::GptAddParams params;
montauk::memset(&params, 0, sizeof(params));
params.blockDev = disk;
params.startLba = 0; // auto-fill largest free region
@@ -345,7 +345,7 @@ static void install_efi_ext2(int disk) {
flush_ui();
// Step 4: Find partition indices
Montauk::PartInfo parts[MAX_PARTS];
montauk::abi::PartInfo parts[MAX_PARTS];
int part_count = montauk::partlist(parts, MAX_PARTS);
int efi_idx = -1, linux_idx = -1;
for (int p = 0; p < part_count; p++) {
@@ -365,10 +365,10 @@ static void install_efi_ext2(int disk) {
add_log("Formatting EFI partition (FAT32)...");
flush_ui();
{
Montauk::FsFormatParams fmt;
montauk::abi::FsFormatParams fmt;
montauk::memset(&fmt, 0, sizeof(fmt));
fmt.partIndex = efi_idx;
fmt.fsType = Montauk::FS_TYPE_FAT32;
fmt.fsType = montauk::abi::FS_TYPE_FAT32;
r = montauk::fs_format(&fmt);
if (r < 0) {
add_log("ERROR: FAT32 format failed");
@@ -382,10 +382,10 @@ static void install_efi_ext2(int disk) {
add_log("Formatting root partition (ext2)...");
flush_ui();
{
Montauk::FsFormatParams fmt;
montauk::abi::FsFormatParams fmt;
montauk::memset(&fmt, 0, sizeof(fmt));
fmt.partIndex = linux_idx;
fmt.fsType = Montauk::FS_TYPE_EXT2;
fmt.fsType = montauk::abi::FS_TYPE_EXT2;
r = montauk::fs_format(&fmt);
if (r < 0) {
add_log("ERROR: ext2 format failed");
@@ -515,7 +515,7 @@ static void install_single_fat32(int disk) {
// Step 2: Create EFI System Partition (entire disk)
add_log("Creating EFI System Partition...");
flush_ui();
Montauk::GptAddParams params;
montauk::abi::GptAddParams params;
montauk::memset(&params, 0, sizeof(params));
params.blockDev = disk;
params.startLba = 0;
@@ -535,7 +535,7 @@ static void install_single_fat32(int disk) {
add_log("Formatting as FAT32...");
flush_ui();
Montauk::PartInfo parts[MAX_PARTS];
montauk::abi::PartInfo parts[MAX_PARTS];
int part_count = montauk::partlist(parts, MAX_PARTS);
int esp_index = -1;
for (int p = 0; p < part_count; p++) {
@@ -550,10 +550,10 @@ static void install_single_fat32(int disk) {
flush_ui(); st.step = STEP_ERROR; return;
}
Montauk::FsFormatParams fmt;
montauk::abi::FsFormatParams fmt;
montauk::memset(&fmt, 0, sizeof(fmt));
fmt.partIndex = esp_index;
fmt.fsType = Montauk::FS_TYPE_FAT32;
fmt.fsType = montauk::abi::FS_TYPE_FAT32;
r = montauk::fs_format(&fmt);
if (r < 0) {
programs/src/installer/installer.h
+2 -2
View File
@@ -106,13 +106,13 @@ struct InstallerState {
int mode; // InstallerMode
// Install flow
Montauk::DiskInfo disks[MAX_DISKS];
montauk::abi::DiskInfo disks[MAX_DISKS];
int disk_count;
int selected_disk;
int partition_scheme;
// Update flow
Montauk::PartInfo parts[MAX_PARTS];
montauk::abi::PartInfo parts[MAX_PARTS];
int part_count;
int selected_part;
programs/src/installer/main.cpp
+1 -1
View File
@@ -289,7 +289,7 @@ extern "C" void _start() {
bool install_triggered = false;
while (true) {
Montauk::WinEvent ev;
montauk::abi::WinEvent ev;
bool redraw = false;
int r = g_window.poll(&ev);