Changeset 82162 in vbox

Timestamp:

Nov 25, 2019 10:30:40 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134972

Message:

PC/BIOS: Move cdb_rw10 and cdb_rw16 into the generic SCSI header so it can be used from other drivers as well

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• scsi.c (modified) (1 diff)
• scsi.h (modified) (1 diff)

trunk/src/VBox/Devices/PC/BIOS/scsi.c

@@ -53 +53 @@
 #define SCSI_TXDIR_FROM_DEVICE 0
 #define SCSI_TXDIR_TO_DEVICE   1
-
-#pragma pack(1)
-
-/* READ_10/WRITE_10 CDB layout. */
-typedef struct {
-    uint16_t    command;    /* Command. */
-    uint32_t    lba;        /* LBA, MSB first! */
-    uint8_t     pad1;       /* Unused. */
-    uint16_t    nsect;      /* Sector count, MSB first! */
-    uint8_t     pad2;       /* Unused. */
-} cdb_rw10;
-
-/* READ_16/WRITE_16 CDB layout. */
-typedef struct {
-    uint16_t    command;    /* Command. */
-    uint64_t    lba;        /* LBA, MSB first! */
-    uint32_t    nsect32;    /* Sector count, MSB first! */
-    uint8_t     pad1;       /* Unused. */
-    uint8_t     pad2;       /* Unused. */
-} cdb_rw16;
-
-#pragma pack()
-
-ct_assert(sizeof(cdb_rw10) == 10);
-ct_assert(sizeof(cdb_rw16) == 16);
 
 void insb_discard(unsigned nbytes, unsigned port);

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

@@ -32 +32 @@
 #define SCSI_WRITE_16      0x8a
 
+#pragma pack(1)
+
+/* READ_10/WRITE_10 CDB layout. */
+typedef struct {
+    uint16_t    command;    /* Command. */
+    uint32_t    lba;        /* LBA, MSB first! */
+    uint8_t     pad1;       /* Unused. */
+    uint16_t    nsect;      /* Sector count, MSB first! */
+    uint8_t     pad2;       /* Unused. */
+} cdb_rw10;
+
+/* READ_16/WRITE_16 CDB layout. */
+typedef struct {
+    uint16_t    command;    /* Command. */
+    uint64_t    lba;        /* LBA, MSB first! */
+    uint32_t    nsect32;    /* Sector count, MSB first! */
+    uint8_t     pad1;       /* Unused. */
+    uint8_t     pad2;       /* Unused. */
+} cdb_rw16;
+
+#pragma pack()
+
+ct_assert(sizeof(cdb_rw10) == 10);
+ct_assert(sizeof(cdb_rw16) == 16);
+
 #endif /* !VBOX_INCLUDED_SRC_PC_BIOS_scsi_h */