Changeset 82163 in vbox for trunk/src/VBox/Devices/PC/BIOS/ebda.h

Timestamp:

Nov 25, 2019 10:31:53 AM (5 years ago)

Author:

vboxsync

Message:

PC/BIOS: Hook up VirtIO driver to the disk layer

File:

• trunk/src/VBox/Devices/PC/BIOS/ebda.h (modified) (4 diffs)

trunk/src/VBox/Devices/PC/BIOS/ebda.h

@@ -106 +106 @@
  */
 enum dsk_type_enm {
-    DSK_TYPE_NONE,      /* Unknown device. */
-    DSK_TYPE_UNKNOWN,   /* Unknown ATA device. */
-    DSK_TYPE_ATA,       /* ATA disk. */
-    DSK_TYPE_ATAPI,     /* ATAPI device. */
-    DSK_TYPE_SCSI,      /* SCSI disk. */
-    DSK_TYPE_AHCI,      /* SATA disk via AHCI. */
-    DSKTYP_CNT          /* Number of disk types. */
+    DSK_TYPE_NONE,        /* Unknown device. */
+    DSK_TYPE_UNKNOWN,     /* Unknown ATA device. */
+    DSK_TYPE_ATA,         /* ATA disk. */
+    DSK_TYPE_ATAPI,       /* ATAPI device. */
+    DSK_TYPE_SCSI,        /* SCSI disk. */
+    DSK_TYPE_AHCI,        /* SATA disk via AHCI. */
+    DSK_TYPE_VIRTIO_SCSI, /* SCSI disk. */
+    DSKTYP_CNT            /* Number of disk types. */
 };
 
@@ -287 +288 @@
     scsi_dev_t  scsidev[BX_MAX_SCSI_DEVICES];
     uint8_t     scsi_devcount;      /* Number of SCSI devices. */
+# ifdef VBOX_WITH_VIRTIO_SCSI
+    uint16_t    virtio_seg;         /* Segment of VirtIO data block. */
+# endif
 #endif
 
@@ -294 +298 @@
     uint8_t     ahci_devcnt;        /* Number of SATA devices. */
     uint16_t    ahci_seg;           /* Segment of AHCI data block. */
-#endif
-
-#ifdef VBOX_WITH_VIRTIO_SCSI
-    /* VirtIO SCSI bus-specific device information. */
-    virtio_scsi_dev_t  virtiodev[BX_MAX_VIRTIO_SCSI_DEVICES];
-    uint8_t            virtio_devcnt;        /* Number of VirtIO devices. */
-    uint16_t           virtio_seg;           /* Segment of VirtIO data block. */
 #endif
 
@@ -401 +398 @@
 int __fastcall ahci_write_sectors(bio_dsk_t __far *bios_dsk);
 
+int __fastcall virtio_scsi_read_sectors(bio_dsk_t __far *bios_dsk);
+int __fastcall virtio_scsi_write_sectors(bio_dsk_t __far *bios_dsk);
+
 extern void set_geom_lba(chs_t __far *lgeo, uint64_t nsectors);
 extern int edd_fill_dpt(dpt_t __far *dpt, bio_dsk_t __far *bios_dsk, uint8_t device);