Compare commits

..

No commits in common. "10e8a54b2e20f69c1c90b167f758f6327d7e45a9" and "d58a569660cea14dc56653a3051d3946dd6d1d99" have entirely different histories.

4 changed files with 8 additions and 14 deletions

View File

@ -20,7 +20,6 @@ You can find a live demo [here](https://bananymous.com/banan-os)
- [x] AML interpreter (partial)
- [ ] ELF dynamic linking
- [ ] Graphical desktop
- [ ] copy-on-write memory
#### Drivers
- [x] NVMe disks
@ -28,8 +27,6 @@ You can find a live demo [here](https://bananymous.com/banan-os)
- [x] E1000 and E1000E NICs
- [x] PS2 keyboard (all scancode sets)
- [x] PS2 mouse
- [ ] USB
- [ ] virtio devices (network, storage)
#### Network
- [x] ARP
@ -47,7 +44,6 @@ You can find a live demo [here](https://bananymous.com/banan-os)
- [x] Ram
- [x] Proc
- [ ] Sys
- [ ] 9P
#### Bootloader support
- [x] GRUB

View File

@ -78,8 +78,7 @@ namespace Kernel::PCI
uint8_t subclass() const { return m_subclass; }
uint8_t prog_if() const { return m_prog_if; }
bool multi_function() const { return m_header_type & 0x80; }
uint8_t header_type() const { return m_header_type & 0x7F; }
uint8_t header_type() const { return m_header_type; }
uint16_t vendor_id() const { return m_vendor_id; }
uint16_t device_id() const { return m_device_id; }

View File

@ -17,6 +17,7 @@ namespace Kernel
public:
static BAN::ErrorOr<BAN::RefPtr<StorageController>> create(PCI::Device&);
~NVMeController() { ASSERT_NOT_REACHED(); }
NVMeQueue& io_queue() { return *m_io_queue; }

View File

@ -32,14 +32,12 @@ if [ ! -b $ROOT_PARTITION ]; then
exit 1
fi
if sudo mount $ROOT_PARTITION $MOUNT_DIR; then
cd $MOUNT_DIR
sudo tar xf $BANAN_SYSROOT_TAR
sudo rm -rf $MOUNT_DIR/var/www
sudo cp -r $BANAN_SCRIPT_DIR/../www $MOUNT_DIR/var
cd
sudo mount $ROOT_PARTITION $MOUNT_DIR
sudo umount $MOUNT_DIR
fi
cd $MOUNT_DIR
sudo tar xf $BANAN_SYSROOT_TAR
cd
sudo umount $MOUNT_DIR
sudo losetup -d $LOOP_DEV