xircon/Nanite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Grub is now 100% working!

Browse Source
This commit is contained in:
Tyler McGurrin 2025-06-06 16:50:38 -04:00
parent b41eb73a8c
commit 432e513aca
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -41,7 +41,7 @@ case $yn in
sudo losetup -d /dev/loop800 sudo losetup -d /dev/loop800
dd if=/dev/zero of=build/main.img bs=512 count=50000 dd if=/dev/zero of=build/main.img bs=512 count=50000
mkdir -p build/mnt mkdir -p build/mnt
sudo losetup /dev/loop800 build/main.img sudo losetup -P /dev/loop800 build/main.img
sudo parted /dev/loop800 mktable msdos sudo parted /dev/loop800 mktable msdos
sudo parted /dev/loop800 mkpart primary fat16 2048s 100% sudo parted /dev/loop800 mkpart primary fat16 2048s 100%
sudo parted /dev/loop800p1 set 1 boot on sudo parted /dev/loop800p1 set 1 boot on
@ -52,7 +52,7 @@ case $yn in
sudo mkdir build/mnt/misc sudo mkdir build/mnt/misc
sudo mkdir build/mnt/misc/src sudo mkdir build/mnt/misc/src
sudo cp -r src/* build/mnt/src sudo cp -r src/* build/mnt/src
sudo cp -r grub/* build/mnt/grub sudo cp -r grub/* build/mnt/boot/grub
sudo cp build/nanite.bin build/mnt/boot/nanite sudo cp build/nanite.bin build/mnt/boot/nanite
sudo grub-install \ sudo grub-install \
--modules="part_msdos" \ --modules="part_msdos" \

10
grub/grub.cfg
View File

@ -1,7 +1,13 @@
set timeout=15 set timeout=5
set default=0 set default=0
insmod part_msdos
set root='hd0,1'
menuentry "NANITE" { menuentry "NANITE" {
multiboot2 /boot/nanite.bin set root='hd0,1'
insmod fat
multiboot2 /boot/nanite
echo "Booting NANITE..."
boot boot
} }

5
src/kernel/arch/i686/irq.c
View File

@ -8,9 +8,12 @@
#include "io.h" #include "io.h"
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <dri/serial.h>
#define PIC_REMAP_OFFSET 0x20 #define PIC_REMAP_OFFSET 0x20
extern uint16_t DEBUG_COM_PORT;
IRQHandler g_IRQHandlers[16]; IRQHandler g_IRQHandlers[16];
void IRQ_Handler(Registers* regs) void IRQ_Handler(Registers* regs)
@ -24,7 +27,7 @@ void IRQ_Handler(Registers* regs)
} }
else else
{ {
printf("Unhandled IRQ %d...\n", irq); Serial_Printf(DEBUG_COM_PORT, "Unhandled IRQ %d...\n", irq);
} }
PIC_SendEndOfInterrupt(irq); PIC_SendEndOfInterrupt(irq);

0
src/kernel/boot.asm → src/kernel/multiboot.asm
View File

2
src/kernel/version.h
View File

@ -6,4 +6,4 @@
#pragma once #pragma once
#define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n" #define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n"
#define VERSION "RD-00040" #define VERSION "RD-00041"