Merge remote-tracking branch 'origin/main' into hw/keyboard

Author: ryuukumar

kernel/include/kernel/fs/chardev.h

@@ -3,8 +3,6 @@
 
 #include <kernel/fs/vfs.h>
 
-int register_stderr (struct file* f);
-int register_stdin (struct file* f);
-int register_stdout (struct file* f);
+void init_tty1 (inode* absolute_root);
 
 #endif

kernel/src/kclib/string.c

@@ -39,7 +39,7 @@ void kitos (int32_t i, char* buf, uint32_t b) {
 	} while (i);
 	if (ctr == 0) buf[0] = '0';
 	if (negative) buf[ctr++] = '-';
-	buf[ctr + 1] = 0;
+	buf[ctr++] = 0;
 	kreverse (buf);
 }
 

kernel/src/kernel/entry.c

@@ -107,6 +107,9 @@ __attribute__ ((noreturn)) void _start_stage2 (void) {
 	init_console (framebuffer->width, framebuffer->height, 40, 40, 1, 1, 2);
 	init_kb ();
 
+	for (int i = 0; i < 3; i++) // open stdin, stdout and stderr
+		do_syscall (SYSCALL_SYS_OPEN, (uint64_t)"/dev/tty1", 0, 0);
+
 	print_info ();
 
 	kprintf ("\n[Stage 2] Running as PID %lld\n", get_current_process ()->p_id);
@@ -186,6 +189,7 @@ void _start (void) {
 	init_process ();
 
 	init_vfs (init_ramfs_root ());
+	init_tty1 (get_absolute_root ());
 
 	// Launch Stage 2 as the first process (PID 1)
 	process* stage2_proc = kmalloc (sizeof (process));
@@ -196,15 +200,6 @@ void _start (void) {
 	stage2_proc->p_state = TASK_READY;
 	stage2_proc->p_wd = stage2_proc->p_root = get_absolute_root ();
 
-	for (int i = 0; i < 3; i++) {
-		stage2_proc->p_fds[i] = kmalloc (sizeof (struct file));
-		kmemset (stage2_proc->p_fds[i], 0, sizeof (struct file));
-	}
-
-	register_stdin (stage2_proc->p_fds[0]);
-	register_stdout (stage2_proc->p_fds[1]);
-	register_stderr (stage2_proc->p_fds[2]);
-
 	void* kstack = alloc_vpages (STACK_SIZE / PAGE_SIZE, false);
 	stage2_proc->p_kstack = (uintptr_t)kstack + STACK_SIZE;
 

kernel/src/kernel/fs/chardev.c

@@ -18,83 +18,23 @@ static int stdout_write (inode* node, file* f, void* buf, size_t len) {
 	return len;
 }
 
-static int stderr_write (inode* node, file* f, void* buf, size_t len) {
-	(void)node, (void)f; // args not used
-	bool stdio_buf = get_update_on_putch ();
-	set_update_on_putch (false);
-
-	for (size_t i = 0; i < len; i++)
-		putchar (((char*)buf)[i]);
-
-	update ();
-	set_update_on_putch (stdio_buf);
-	return len;
-}
-
-int register_stdin (struct file* f) {
-	if (!f) return -EINVARG;
-
-	inode* new_inode = kmalloc (sizeof (inode));
-	if (!new_inode) return -ENOMEM;
-
-	kmemset (new_inode, 0, sizeof (inode));
-
-	new_inode->i_cnt = 1;
-	new_inode->i_type = CHAR_DEV;
-
-	f->f_inode = new_inode;
-
-	return 0;
-}
-
-int register_stdout (struct file* f) {
-	if (!f) return -EINVARG;
-
-	inode* new_inode = kmalloc (sizeof (inode));
-	if (!new_inode) return -ENOMEM;
-
-	file_operations* stdout_fops = kmalloc (sizeof (file_operations));
-	if (!stdout_fops) {
-		kfree (new_inode);
-		return -ENOMEM;
-	}
-
-	kmemset (new_inode, 0, sizeof (inode));
-	kmemset (stdout_fops, 0, sizeof (file_operations));
-
-	stdout_fops->write = stdout_write;
-
-	new_inode->i_cnt = 1;
-	new_inode->i_type = CHAR_DEV;
-
-	f->f_inode = new_inode;
-	f->f_fops = stdout_fops;
-
-	return 0;
-}
-
-int register_stderr (struct file* f) {
-	if (!f) return -EINVARG;
-
-	inode* new_inode = kmalloc (sizeof (inode));
-	if (!new_inode) return -ENOMEM;
-
-	file_operations* stdout_fops = kmalloc (sizeof (file_operations));
-	if (!stdout_fops) {
-		kfree (new_inode);
-		return -ENOMEM;
-	}
-
-	kmemset (new_inode, 0, sizeof (inode));
-	kmemset (stdout_fops, 0, sizeof (file_operations));
+void init_tty1 (inode* absolute_root) {
+	inode* dev_dir = nullptr;
+	int	   error = do_mkdir ("dev", &dev_dir, absolute_root);
+	if (!(error == 0 || error == -EPEXISTS)) return;
 
-	stdout_fops->write = stderr_write;
+	inode* tty1_file = nullptr;
+	error = do_create ("tty1", &tty1_file, dev_dir);
+	if (error != 0 || !tty1_file) return;
 
-	new_inode->i_cnt = 1;
-	new_inode->i_type = CHAR_DEV;
+	file_operations* tty1_fops = kmalloc (sizeof (file_operations));
+	if (!tty1_fops) return;
 
-	f->f_inode = new_inode;
-	f->f_fops = stdout_fops;
+	kmemset (tty1_fops, 0, sizeof (file_operations));
+	tty1_fops->write = stdout_write;
+	// tty1_fops->read = // connect to keyboard get_next_char when available
 
-	return 0;
+	tty1_file->i_iops = nullptr;
+	tty1_file->i_fops = tty1_fops;
+	tty1_file->i_type = CHAR_DEV;
 }