Skip to content

Development #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 14, 2025
Merged

Development #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b53d3c7
vsnprintf, strings, nvme driver
assembler-0 Oct 13, 2025
2143344
NVMe driver
assembler-0 Oct 13, 2025
eb07cfb
EXT2 fixes
assembler-0 Oct 13, 2025
96e4b7e
Dynamic vector, Set active for all fs
assembler-0 Oct 14, 2025
46874f5
Cleanup
assembler-0 Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ add_custom_target(run
-parallel file:printer.out
-drive file=VirtioDisk.img,format=raw,id=virtio_disk,if=none
-device virtio-blk-pci,drive=virtio_disk,disable-legacy=on
-drive file=NVMeDisk.img,format=raw,id=nvme_disk,if=none
-device nvme,drive=nvme_disk,serial=nvme001
DEPENDS iso img extra-img
)

Expand All @@ -242,7 +244,9 @@ add_custom_target(extra-img
COMMAND ${QEMU_IMG} create -f raw VirtioDisk.img 128M
COMMAND ${MKFS_FAT} -F 16 VirtioDisk.img
COMMAND ${QEMU_IMG} create -f raw SataDisk.img 128M
COMMAND ${MKFS_NTFS} -F SataDisk.img
COMMAND ${MKFS_EXT2} -F SataDisk.img
COMMAND ${QEMU_IMG} create -f raw NVMeDisk.img 256M
COMMAND ${MKFS_EXT2} -F NVMeDisk.img
COMMENT "Creating extra disk images"
)

Expand Down
11 changes: 6 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ ninja run
- [x] List
- NTFS
- [x] Read
- [ ] Write
- [ ] Create
- [ ] Delete
- [ ] List
- [x] Write
- [x] Create
- [x] Delete
- [x] List
- VFRFS (VoidFrame RAMFS)
- [x] Read
- [x] Write
Expand Down Expand Up @@ -185,4 +185,5 @@ ninja run
- Storage
- [x] PATA (IDE)
- [x] VirtIO Block
- [x] AHCI
- [x] AHCI
- [x] NVMe
1 change: 1 addition & 0 deletions cmake/features.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ add_compile_definitions(
VF_CONFIG_ENABLE_IDE
VF_CONFIG_ENABLE_VFCOMPOSITOR
VF_CONFIG_ENABLE_AHCI
VF_CONFIG_ENABLE_NVME
VF_CONFIG_ENABLE_GENERIC_SOUND
VF_CONFIG_RTC_CENTURY
VF_CONFIG_LOAD_MB_MODULES
Expand Down
1 change: 1 addition & 0 deletions cmake/source.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ set(DRIVER_SOURCES
drivers/sound/SB16.c
drivers/sound/Generic.c
drivers/storage/AHCI.c
drivers/storage/NVMe.c
drivers/LPT/LPT.c
drivers/virtio/VirtioBlk.c
drivers/vmware/SVGAII.c
Expand Down
5 changes: 3 additions & 2 deletions drivers/Vesa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "Font.h"
#include "Multiboot2.h"
#include "Serial.h"
#include "math.h"
#include "stdint.h"
#include "stdlib.h"
#include "x64.h"
Expand Down Expand Up @@ -182,8 +183,8 @@ void VBEDrawRect(uint32_t x, uint32_t y, uint32_t width, uint32_t height, uint32
void VBEDrawLine(uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1, uint32_t color) {
if (!vbe_initialized) return;

int dx = ABSi((int)x1 - (int)x0);
int dy = ABSi((int)y1 - (int)y0);
int dx = abs((int)x1 - (int)x0);
int dy = abs((int)y1 - (int)y0);
int sx = (x0 < x1) ? 1 : -1;
int sy = (y0 < y1) ? 1 : -1;
int err = dx - dy;
Expand Down
Loading