Merge pull request #3 from Glowman554/dev

Added support for kernel modules, ac97 and shebangs

Author: Glowman554

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        preset: [ default, full_screen_terminal, network, network_full_screen_terminal, desktop ]
+        preset: [ default, full_screen_terminal, network, network_full_screen_terminal ]
 
     runs-on: ubuntu-latest
 
@@ -35,7 +35,7 @@ jobs:
         git config --global user.email "[email protected]"
         git config --global user.name "Glowman554"
     - name: release
-      run: MESSAGE_WEBHOOK=${{ secrets.MESSAGE_WEBHOOK }} bash release.sh ${{ matrix.preset }} "${{ github.event.head_commit.message }}"
+      run: MESSAGE_WEBHOOK=${{ secrets.MESSAGE_WEBHOOK }} MICROOS_BUILD_TOKEN=${{ secrets.MICROOS_BUILD_TOKEN }} bash release.sh ${{ matrix.preset }} "${{ github.event.head_commit.message }}"
     - uses: actions/upload-artifact@v4
       with:
         name: build-${{ matrix.preset }}

.vscode/targets.log

@@ -41,7 +41,7 @@ PWD = /home/janick/Development/MicroOS
 # automatic
 %D = $(patsubst %/,%,$(dir $%))
 # environment
-XDG_DATA_DIRS = /usr/share/plasma:/usr/local/share:/usr/share:/var/lib/snapd/desktop
+XDG_DATA_DIRS = /usr/share/plasma:/usr/local/share:/usr/share:/var/lib/snapd/gui
 # environment
 KONSOLE_DBUS_WINDOW = /Windows/1
 # automatic
@@ -51,7 +51,7 @@ KONSOLE_DBUS_WINDOW = /Windows/1
 # environment
 VSCODE_CODE_CACHE_PATH = /home/janick/.config/Code/CachedData/3b889b090b5ad5793f524b5d1d39fda662b96a2a
 # environment
-XDG_SESSION_PATH = /org/freedesktop/DisplayManager/Session1
+XDG_SESSION_PATH = /org/freegui/DisplayManager/Session1
 # environment
 LANG = C
 # environment
@@ -85,7 +85,7 @@ XDG_CONFIG_DIRS = /home/janick/.config/kdedefaults:/etc/xdg/xdg-plasma:/etc/xdg:
 # environment
 XCURSOR_THEME = KDE_Classic
 # environment
-XDG_SESSION_DESKTOP = KDE
+XDG_SESSION_GUI = KDE
 # makefile (from 'Makefile', line 1)
 MAKEFILE_LIST := Makefile
 # automatic
@@ -99,7 +99,7 @@ XDG_SESSION_TYPE = x11
 # automatic
 *F = $(notdir $*)
 # environment
-CHROME_DESKTOP = code-url-handler.desktop
+CHROME_GUI = code-url-handler.gui
 # environment
 DBUS_SESSION_BUS_ADDRESS = unix:path=/run/user/1000/bus
 # automatic
@@ -143,17 +143,17 @@ XDG_SEAT = seat0
 # environment
 NO_PROXY = 127.0.0.1
 # environment
-XDG_CURRENT_DESKTOP = KDE
+XDG_CURRENT_GUI = KDE
 # environment
 LS_COLORS = rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:
 # automatic
 +F = $(notdir $+)
 # environment
-XDG_SEAT_PATH = /org/freedesktop/DisplayManager/Seat0
+XDG_SEAT_PATH = /org/freegui/DisplayManager/Seat0
 # environment
-DESKTOP_SESSION = plasma
+GUI_SESSION = plasma
 # environment
-ORIGINAL_XDG_CURRENT_DESKTOP = KDE
+ORIGINAL_XDG_CURRENT_GUI = KDE
 # 'override' directive
 GNUMAKEFLAGS := 
 # environment

Makefile

@@ -3,15 +3,18 @@ include config.mk
 all: res
 	make -C mckrnl
 	make -C user
-ifeq ($(DESKTOP),1)
-	make -C desktop
+ifeq ($(GUI),1)
+	make -C gui
 endif
 
 NETDEV = e1000
 
 QEMU_FLAGS = -m 2G -cdrom cdrom.iso -boot d -hda res/foxos.img
 QEMU_FLAGS += -netdev user,id=u1 -device $(NETDEV),netdev=u1 -object filter-dump,id=f1,netdev=u1,file=dump.pcap
 # QEMU_FLAGS += -soundhw pcspk
+ifeq ($(AUDIO),1)
+QEMU_FLAGS += -audio driver=pipewire,model=ac97
+endif
 QEMU_FLAGS += -smp 4
 
 ifdef REMOTE
@@ -27,24 +30,24 @@ endif
 initrd.saf:
 	mkdir -p ./res/initrd/bin
 	cp -r ./user/bin/*.mex ./res/initrd/bin/ -v
-ifeq ($(DESKTOP),1)
-	cp -r ./desktop/bin/*.mex ./res/initrd/bin/ -v
-	mkdir -p ./res/initrd/opt/desktop
-	cp -r ./desktop/resources/* ./res/initrd/opt/desktop
-	mkdir -p ./res/initrd/opt/desktop/bin
-	cp -r ./desktop/bin/*.flbb ./res/initrd/opt/desktop/bin/ -v
+ifeq ($(GUI),1)
+	cp -r ./gui/bin/*.mex ./res/initrd/bin/ -v
+	mkdir -p ./res/initrd/opt/gui/bin
+	cp -r ./gui/bin/*.flbb ./res/initrd/opt/gui/bin/ -v
 endif
 	cp -r ./initrd/* ./res/initrd/ -v
 	cp LICENSE ./res/initrd/LICENSE -v
 	mkdir -p ./res/initrd/docs
 	cp *.md ./res/initrd/docs/. -v
 	mkdir -p ./res/initrd/EFI/BOOT
-	cp mckrnl/mckrnl.* ./res/initrd/EFI/BOOT/. -v
+	cp mckrnl/core/mckrnl.* ./res/initrd/EFI/BOOT/. -v
+	mkdir -p ./res/initrd/modules
+	cp mckrnl/modules/* ./res/initrd/modules/. -v
 	./res/saf/saf-make ./res/initrd ./res/initrd.saf
 
 iso: all initrd.saf
-	cp mckrnl/mckrnl.elf cdrom/.
-	cp mckrnl/mckrnl.syms cdrom/.
+	cp mckrnl/core/mckrnl.elf cdrom/.
+	cp mckrnl/core/mckrnl.syms cdrom/.
 	cp res/initrd.saf cdrom/.
 	cp LICENSE cdrom/.
 	grub-mkrescue -o cdrom.iso cdrom/
@@ -85,16 +88,16 @@ run_dbg: iso
 run_vnc: iso set_kvm
 	qemu-system-i386 $(QEMU_FLAGS) -s -vnc :1
 
-EXECUTABLE = mckrnl/mckrnl.elf
+EXECUTABLE = mckrnl/core/mckrnl.elf
 
 debug:
 	gdb -ex "symbol-file $(EXECUTABLE)" -ex "target remote localhost:1234" -ex "b _main"
 
 clean: iso
 	make -C mckrnl clean
 	make -C user clean
-ifeq ($(DESKTOP),1)
-	make -C desktop clean
+ifeq ($(GUI),1)
+	make -C gui clean
 endif
 
 deepclean:
@@ -107,19 +110,20 @@ libs.zip: all
 	cp user/libc/include/* res/libs/include/. -rf
 	cp user/libtinf/include/* res/libs/include/. -rf
 	cp user/libflvm/include/* res/libs/include/. -rf
+	cp user/libjson/include/* res/libs/include/. -rf
 
-ifeq ($(DESKTOP),1)
-	cp desktop/lib/* res/libs/. -rf
-	cp desktop/libwindow/include/* res/libs/include/. -rf
+ifeq ($(GUI),1)
+	cp gui/lib/* res/libs/. -rf
+	cp gui/libwindow/include/* res/libs/include/. -rf
 endif
 
 	zip -r libs.zip res/libs/
 
 compile_flags.txt:
 	make -C mckrnl compile_flags.txt 
 	make -C user compile_flags.txt
-ifeq ($(DESKTOP),1)
-	make -C desktop compile_flags.txt
+ifeq ($(GUI),1)
+	make -C gui compile_flags.txt
 endif
 
 pre_commit:

README.md

@@ -17,3 +17,4 @@ You can test it right in your browser [here](https://glowman554.de/microos)
 
 - [ImDaBigBoss](https://github.com/ImDaBigBoss) for making the [terminal](https://github.com/TheUltimateFoxOS/FoxOS-programs/tree/main/terminal)
 - ChaN for making [fatfs](http://elm-chan.org/fsw/ff/00index_e.html)
+- [Marcel](https://github.com/marceldobehere) for creating the [audio driver](https://github.com/marceldobehere/MaslOS-2/tree/main/kernel/devices/ac97)

SYSCALLS.md

@@ -29,7 +29,6 @@
 | SYS_SOCK_DISCONNECT | 0x1b | socket_id | &async | - | - | - |
 | SYS_SOCK_SEND | 0x1c | socket_id | &data | size | - | - |
 | SYS_SOCK_RECV | 0x1d | socket_id | &async | &data | size | bytes (return) |
-| SYS_SOUND_RUN | 0x1e | &coro | &context | - | - | - |
 | SYS_TIME | 0x1f | time (return) | - | - | - | - |
 | SYS_SET_COLOR | 0x20 | color | background | - | - | - |
 | SYS_ASYNC_GETARRW | 0x21 | a (return) | - | - | - | - |
@@ -46,3 +45,7 @@
 | SYS_IPV4_RESOLVE_ROUTE | 0x2c | nic | &async | ip | &mac (return) | - |
 | SYS_SOCK_SET_LOCAL_PORT | 0x2d | socket_id | port | - | - | - |
 | SYS_MMAP_MAPPED | 0x2e | addr | mapped | - | - | - |
+| SYS_SOUND_WRITE_PCM | 0x2f | &buffer | size | bytes_written (return) | - | - |
+| SYS_SOUND_GET_SAMPLE_RATE | 0x30 | sample_rate (return) | - | - | - | - |
+| SYS_SET_PIPE | 0x31 | pid | pipe | output | - | - |
+| SYS_RGB_COLOR | 0x32 | color | background | - | - | - |

cdrom/boot/grub/grub.cfg

@@ -2,36 +2,37 @@ set timeout=5
 set default=0
 
 menuentry "MicroOS" {
-	multiboot /mckrnl.elf --serial --initrd=/initrd.saf --syms=/mckrnl.syms --init=initrd:/bin/init.mex
+	multiboot /mckrnl.elf --serial --initrd=/initrd.saf --modules=/initrd.saf:/modules --syms=/mckrnl.syms --init=initrd:/bin/init.mex
 	module /initrd.saf /initrd.saf
 	module /mckrnl.syms /mckrnl.syms
 	boot
 }
 
 
 menuentry "MicroOS (Live)" {
-	multiboot /mckrnl.elf --serial --initrd=/initrd.saf --syms=/mckrnl.syms --init=initrd:/bin/init.mex --init-arg=tmpfs
+	multiboot /mckrnl.elf --serial --initrd=/initrd.saf --modules=/initrd.saf:/modules --syms=/mckrnl.syms --init=initrd:/bin/init.mex --init-arg=tmpfs
 	module /initrd.saf /initrd.saf
 	module /mckrnl.syms /mckrnl.syms
 	boot
 }
 
 menuentry "MicroOS (Live, gdb)" {
-	multiboot /mckrnl.elf --serial --initrd=/initrd.saf --syms=/mckrnl.syms --init=initrd:/bin/init.mex --gdb --init-arg=tmpfs
+	multiboot /mckrnl.elf --serial --initrd=/initrd.saf --modules=/initrd.saf:/modules --syms=/mckrnl.syms --init=initrd:/bin/init.mex --gdb --init-arg=tmpfs
 	module /initrd.saf /initrd.saf
 	module /mckrnl.syms /mckrnl.syms
 	boot
 }
 
 menuentry "MicroOS (Live, No serial)" {
-	multiboot /mckrnl.elf --initrd=/initrd.saf --syms=/mckrnl.syms --init=initrd:/bin/init.mex --init-arg=tmpfs
+	multiboot /mckrnl.elf --initrd=/initrd.saf --modules=/initrd.saf:/modules --syms=/mckrnl.syms --init=initrd:/bin/init.mex --init-arg=tmpfs
 	module /initrd.saf /initrd.saf
 	module /mckrnl.syms /mckrnl.syms
 	boot
 }
 
 menuentry "MicroOS (Installed)" {
-	multiboot /mckrnl.elf --serial --syms=/mckrnl.syms --init=MicroOS:/bin/init.mex
+	multiboot /mckrnl.elf --serial --syms=/mckrnl.syms --modules=/initrd.saf:/modules --init=MicroOS:/bin/init.mex
+	module /initrd.saf /initrd.saf
 	module /mckrnl.syms /mckrnl.syms
 	boot
 }

config.mk

@@ -1,8 +1,12 @@
 # Build configuration
-# Desktop
-# DESKTOP = 0
+# Gui
+# GUI = 0
 # FIRESTORM = 0
-# End Desktop
+# End Gui
+
+# Other
+ABI_VERSION = 4
+# End Other
 
 # Syscalls
 SYS_OPEN_ID = 1
@@ -32,7 +36,6 @@ SYS_SOCK_CONNECT_ID = 26
 SYS_SOCK_DISCONNECT_ID = 27
 SYS_SOCK_SEND_ID = 28
 SYS_SOCK_RECV_ID = 29
-SYS_SOUND_RUN_ID = 30
 SYS_TIME_ID = 31
 SYS_SET_COLOR_ID = 32
 SYS_ASYNC_GETARRW_ID = 33
@@ -49,6 +52,10 @@ SYS_SET_TERM_ID = 43
 SYS_IPV4_RESOLVE_ROUTE_ID = 44
 SYS_SOCK_SET_LOCAL_PORT_ID = 45
 SYS_MMAP_MAPPED_ID = 46
+SYS_SOUND_WRITE_PCM_ID = 47
+SYS_SOUND_GET_SAMPLE_RATE_ID = 48
+SYS_SET_PIPE_ID = 49
+SYS_RGB_COLOR_ID = 50
 # End Syscalls
 
 # End Build configuration

config/build.json

@@ -6,10 +6,10 @@
             {
                 "name": "Experimental",
                 "value": {
-                    "title": "Desktop",
+                    "title": "Gui",
                     "items": [
                         {
-                            "name": "DESKTOP",
+                            "name": "GUI",
                             "value": false
                         },
                         {
@@ -18,6 +18,18 @@
                         }
                     ]
                 }
+            },
+            {
+                "name": "Other",
+                "value": {
+                    "title": "Other",
+                    "items": [
+                        {
+                            "name": "ABI_VERSION",
+                            "value": 4
+                        }
+                    ]
+                }
             }
         ]
     }

config/kernel.json

@@ -1,5 +1,5 @@
 {
-    "file": "mckrnl/include/config.h",
+    "file": "mckrnl/core/include/config.h",
     "configuration": {
         "title": "Kernel configuration",
         "items": [
@@ -34,7 +34,7 @@
                         },
                         {
                             "name": "STACK_TRACE",
-                            "value": false
+                            "value": true
                         },
                         {
                             "name": "EARLY_SERIAL_DEBUG",
@@ -120,10 +120,6 @@
                             "name": "THREADS",
                             "value": false
                         },
-                        {
-                            "name": "AHCI_DRIVER",
-                            "value": false
-                        },
                         {
                             "name": "NETWORK_STACK",
                             "value": false
@@ -191,6 +187,10 @@
                         {
                             "name": "FAST_MEMORY",
                             "value": true
+                        },
+                        {
+                            "name": "ABI_VERSION",
+                            "value": 4
                         }
                     ]
                 }