Things (#157)

.gitignore

@@ -18,3 +18,5 @@
 iso/boot/ramdisk
 disk*.img
 builds/
+compile_commands.json
+.cache/

compile_flags.txt

@@ -0,0 +1,11 @@
+-O0
+-nostdlib
+-fno-stack-protector
+-fno-builtin
+-Ikernel/include/
+-ffreestanding
+-Wall
+-Wno-div-by-zero
+-Wno-address-of-packed-member
+-Wno-implicit-function-declaration
+-mno-red-zone

kernel/include/io/ports.h

@@ -40,7 +40,7 @@ extern void (*default_qemu_printf)(const char *text, ...) __attribute__((format(
 
 #define assert(condition, format, ...) do { if (condition) {                 \
     qemu_printf("======================================\n");          \
-    qemu_printf("ASSERT FAILED: " format "\n", ##__VA_ARGS__);   \
+    qemu_printf("[%s:%s:%d]  ASSERT FAILED: " format "\n", __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__);   \
     qemu_printf("======================================\n");          \
     bsod_screen((registers_t){}, "ASSERT_FAIL", "See additional information on COM1 port. (Or Qemu.log if you're using QEMU)", 0xFFFF); \
 } } while(0)
@@ -134,4 +134,4 @@ int32_t is_transmit_empty(uint16_t port);
 uint8_t serial_readchar(uint16_t port);
 void io_wait();
 
-void new_qemu_printf(const char *format, ...);
+void new_qemu_printf(const char *format, ...);

kernel/include/mem/pmm.h

@@ -29,7 +29,7 @@ extern size_t kernel_end;
 #define		PAGE_DIRTY			(1U << 6)
 #define		PAGE_GLOBAL			(1U << 8)
 
-#define     PAGE_BITMAP_SIZE (131072)
+#define     PAGE_BITMAP_SIZE (131072 * 4)
 
 #define 	PD_INDEX(virt_addr) ((virt_addr) >> 22)
 #define 	PT_INDEX(virt_addr) (((virt_addr) >> 12) & 0x3ff)
@@ -67,4 +67,4 @@ uint32_t* get_kernel_page_directory();
 
 void map_pages_overlapping(physical_addr_t* page_directory, size_t physical_start, size_t virtual_start, size_t size, uint32_t flags);
 void unmap_pages_overlapping(physical_addr_t* page_directory, size_t virtual, size_t size);
-void phys_set_flags(uint32_t* page_dir, virtual_addr_t virtual, uint32_t flags);
+void phys_set_flags(uint32_t* page_dir, virtual_addr_t virtual, uint32_t flags);

kernel/include/net/stack.h

@@ -5,8 +5,15 @@
 #pragma once
 
 #include "common.h"
+#include "net/cards.h"
+
+typedef struct {
+	netcard_entry_t* card;
+	void* data;
+	size_t length;
+} netqueue_item_t;
 
 void netstack_init();
-void netstack_push(void* packet_data, size_t length);
-void* netstack_pop();
-void* netstack_poll();
+void netstack_push(netcard_entry_t* card, void* packet_data, size_t length);
+netqueue_item_t* netstack_pop();
+netqueue_item_t* netstack_poll();

kernel/include/net/tcp.h

@@ -27,9 +27,10 @@ typedef struct {
 } tcp_packet_t;
 
 typedef enum {
-	EIKS_CREATED,
-	EIKS_LISTENING,
-	EIKS_ESTABLISHED
+	TCP_NONE,
+	TCP_CREATED,
+	TCP_LISTENING,
+	TCP_ESTABLISHED
 } tcp_connection_status_t;
 
 typedef struct {
@@ -38,7 +39,7 @@ typedef struct {
 	uint16_t source_port;
 	uint16_t dest_port;
 	uint32_t seq;
-	uint32_t dst_seq;
+	uint32_t ack;
 	tcp_connection_status_t status;
 } tcp_connection_t;