Nigel/BarinkOS
1
0
Fork 0
Code Issues 1 Pull Requests 2 Releases Activity
e8df6ec628
BarinkOS/kernel/kernel.cpp

91 lines
2.3 KiB
C++
Raw Normal View History

Cleanup of PCI API
2023-02-17 13:42:42 +00:00
/*
Copyright © Nigel Barink 2023
*/
Merged FAT16 into Dev Hopefully with success
2023-02-03 20:47:05 +00:00
#include "memory/memory.h"
KERNEL: Improved Physical memory allocation code / Code refactor * Moved tests to a different folder * Adjusted the memory map address locations * Improved readability of `kernel.cpp`
2022-09-02 19:09:51 +00:00
#include "memory/KernelHeap.h"
#include "memory/gdt/gdtc.h"
Starting to move towards proper HAL and ring3 - slight clean up of PCI driver - Added TaskSegment header - Rename some folders
2023-02-11 11:22:45 +00:00
#include "memory/TaskStateSegment.h"
Moved reading file from disk to its own super visor terminal command - Updated gdt assembly - Updated Interrupt service request handlers - Improved virtual memory manager - NOTE: we're dependent on identity mappings for the heap to work
2023-02-08 13:07:44 +00:00
#include "supervisorterminal/superVisorTerminal.h"
#include "drivers/vga/VBE.h"
Started fleshing out the storage API
2023-02-21 13:36:20 +00:00
#include "pci/pci.h"
Moved reading file from disk to its own super visor terminal command - Updated gdt assembly - Updated Interrupt service request handlers - Improved virtual memory manager - NOTE: we're dependent on identity mappings for the heap to work
2023-02-08 13:07:44 +00:00
#include "drivers/pit/pit.h"
Added CPUID based checks
2023-02-17 15:27:36 +00:00
#include "i386/processor.h"
Moved reading file from disk to its own super visor terminal command - Updated gdt assembly - Updated Interrupt service request handlers - Improved virtual memory manager - NOTE: we're dependent on identity mappings for the heap to work
2023-02-08 13:07:44 +00:00
#include "terminal/kterm.h"
Starting to move towards proper HAL and ring3 - slight clean up of PCI driver - Added TaskSegment header - Rename some folders
2023-02-11 11:22:45 +00:00
#include "interrupts/idt.h"
KERNEL: Improved Physical memory allocation code / Code refactor * Moved tests to a different folder * Adjusted the memory map address locations * Improved readability of `kernel.cpp`
2022-09-02 19:09:51 +00:00
#include "serial.h"
Basic idea's are created for the storage solution - Added boot device info parsing to the kernel - Added a pointer in the kernel to our pre-kernel BootInfo structure - Created a layout for the FAT driver - Created a layout for the virtual filesystem - Separated IDE driver from the basic atapio driver. This will ensure we are not using one or the other - The create_harddrive shell script will now actually build a harddrive image of the kernel - The virtual filesystem initializes and creates a filesystem structure for every FAT16 partition in the master boot record
2023-02-21 20:43:14 +00:00
#include "storage/vfs/vfs.h"
Shellscript improvement plus FAT driver implementations - Improved the run bash script to exit when an error occurs in one of the sub tasks - Wrote basic FAT16 functions that should give enough information to properly implement the rest of the driver - FAT structure namings are now in accordence with the microsoft spec of March 2005
2023-02-23 22:54:02 +00:00
#include "storage/filesystems/FAT/FAT.h"
Implemented the basis for syscalls A software interrupt with vector 0x50 will cause a syscall to start executing. The EAX register will hold the syscall_num. Other registers and the stack can be used to hold further arguments.
2023-02-26 23:34:30 +00:00
#include "acpi/acpi.h"
#include "memory/VirtualMemoryManager.h"
Shellscript improvement plus FAT driver implementations - Improved the run bash script to exit when an error occurs in one of the sub tasks - Wrote basic FAT16 functions that should give enough information to properly implement the rest of the driver - FAT structure namings are now in accordence with the microsoft spec of March 2005
2023-02-23 22:54:02 +00:00
Added CPUID based checks
2023-02-17 15:27:36 +00:00
Implemented the basis for syscalls A software interrupt with vector 0x50 will cause a syscall to start executing. The EAX register will hold the syscall_num. Other registers and the stack can be used to hold further arguments.
2023-02-26 23:34:30 +00:00
extern BootInfoBlock* BIB;
Ring 3 ready - Fixed issue with setting up the Task Segment Register
2023-02-13 21:44:47 +00:00
extern "C" void LoadGlobalDescriptorTable();
Clean up jump into RING 3
2023-02-17 13:46:44 +00:00
extern "C" void jump_usermode();
Implemented the basis for syscalls A software interrupt with vector 0x50 will cause a syscall to start executing. The EAX register will hold the syscall_num. Other registers and the stack can be used to hold further arguments.
2023-02-26 23:34:30 +00:00
void initBootDrive(){
printf("Boot device: 0x%x\n", BIB->bootDeviceID);
unsigned int part3 = BIB->bootDeviceID & 0xFF;
unsigned int part2 = (BIB->bootDeviceID & 0xFF00) >> 8;
unsigned int part1 = (BIB->bootDeviceID & 0xFF0000) >> 16;
unsigned int drive = (BIB->bootDeviceID & 0xFF000000) >> 24;
if (drive == 0x80 )
printf("booted from disk!\n");
if(drive == 0x00)
printf("booted from floppy disk\n");
printf("Part1: %d, Part2: %d, Part3: %d\n", part1, part2 , part3);
ATAPIO::Identify(ATAPIO_PORT::Primary, DEVICE_DRIVE::MASTER);
}
Ring 3 ready - Fixed issue with setting up the Task Segment Register
2023-02-13 21:44:47 +00:00
Cleanup of PCI API
2023-02-17 13:42:42 +00:00
extern "C" void kernel ()
KERNEL: Improved Physical memory allocation code / Code refactor * Moved tests to a different folder * Adjusted the memory map address locations * Improved readability of `kernel.cpp`
2022-09-02 19:09:51 +00:00
{
Basic Launch of Higher half kernel We now can launch the kernel at 0xC0000000 (or 3 GiB mark) with paging enabled. A lot of early main is currently not executed to keep debugging as simple as possible during the initial testing of higher half kernel loading. A lot of the implementation is straight from wiki.osdev.org/Higher_Half_x86_Bare_Bones. Thanks to all the folks who keep that wiki updated, its really resourceful.
2022-08-17 23:26:49 +00:00
init_serial();
KERNEL: Improved Physical memory allocation code / Code refactor * Moved tests to a different folder * Adjusted the memory map address locations * Improved readability of `kernel.cpp`
2022-09-02 19:09:51 +00:00
kterm_init();
Starting to move towards proper HAL and ring3 - slight clean up of PCI driver - Added TaskSegment header - Rename some folders
2023-02-11 11:22:45 +00:00
Ring 3 ready - Fixed issue with setting up the Task Segment Register
2023-02-13 21:44:47 +00:00
setup_tss();
KERNEL: Improved Physical memory allocation code / Code refactor * Moved tests to a different folder * Adjusted the memory map address locations * Improved readability of `kernel.cpp`
2022-09-02 19:09:51 +00:00
initGDT();
Starting to move towards proper HAL and ring3 - slight clean up of PCI driver - Added TaskSegment header - Rename some folders
2023-02-11 11:22:45 +00:00
initidt();
Ring 3 ready - Fixed issue with setting up the Task Segment Register
2023-02-13 21:44:47 +00:00
LoadGlobalDescriptorTable();
flush_tss();
printf("Memory setup complete!\n");
Cleanup of PCI API
2023-02-17 13:42:42 +00:00
Page faults and protetion faults will now hang with a helpful message to explain what is going on. I removed previously set barriers from the code to load the kernel further.
2022-08-18 22:44:52 +00:00
// Enable interrupts
asm volatile("STI");
Starting to move towards proper HAL and ring3 - slight clean up of PCI driver - Added TaskSegment header - Rename some folders
2023-02-11 11:22:45 +00:00
Started implementing the virtual file system - The FAT command is no longer available - At Startup the FileSystem initialise funciton is called, it should execute the same code as the FAT command did. - ACPI::initialise is commented out because it causes a Exception
2023-02-17 20:52:03 +00:00
initHeap();
Cleanup of PCI API
2023-02-17 13:42:42 +00:00
pit_initialise();
Started fleshing out the storage API
2023-02-21 13:36:20 +00:00
ACPI::initialize();
Basic idea's are created for the storage solution - Added boot device info parsing to the kernel - Added a pointer in the kernel to our pre-kernel BootInfo structure - Created a layout for the FAT driver - Created a layout for the virtual filesystem - Separated IDE driver from the basic atapio driver. This will ensure we are not using one or the other - The create_harddrive shell script will now actually build a harddrive image of the kernel - The virtual filesystem initializes and creates a filesystem structure for every FAT16 partition in the master boot record
2023-02-21 20:43:14 +00:00
PCI::Scan();
Added CPUID based checks
2023-02-17 15:27:36 +00:00
processor::initialize();
Remove cpu.h and cpu.cpp in favor of i386/processor.[h|cpp] Moving enable protected Mode to processor class
2023-02-17 21:01:32 +00:00
processor::enable_protectedMode();
Implemented the basis for syscalls A software interrupt with vector 0x50 will cause a syscall to start executing. The EAX register will hold the syscall_num. Other registers and the stack can be used to hold further arguments.
2023-02-26 23:34:30 +00:00
initBootDrive();
We can now open and read files on the harddisk through a messy virtual filesystem The uri has to contain 8.3 filenames for now as I have not yet figured out how to convert from that to regular filenaming for the name comparison. reading files is still limited to 1 sector
2023-02-26 12:44:41 +00:00
VirtualFileSystem::initialize();
Adding subdir functionality Added FAT16 driver ability to list subdir entries Removed structure of FAT32 (we won't be using it anytime soon)
2023-02-24 20:31:20 +00:00
Implemented the basis for syscalls A software interrupt with vector 0x50 will cause a syscall to start executing. The EAX register will hold the syscall_num. Other registers and the stack can be used to hold further arguments.
2023-02-26 23:34:30 +00:00
#ifdef VFS_EXAMPLE
auto fontFile = VirtualFileSystem::open("/FONT PSF", 0);
if(grubcfg->flags == 0){
We can now open and read files on the harddisk through a messy virtual filesystem The uri has to contain 8.3 filenames for now as I have not yet figured out how to convert from that to regular filenaming for the name comparison. reading files is still limited to 1 sector
2023-02-26 12:44:41 +00:00
uint16_t* contents = (uint16_t*) malloc(sizeof(uint16_t) * 256);
Implemented the basis for syscalls A software interrupt with vector 0x50 will cause a syscall to start executing. The EAX register will hold the syscall_num. Other registers and the stack can be used to hold further arguments.
2023-02-26 23:34:30 +00:00
grubcfg->read(grubcfg, contents, 512);
Shellscript improvement plus FAT driver implementations - Improved the run bash script to exit when an error occurs in one of the sub tasks - Wrote basic FAT16 functions that should give enough information to properly implement the rest of the driver - FAT structure namings are now in accordence with the microsoft spec of March 2005
2023-02-23 22:54:02 +00:00
Implemented the basis for syscalls A software interrupt with vector 0x50 will cause a syscall to start executing. The EAX register will hold the syscall_num. Other registers and the stack can be used to hold further arguments.
2023-02-26 23:34:30 +00:00
for(int i =0 ; i < grubcfg->root->size; i++ ){
We can now open and read files on the harddisk through a messy virtual filesystem The uri has to contain 8.3 filenames for now as I have not yet figured out how to convert from that to regular filenaming for the name comparison. reading files is still limited to 1 sector
2023-02-26 12:44:41 +00:00
kterm_put(contents[i] & 0x00ff);
kterm_put(contents[i] >> 8);
Adding subdir functionality Added FAT16 driver ability to list subdir entries Removed structure of FAT32 (we won't be using it anytime soon)
2023-02-24 20:31:20 +00:00
}
We can now open and read files on the harddisk through a messy virtual filesystem The uri has to contain 8.3 filenames for now as I have not yet figured out how to convert from that to regular filenaming for the name comparison. reading files is still limited to 1 sector
2023-02-26 12:44:41 +00:00
kterm_put('\n');
free((void*)contents);
}else{
printf("Could not find file\n");
Shellscript improvement plus FAT driver implementations - Improved the run bash script to exit when an error occurs in one of the sub tasks - Wrote basic FAT16 functions that should give enough information to properly implement the rest of the driver - FAT structure namings are now in accordence with the microsoft spec of March 2005
2023-02-23 22:54:02 +00:00
}
Implemented the basis for syscalls A software interrupt with vector 0x50 will cause a syscall to start executing. The EAX register will hold the syscall_num. Other registers and the stack can be used to hold further arguments.
2023-02-26 23:34:30 +00:00
#endif
Started on path resolution algorithm - The algorithm will work once I am of better mind to deal with raw C strings - The resolution should look at each entry divided by '/'. if the entry is not there then we can quit early, however for now I am mostly concerned with getting the names of directory entries we would need to look for.
2023-02-19 21:14:58 +00:00
Clean up jump into RING 3
2023-02-17 13:46:44 +00:00
#ifdef USERMODE_RELEASE
// Lets jump into user mode
jump_usermode();
#else
startSuperVisorTerminal();
#endif
Interactive supervisor mode To ease the pain of debuggin I can now interact with the system through a very simplistic terminal. Hopefully things can be tested more easily by activating the piece through a simple command. The max characters for a command is 10. To achieve this I have had to make the following changes. - Changed IRQ to update a global status variable - Added a standalone keyboard driver with getKey functions - Changed the main kernel loop to display a prompt - Added a strncmp function to the clib/string file
2021-12-28 18:47:32 +00:00
Cleanup of PCI API
2023-02-17 13:42:42 +00:00
}
Reference in New Issue Copy Permalink