WIP: NVME support

This commit is contained in:
Jeremy Soller 2017-02-18 14:05:24 -07:00
parent 639ed082aa
commit c4c8d6c357
5 changed files with 10 additions and 2 deletions

View file

@ -4,6 +4,7 @@ members = [
"drivers/ahcid",
"drivers/bgad",
"drivers/e1000d",
"drivers/nvmed",
"drivers/pcid",
"drivers/ps2d",
"drivers/rtl8168d",

@ -1 +1 @@
Subproject commit 5b223c06d0bcd4c936bad3ad6ec8324fd0ba16a6
Subproject commit 28dbc45637364b6ac68d2d091b6c5fa2420f3546

View file

@ -4,6 +4,12 @@ class = 1
subclass = 6
command = ["ahcid", "$NAME", "$BAR5", "$IRQ"]
[[drivers]]
name = "NVME storage"
class = 1
subclass = 8
command = ["nvmed", "$NAME", "$BAR0", "$IRQ"]
[[drivers]]
name = "Bochs Graphics Array"
class = 3

View file

@ -2,6 +2,7 @@ $(BUILD)/initfs.rs: \
initfs/bin/init \
initfs/bin/ahcid \
initfs/bin/bgad \
initfs/bin/nvmed \
initfs/bin/pcid \
initfs/bin/ps2d \
initfs/bin/redoxfs \

View file

@ -36,7 +36,7 @@ qemu_no_build:
qemu_extra: build/harddrive.bin
if [ ! -e build/extra.bin ]; then dd if=/dev/zero of=build/extra.bin bs=1048576 count=1024; fi
$(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw -drive file=build/extra.bin,format=raw
$(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw -drive file=build/extra.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL
qemu_extra_no_build:
if [ ! -e build/extra.bin ]; then dd if=/dev/zero of=build/extra.bin bs=1048576 count=1024; fi