intel e1000 drivers + UDP socket + kernel 1.3.4 + stp client

.github/workflows/checks.yml

@@ -24,4 +24,4 @@ jobs:
 
     - name: build img
       run: |
-        make elf bdisk iso
+        make kernel bdisk iso

.github/workflows/publish.yml

@@ -25,13 +25,13 @@ jobs:
         echo "PROFAN_HDD=disk-$VERSION.bin" >> $GITHUB_ENV
         echo "PROFAN_ISO=profanOS-$VERSION.iso" >> $GITHUB_ENV
         echo "PROFAN_VER=profanOS $VERSION" >> $GITHUB_ENV
-        make gaddons elf bdisk iso
+        make gaddons kernel bdisk iso
         cd out/disk && zip -r ../../initrd-build.zip * && cd ../..
         cp initrd.bin disk-$VERSION.bin
         cp profanOS.iso profanOS-$VERSION.iso
         cp kernel.elf profanOS-kernel.elf
         mv initrd.bin profanOS-initrd.bin
-        rm -Rf out/ && make elf disk && sh tools/limine.sh
+        rm -Rf out/ && make kernel disk && sh tools/limine.sh
         mv profanOS.iso profanOS-lite.iso
         cp profanOS-$VERSION.iso profanOS.iso
 

.gitignore

@@ -24,6 +24,9 @@ include/addons/
 .vscode/
 .vs/
 
+# vim swap files
+*.swp
+
 # clangd indexing data
 .cache/
 compile_commands.json
@@ -33,3 +36,4 @@ extracted/
 debug/
 *.hex
 *.out
+*.dat

Makefile

@@ -9,18 +9,20 @@
 #   === elydre : https://github.com/elydre/profanOS ===         #######  \\   #
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
 
-.PHONY: help elf iso miso disk bdisk run krun srun clean fclean addons gaddons
+.PHONY: _all help kernel iso miso disk bdisk run krun srun clean fclean addons gaddons run_ndbg
 
 PY_BUILD = tools/maketool.py
 PY_ADDON = tools/addons.py
 
+_all: disk run
+
 # list off available commands
 help:
 	@python3 $(PY_BUILD) help
 
 # build kernel
-elf:
-	python3 $(PY_BUILD) elf
+kernel:
+	python3 $(PY_BUILD) kernel
 
 # create iso with grub
 iso:
@@ -50,6 +52,9 @@ krun:
 srun:
 	python3 $(PY_BUILD) srun
 
+run_ndbg:
+	python3 $(PY_BUILD) run_ndbg
+
 # install all addons
 addons:
 	python3 $(PY_ADDON) -g

README.md

@@ -45,7 +45,7 @@ sudo pacman -S      make python gcc nasm qemu-full xorriso \
 make run
 
 # Show all commands
-make
+make help
 ```
 
 Each time the disk is modified you must force its reconstruction with `make disk`.
@@ -199,16 +199,16 @@ sudo sh install.sh /dev/sdX profanOS.iso
 3. *Discontinued desktop environment for profanOS*
 4. *The doom port running in profanOS*
 
-### Author & Contact
+### Authors & Contact
 
 - pf4 ([@elydre](https://github.com/elydre))
+- asqel ([@asqel](https://github.com/asqel))
 
 Contact me on my discord [server](https://discord.gg/PFbymQ3d97) or in PM `@pf4`
 
 ### Source & Acknowledgment
 
 - **[os tutorial](https://github.com/cfenollosa/os-tutorial) for the original tutorial**
-- [@asqel](https://github.com/asqel) for tests, the sulfur language and all the ports
 - [@Sarah](https://github.com/Sarenard) for all the help and ideas
 - [@copy](https://github.com/copy/v86) for the v86 online emulator and floppy build
 - [@spaskalev](https://github.com/spaskalev/buddy_alloc) for the buddy allocator

include/kernel/drivers/pci.h

@@ -0,0 +1,60 @@
+/*****************************************************************************\
+|   === pci.h : 2025 ===                                                      |
+|                                                                             |
+|    Kernel PCI driver header                                      .pi0iq.    |
+|                                                                 d"  . `'b   |
+|    This file is part of profanOS and is released under          q. /|\  "   |
+|    the terms of the GNU General Public License                   `// \\     |
+|                                                                  //   \\    |
+|   === elydre : https://github.com/elydre/profanOS ===         #######  \\   |
+\*****************************************************************************/
+
+#ifndef PCI_H
+#define PCI_H
+
+#include <ktype.h>
+
+typedef struct {
+    int vendor_id;
+    int device_id;
+    int bus;
+    int slot;
+    int function;
+    uint8_t bar_is_mem[6];
+    uint32_t bar[6];
+    uint32_t class_id;
+    uint8_t subclass_id;
+    uint8_t prog_if;
+    uint8_t interrupt_line;
+    uint8_t interrupt_pin;
+} pci_device_t;
+
+typedef struct {
+    uint16_t vendor_id;
+    uint16_t device_id;
+} pci_findme_t;
+
+extern pci_device_t *pcis;
+extern int pcis_len;
+
+void     pci_write_config(pci_device_t *pci, uint8_t offset, uint32_t value);
+void     pci_write_config_u16(pci_device_t *pci, uint8_t offset, uint16_t value);
+uint32_t pci_read_config(pci_device_t *pci, uint32_t offset);
+uint16_t pci_read_config_u16(pci_device_t *pci, uint8_t offset);
+
+uint8_t  pci_read_cmd_u8(pci_device_t *pci, uint8_t bar, uint32_t offset);
+uint16_t pci_read_cmd_u16(pci_device_t *pci, uint8_t bar, uint32_t offset);
+uint32_t pci_read_cmd_u32(pci_device_t *pci, uint8_t bar, uint32_t offset);
+void     pci_write_cmd_u8(pci_device_t *pci, uint8_t bar, uint32_t offset, uint8_t value);
+void     pci_write_cmd_u16(pci_device_t *pci, uint8_t bar, uint32_t offset, uint16_t value);
+void     pci_write_cmd_u32(pci_device_t *pci, uint8_t bar, uint32_t offset, uint32_t value);
+
+pci_device_t *pci_find(uint16_t vendor, uint16_t device);
+pci_device_t *pci_find_array(pci_findme_t *ids, int count);
+
+void     pci_enable_bus_master(pci_device_t *pci);
+uint32_t pci_try_enable_msi(pci_device_t *pci);
+
+int pci_init();
+
+#endif

include/kernel/kernel/process.h

@@ -22,13 +22,16 @@
 #define PROC_STATE_RUN 4
 #define PROC_STATE_IDL 5
 
-#define PROC_INFO_PPID     0
-#define PROC_INFO_STATE    1
-#define PROC_INFO_SLEEP_TO 2
-#define PROC_INFO_RUN_TIME 3
-#define PROC_INFO_NAME     4
-#define PROC_INFO_STACK    5
-#define PROC_INFO_SET_NAME 6
+#define PROC_INFO_PPID      0
+#define PROC_INFO_SET_PPID  1
+#define PROC_INFO_WAIT_PID  2
+#define PROC_INFO_RET_CODE  3
+#define PROC_INFO_STATE     4
+#define PROC_INFO_SLEEP_TO  5
+#define PROC_INFO_RUN_TIME  6
+#define PROC_INFO_NAME      7
+#define PROC_INFO_STACK     8
+#define PROC_INFO_SET_NAME  9
 
 #define process_get_ppid(pid)  process_info(pid, PROC_INFO_PPID, NULL)
 #define process_get_state(pid) process_info(pid, PROC_INFO_STATE, NULL)

include/kernel/system.h

@@ -14,7 +14,7 @@
 
 // build settings
 
-#define KERNEL_VERSION  "1.3.3"
+#define KERNEL_VERSION  "1.3.4"
 #define KERNEL_EDITING  "generic"
 
 #define PROCESS_MAX     200         // max process count
@@ -69,6 +69,7 @@ int elf_start(char *file, int sleep, char **argv, int *pid_ptr);
 // pok.c
 int      mod_load(char *path, uint32_t lib_id);
 int      mod_unload(uint32_t lib_id);
+int      mod_trigger_atdeath(int pid);
 uint32_t mod_get_func(uint32_t lib_id, uint32_t func_id);
 
 #define sys_fatal(msg, ...) sod_fatal(__FILE__, __LINE__, msg, ##__VA_ARGS__)

include/zlibs/arpa/inet.h

@@ -0,0 +1,26 @@
+/*****************************************************************************\
+|   === inet.h : 2025 ===                                                     |
+|                                                                             |
+|    Implementation of the arpa/inet.h header file from libC       .pi0iq.    |
+|                                                                 d"  . `'b   |
+|    This file is part of profanOS and is released under          q. /|\  "   |
+|    the terms of the GNU General Public License                   `// \\     |
+|                                                                  //   \\    |
+|   === elydre : https://github.com/elydre/profanOS ===         #######  \\   |
+\*****************************************************************************/
+
+#ifndef INET_H
+#define INET_H
+
+#include <stdint.h>
+#include <netinet/in.h>
+
+uint32_t htonl(uint32_t hostlong);
+uint16_t htons(uint16_t hostshort);
+uint32_t ntohl(uint32_t netlong);
+uint16_t ntohs(uint16_t netshort);
+
+int inet_aton(const char *str, struct in_addr *dest);
+int inet_pton(int af, const char *s, void *a0);
+
+#endif

include/zlibs/modules/eth.h

@@ -0,0 +1,100 @@
+/*****************************************************************************\
+|   === eth.h : 2026 ===                                                      |
+|                                                                             |
+|    Ethernet kernel module header                                 .pi0iq.    |
+|                                                                 d"  . `'b   |
+|    This file is part of profanOS and is released under          q. /|\  "   |
+|    the terms of the GNU General Public License                   `// \\     |
+|                                                                  //   \\    |
+|   === elydre : https://github.com/elydre/profanOS ===         #######  \\   |
+\*****************************************************************************/
+
+#ifndef ETH_ID
+#define ETH_ID 6
+
+#include <stdint.h>
+
+typedef struct eth_info_t {
+    uint32_t net_mask;
+    uint32_t router_ip;
+    uint8_t router_mac[8]; // ignores last 2 bytes
+
+    uint32_t ip;
+    uint8_t mac[8]; // ignores last 2 bytes
+} eth_info_t;
+
+typedef struct {
+    int len;
+    uint8_t *data;
+} eth_packet_t;
+
+typedef struct eth_listener_t {
+    int pid;
+    int len;
+    eth_packet_t *packets;
+    uint32_t id;
+} eth_listener_t;
+
+// syscalls
+
+#ifndef _KERNEL_MODULE
+
+uint32_t modeth_start();
+void     modeth_end(uint32_t id);
+int      modeth_send(void *data, uint16_t len);
+int      modeth_is_ready(uint32_t id);
+void     modeth_recv(uint32_t id, void *data);
+void     modeth_get_info(uint32_t id, struct eth_info_t *info);
+void     modeth_set_info(uint32_t id, struct eth_info_t *info);
+uint32_t modeth_get_transaction();
+
+extern int profan_syscall(uint32_t id, ...);
+
+#undef  _pscall
+#define _pscall(module, id, ...) \
+    profan_syscall(((module << 24) | id), __VA_ARGS__)
+
+#define modeth_start()  ((uint32_t) _pscall(ETH_ID, 0, 0))
+#define modeth_end(id)  ((void) _pscall(ETH_ID, 1, id))
+#define modeth_send(data, len)  ((int) _pscall(ETH_ID, 2, data, len))
+#define modeth_is_ready(id)  ((int) _pscall(ETH_ID, 3, id))
+#define modeth_recv(id, data)  ((void) _pscall(ETH_ID, 4, id, data))
+#define modeth_get_info(id, info)  ((void) _pscall(ETH_ID, 5, id, info))
+#define modeth_set_info(id, info)  ((void) _pscall(ETH_ID, 6, id, info))
+#define modeth_get_transaction()  ((uint32_t) _pscall(ETH_ID, 7, 0))
+
+#else // _KERNEL_MODULE defined
+
+void     eth_recv_packet(const void *addr, uint16_t p_len);
+void     eth_register_nic(int (*on_send)(const void *addr_phys, uint16_t len), const uint8_t *mac);
+
+uint32_t eth_start();
+void     eth_end(uint32_t id);
+int      eth_send(void *data, uint16_t len);
+int      eth_is_ready(uint32_t id);
+void     eth_recv(uint32_t id, void *data);
+void     eth_get_info(uint32_t id, struct eth_info_t *info);
+void     eth_set_info(uint32_t id, struct eth_info_t *info);
+uint32_t eth_get_transaction();
+
+#ifndef _ETH_C
+
+#undef get_func_addr
+#define get_func_addr ((uint32_t (*)(uint32_t, uint32_t)) *(uint32_t *) 0x1ffffb)
+
+#define eth_start ((uint32_t (*)(void)) get_func_addr(ETH_ID, 0))
+#define eth_end ((void (*)(uint32_t)) get_func_addr(ETH_ID, 1))
+#define eth_send ((int (*)(void *, uint16_t)) get_func_addr(ETH_ID, 2))
+#define eth_is_ready ((int (*)(uint32_t)) get_func_addr(ETH_ID, 3))
+#define eth_recv ((void (*)(uint32_t, void *)) get_func_addr(ETH_ID, 4))
+#define eth_get_info ((void (*)(uint32_t, struct eth_info_t *)) get_func_addr(ETH_ID, 5))
+#define eth_set_info ((void (*)(uint32_t, struct eth_info_t *)) get_func_addr(ETH_ID, 6))
+#define eth_get_transaction ((uint32_t (*)(void)) get_func_addr(ETH_ID, 7))
+
+#define eth_recv_packet ((void (*)(const void *, uint16_t)) get_func_addr(ETH_ID, 8))
+#define eth_register_nic ((void (*)(int (*)(const void *, uint16_t), const uint8_t *)) get_func_addr(ETH_ID, 9))
+
+#endif // _ETH_C
+#endif // _KERNEL_MODULE
+
+#endif