test

vhaudiquet · Jul 3, 2018 · 541f85b · 541f85b
1 parent abe5cce
commit 541f85b
Show file tree

Hide file tree

Showing 52 changed files with 38 additions and 23 deletions.
diff --git a/filesystem/devfs.c b/filesystem/devfs.c
@@ -82,14 +82,15 @@ error_t devfs_list_dir(list_entry_t* dest, fsnode_t* dir, u32* size)
 
     list_entry_t* ptr = dest;
 
-    while(((uintptr_t)dirptr) < ((uintptr_t)(spe->device_struct+dir->length)))
+    while(((uintptr_t)dirptr) < (((uintptr_t)(spe->device_struct))+dir->length))
     {
         devfs_dirent_t* dirent = (devfs_dirent_t*) dirptr;
         if(!dirent->node) break;
-        
+
         u32 name_len = strlen(dirent->name);
-        dirent_t* fd = kmalloc(sizeof(dirent)+name_len);
-        strcpy(fd->name, dirent->name);
+        dirent_t* fd = kmalloc(sizeof(dirent_t)+name_len+1);
+
+        strncpy(fd->name, dirent->name, name_len);
         fd->name_len = name_len;
         fd->inode = (uintptr_t) dirent->node;
 

diff --git a/filesystem/ext2.h b/filesystem/ext2.h
diff --git a/filesystem/fat32.c b/filesystem/fat32.c
diff --git a/filesystem/fat32.h b/filesystem/fat32.h
diff --git a/filesystem/fs.h b/filesystem/fs.h
diff --git a/filesystem/iso9660.h b/filesystem/iso9660.h
diff --git a/filesystem/vfs.c b/filesystem/vfs.c
diff --git a/internal/internal.h b/internal/internal.h
diff --git a/internal/pci.c b/internal/pci.c
diff --git a/internal/pci.h b/internal/pci.h
diff --git a/internal/pic.c b/internal/pic.c
diff --git a/io/io.h b/io/io.h
diff --git a/io/ioctl.h b/io/ioctl.h
diff --git a/io/stream.c b/io/stream.c
diff --git a/io/termios.h b/io/termios.h
diff --git a/io/ttys.c b/io/ttys.c
diff --git a/memory/kheap.c b/memory/kheap.c
diff --git a/memory/kpageheap.c b/memory/kpageheap.c
diff --git a/memory/kvmheap.c b/memory/kvmheap.c
diff --git a/memory/mem.h b/memory/mem.h
diff --git a/memory/paging.c b/memory/paging.c
diff --git a/memory/physical.c b/memory/physical.c
diff --git a/storage/ata/ata_common.c b/storage/ata/ata_common.c
diff --git a/storage/ata/ata_dma.c b/storage/ata/ata_dma.c
diff --git a/storage/ata/ata_pio.c b/storage/ata/ata_pio.c
diff --git a/storage/ata/atapi.c b/storage/ata/atapi.c
diff --git a/storage/block_devices.c b/storage/block_devices.c
diff --git a/storage/storage.h b/storage/storage.h
diff --git a/sync/mutex.c b/sync/mutex.c
diff --git a/sync/mutex.s b/sync/mutex.s
diff --git a/sync/sync.h b/sync/sync.h
diff --git a/tasking/processes/elf.c b/tasking/processes/elf.c
diff --git a/tasking/processes/external_structures.h b/tasking/processes/external_structures.h
diff --git a/tasking/processes/groups.c b/tasking/processes/groups.c
diff --git a/tasking/processes/process.c b/tasking/processes/process.c
diff --git a/tasking/processes/signal.c b/tasking/processes/signal.c
diff --git a/tasking/processes/signal.h b/tasking/processes/signal.h
diff --git a/tasking/processes/syscalls.c b/tasking/processes/syscalls.c
@@ -54,9 +54,9 @@ void syscall_open(u32 ebx, u32 ecx, u32 edx)
     }
 
     fd_t* file = open_file(path, (u8) ecx);
-    //kprintf("%lSYS_OPEN : %s = 0x%X\n", 3, path, file);
+    kprintf("%lSYS_OPEN : %s = 0x%X\n", 3, path, file);
     if(!file) {asm("mov $0, %%eax ; mov %0, %%ecx"::"N"(ERROR_FILE_NOT_FOUND):"%eax", "%ecx"); return;}
-            
+
     if(current_process->files_count == current_process->files_size)
     {
         current_process->files_size*=2; 
@@ -402,10 +402,10 @@ void syscall_exec(u32 ebx, u32 ecx, u32 edx)
     //free old process memory
     free_process_memory(current_process);
 
-    //kprintf("%lSYS_EXEC : loading executable...\n", 3);
+    kprintf("%lSYS_EXEC : loading executable...\n", 3);
     error_t load = load_executable(current_process, current_process->files[ebx], (int) ecx, argv);
     if(load != ERROR_NONE) {kprintf("LOAD = %u\n", load); fatal_kernel_error("LOAD", "SYSCALL_EXEC");} //TEMP : just kill process
-    //kprintf("%lSYS_EXEC : executable loaded.\n", 3);
+    kprintf("%lSYS_EXEC : executable loaded.\n", 3);
 
     //schedule to force reload eip/esp + registers that are in memory
     __asm__ __volatile__("jmp schedule_switch"::"a"(current_process->active_thread), "d"(current_process));

diff --git a/tasking/processes/syscalls.h b/tasking/processes/syscalls.h
diff --git a/tasking/processes/threads.c b/tasking/processes/threads.c
diff --git a/tasking/scheduler/scheduler.c b/tasking/scheduler/scheduler.c
diff --git a/tasking/scheduler/scheduler.s b/tasking/scheduler/scheduler.s
diff --git a/tasking/task.h b/tasking/task.h
diff --git a/time/time.c b/time/time.c
diff --git a/time/time.h b/time/time.h
diff --git a/util/data_structs.c b/util/data_structs.c
diff --git a/util/lib.c b/util/lib.c
diff --git a/util/types.h b/util/types.h
diff --git a/util/util.h b/util/util.h
diff --git a/video/vga_text.c b/video/vga_text.c
@@ -94,26 +94,33 @@ void vga_text_reset()
     TEXT_CURSOR_Y = 0;
 }
 
-static void vga_text_scroll_up()
+//static
+ void vga_text_scroll_up()
 {
     if(get_video_mode() != VIDEO_MODE_VGA_TEXT) return;
     if(VIDEO_TYPE == VIDEO_TYPE_NONE) return;
-    unsigned char *VRAM, *tmp;
-    for (VRAM = VGA_MEM_START; VRAM < VGA_MEM_END; VRAM += 2)
+
+    u8* VRAM;
+    u8* tmp;
+    for (VRAM = VGA_MEM_START; (VRAM+1) < VGA_MEM_END; VRAM += 2)
     {
-        tmp = (u8*) (VRAM + 160);
+        //assign temp position to start of next line
+        tmp = (u8*) (VRAM + VGA_COLUMNS*2);
 
+        //if temp position is in VRAM, put it back in previous line
         if (tmp < VGA_MEM_END)
         {
-            *VRAM = *tmp;
-            *(VRAM + 1) = *(tmp + 1);
+            VRAM[0] = tmp[0];
+            VRAM[1] = tmp[1];
         }
-        else 
+        //else this means that this line is the last, so we empty it
+        else
         {
-            *VRAM = 0;
-            *(VRAM + 1) = 0x07;
+            VRAM[0] = 0;
+            VRAM[1] = 0x07;
         }
     }
+
     if(TEXT_CURSOR_Y > 0)
         TEXT_CURSOR_Y = (u8) (TEXT_CURSOR_Y - 1);
 }
@@ -173,18 +180,25 @@ void vga_text_putc(unsigned char c, u8 color)
     }
     else
     {
+        //get current video mem address and put char in it, + color if video mode = color
         u8* CURRENT = (u8*) (VGA_MEM_START + 2 * TEXT_CURSOR_X + 2*VGA_COLUMNS * TEXT_CURSOR_Y);
         *CURRENT = c;
         if(VIDEO_TYPE == VIDEO_TYPE_COLOR) *(CURRENT+1) = color;
+        //update X
         TEXT_CURSOR_X++;
-        if (TEXT_CURSOR_X > VGA_COLUMNS - 1)
-        {
-            TEXT_CURSOR_X = 0;
-            TEXT_CURSOR_Y++;
-        }
     }
 
-    if (TEXT_CURSOR_Y > VGA_LINES - 1){vga_text_scroll_up();} //this actually causes the last line not to be used
+    //update text cursor X if line end reached
+    if(TEXT_CURSOR_X >= VGA_COLUMNS)
+    {
+        TEXT_CURSOR_X = 0;
+        TEXT_CURSOR_Y++;
+    }
+
+    //update text cursor Y if screen end reached
+    if(TEXT_CURSOR_Y >= (VGA_LINES)) vga_text_scroll_up(); //this actually causes the last line not to be used
+
+    //update vga cursor
     vga_text_update_cursor();
 }
 

diff --git a/video/video.c b/video/video.c
diff --git a/video/video.h b/video/video.h