Chris/AdvOpsys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed .devcontainer to be as it is in original repo

Browse Source
This commit is contained in:
Chris
2026-04-10 15:29:05 +00:00
parent 1c0886c2ae
commit 4d83b36644
6 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.devcontainer/devcontainer.json
View File

@@ -27,10 +27,10 @@
////////////////////////////////////
// Linux Setup (X11)
////////////////////////////////////
"mounts": [
"source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind,consistency=cached"
],
"containerEnv": {},
//"mounts": [
//"source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind,consistency=cached"
//],
//"containerEnv": {},
////////////////////////////////////

5
build/OSDev_18/compile_commands.json
View File

@@ -1,4 +1,9 @@
[
{
"directory": "/workspaces/AdvOpSys/build/OSDev_18",
"command": "/usr/bin/nasm -I/workspaces/AdvOpSys/src/OSDev_18/include -f elf32 -o CMakeFiles/uiaos-kernel.dir/src/multiboot2.asm.o /workspaces/AdvOpSys/src/OSDev_18/src/multiboot2.asm",
"file": "/workspaces/AdvOpSys/src/OSDev_18/src/multiboot2.asm"
},
{
"directory": "/workspaces/AdvOpSys/build/OSDev_18",
"command": "/usr/local/bin/i686-elf-gcc -I/workspaces/AdvOpSys/src/OSDev_18/include -g -Wall -Wextra -nostdinc -nostdlib -fno-builtin -fno-stack-protector -fno-stack-check -fno-lto -fPIE -m32 -march=i386 -mno-mmx -mno-sse -mno-sse2 -mno-red-zone -Wno-main -g -Wno-unused-variable -Wno-unused-parameter -std=gnu99 -o CMakeFiles/uiaos-kernel.dir/src/kernel.c.o -c /workspaces/AdvOpSys/src/OSDev_18/src/kernel.c",

2
src/OSDev_18/CMakeLists.txt
View File

@@ -58,7 +58,7 @@ set(OS_KERNEL_LINKER "${CMAKE_CURRENT_SOURCE_DIR}/src/arch/${OS_ARCH_TARGET}/lin
# Add executable target for the kernel
add_executable(uiaos-kernel
# src/multiboot2.asm # TODO: Add multiboot2 support
src/multiboot2.asm # TODO: Add multiboot2 support
src/kernel.c
)

16
src/OSDev_18/include/kernel/terminal.h Normal file
View File

@@ -0,0 +1,16 @@
#include <libc/stdio.h>
#include <libc/stdint.h>
#include <libc/limits.h>
#include <libc/stddef.h>
const size_t VGA_HEIGHT = 25;
const size_t VGA_WIDTH = 80;
static uint16_t* terminalBuffer = (uint16_t*) 0xB8000;
void terminalEntryAt(char c, uint8_t colour, size_t x, size_t y){
size_t index = y * VGA_WIDTH + x;
terminalBuffer[index] = vgaEntry(c, colour);
}

2
src/OSDev_18/src/kernel.c
View File

@@ -1,6 +1,6 @@
#include <libc/stdint.h>
void kernel_main(void) {
void main(void) {
for (;;) {
__asm__ volatile ("hlt");
}

2
src/group_name/CMakeLists.txt
View File

@@ -58,7 +58,7 @@ set(OS_KERNEL_LINKER "${CMAKE_CURRENT_SOURCE_DIR}/src/arch/${OS_ARCH_TARGET}/lin
# Add executable target for the kernel
add_executable(uiaos-kernel
# src/multiboot2.asm # TODO: Add multiboot2 support
src/multiboot2.asm # TODO: Add multiboot2 support
src/kernel.c
)