Compare commits

..

4 Commits

4 changed files with 14 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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