diff --git a/src/userland/Makefile b/src/userland/Makefile index 59c4d29..9b27514 100644 --- a/src/userland/Makefile +++ b/src/userland/Makefile @@ -13,10 +13,10 @@ BIN_DIR = bin LIBC_SOURCES = $(wildcard libc/*.c) LIBC_OBJS = $(patsubst libc/%.c, $(BIN_DIR)/%.o, $(LIBC_SOURCES)) $(BIN_DIR)/crt0.o -VPATH = cli gui sys games libc -vpath %.c cli gui sys games libc +VPATH = cli gui sys games libc net +vpath %.c cli gui sys games libc net -APP_SOURCES_FULL = $(wildcard cli/*.c gui/*.c sys/*.c games/*.c *.c) +APP_SOURCES_FULL = $(wildcard cli/*.c gui/*.c sys/*.c games/*.c *.c net/*.c) APP_SOURCES = $(filter-out stb_image.c, $(APP_SOURCES_FULL)) APP_ELFS = $(patsubst %.c, $(BIN_DIR)/%.elf, $(notdir $(APP_SOURCES))) diff --git a/src/userland/sys/sysfetch.c b/src/userland/cli/sysfetch.c similarity index 99% rename from src/userland/sys/sysfetch.c rename to src/userland/cli/sysfetch.c index 2678845..33f4592 100644 --- a/src/userland/sys/sysfetch.c +++ b/src/userland/cli/sysfetch.c @@ -239,11 +239,11 @@ int main(int argc, char **argv) { } if (config.os_label[0]) { strcpy(info_lines[info_line_count], config.os_label); - strcat(info_lines[info_line_count++], ": BoredOS V1.70 'Retrowave'"); + strcat(info_lines[info_line_count++], ": BoredOS V1.71 'Retrowave'"); } if (config.kernel_label[0]) { strcpy(info_lines[info_line_count], config.kernel_label); - strcat(info_lines[info_line_count++], ": Boredkernel V3.1.0 x86_64"); + strcat(info_lines[info_line_count++], ": Boredkernel V3.1.1 x86_64"); } if (config.uptime_label[0]) { uint64_t ticks = sys_system(16, 0, 0, 0, 0); diff --git a/src/userland/sys/about.c b/src/userland/gui/about.c similarity index 98% rename from src/userland/sys/about.c rename to src/userland/gui/about.c index 6be5506..8d65456 100644 --- a/src/userland/sys/about.c +++ b/src/userland/gui/about.c @@ -97,8 +97,8 @@ static void about_paint(ui_window_t win) { int fh = ui_get_font_height(); ui_draw_string(win, offset_x, offset_y + 105, "BoredOS 'Retrowave'", 0xFFFFFFFF); - ui_draw_string(win, offset_x, offset_y + 105 + fh, "BoredOS Version 1.70", 0xFFFFFFFF); - ui_draw_string(win, offset_x, offset_y + 105 + fh*2, "Kernel Version 3.1.0", 0xFFFFFFFF); + ui_draw_string(win, offset_x, offset_y + 105 + fh, "BoredOS Version 1.71", 0xFFFFFFFF); + ui_draw_string(win, offset_x, offset_y + 105 + fh*2, "Kernel Version 3.1.1", 0xFFFFFFFF); // Copyright ui_draw_string(win, offset_x, offset_y + 105 + fh*3, "(C) 2026 boreddevnl.", 0xFFFFFFFF); diff --git a/src/userland/sys/net.c b/src/userland/net/net.c similarity index 100% rename from src/userland/sys/net.c rename to src/userland/net/net.c diff --git a/src/userland/sys/ping.c b/src/userland/net/ping.c similarity index 100% rename from src/userland/sys/ping.c rename to src/userland/net/ping.c diff --git a/src/userland/sys/telnet.c b/src/userland/net/telnet.c similarity index 100% rename from src/userland/sys/telnet.c rename to src/userland/net/telnet.c diff --git a/src/userland/sys/sweden.c b/src/userland/sys/sweden.c deleted file mode 100644 index 33267bb..0000000 --- a/src/userland/sys/sweden.c +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2023-2026 Chris (boreddevnl) -// This software is released under the GNU General Public License v3.0. See LICENSE file for details. -// This header needs to maintain in any file it is present in, as per the GPL license terms. -#include -#include - -static void beep(int freq, int ms) { - sys_system(14, freq, ms, 0, 0); -} - -int main(int argc, char **argv) { - (void)argc; (void)argv; - printf("Playing Sweden - C418 (Minecraft)...\n"); - - // Main melody (simplified pattern) - beep(392, 400); // G4 - beep(440, 400); // A4 - beep(493, 800); // B4 - - beep(440, 400); // A4 - beep(392, 800); // G4 - beep(329, 800); // E4 - - beep(392, 400); // G4 - beep(440, 400); // A4 - beep(493, 800); // B4 - - beep(440, 400); // A4 - beep(392, 1200); // G4 - - printf("Done.\n"); - return 0; -}