Changeset 44692 in vbox

Timestamp:

Feb 14, 2013 3:44:30 PM (12 years ago)

Author:

vboxsync

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

83788

Message:

BIOS: Implemented ATAPI device reset.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ata.c (modified) (6 diffs)
• ebda.h (modified) (1 diff)
• eltorito.c (modified) (2 diffs)

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

@@ -757 +757 @@
     
     if (status & ATA_CB_STAT_ERR) {
-        BX_DEBUG_ATA("%s: read error\n", __func__);
+        BX_DEBUG_ATA("%s: write error\n", __func__);
         // Enable interrupts
         outb(iobase2+ATA_CB_DC, ATA_CB_DC_HD15);
@@ -949 +949 @@
     }
     
-    if (status & ATA_CB_STAT_ERR) {
+    if (status & ATA_CB_STAT_CHK) {
         BX_DEBUG_ATA("%s: error, status is %02x\n", __func__, status);
         // Enable interrupts
@@ -988 +988 @@
                 break;
             
-            if (status & ATA_CB_STAT_ERR) {
+            if (status & ATA_CB_STAT_CHK) {
                 BX_DEBUG_ATA("%s: error (status %02x)\n", __func__, status);
                 // Enable interrupts
@@ -996 +996 @@
             
             // Device must be ready to send data
-            if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DRQ | ATA_CB_STAT_ERR) )
+            if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DRQ | ATA_CB_STAT_CHK) )
               != (ATA_CB_STAT_RDY | ATA_CB_STAT_DRQ) ) {
                 BX_DEBUG_ATA("%s: not ready (status %02x)\n", __func__, status);
@@ -1094 +1094 @@
     
     // Final check, device must be ready
-    if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DF | ATA_CB_STAT_DRQ | ATA_CB_STAT_ERR) )
+    if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DF | ATA_CB_STAT_DRQ | ATA_CB_STAT_CHK) )
       != ATA_CB_STAT_RDY ) {
         BX_DEBUG_ATA("%s: not ready (status %02x)\n", __func__, (unsigned) status);
@@ -1107 +1107 @@
 }
 
+// ---------------------------------------------------------------------------
+// ATA/ATAPI driver : reset device; intended for ATAPI devices
+// ---------------------------------------------------------------------------
+      // returns
+      // 0 : no error
+      // 1 : error
+uint16_t ata_soft_reset(uint16_t device)
+{
+    uint16_t        iobase1, iobase2;
+    uint8_t         channel, slave;
+    uint8_t         status;
+    bio_dsk_t __far *bios_dsk;
+
+    bios_dsk = read_word(0x0040, 0x000E) :> &EbdaData->bdisk;
+
+    channel = device / 2;
+    slave   = device % 2;
+
+    iobase1  = bios_dsk->channels[channel].iobase1;
+    iobase2  = bios_dsk->channels[channel].iobase2;
+
+    /* Send a reset command to the device. */
+    outb(iobase2 + ATA_CB_DC, ATA_CB_DC_HD15 | ATA_CB_DC_NIEN);
+    outb(iobase1 + ATA_CB_DH, slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0);
+    outb(iobase1 + ATA_CB_CMD, ATA_CMD_DEVICE_RESET);
+    
+    /* Wait for the device to clear BSY. */
+    while (1) {
+        status = inb(iobase1 + ATA_CB_STAT);
+        if ( !(status & ATA_CB_STAT_BSY) ) break;
+    }
+    
+    /* Final check, device must be ready */
+    if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DF | ATA_CB_STAT_DRQ | ATA_CB_STAT_CHK) )
+      != ATA_CB_STAT_RDY ) {
+        BX_DEBUG_ATA("%s: not ready (status %02x)\n", __func__, (unsigned) status);
+        /* Enable interrupts */
+        outb(iobase2 + ATA_CB_DC, ATA_CB_DC_HD15);
+        return 1;
+    }
+    
+    /* Enable interrupts */
+    outb(iobase2+ATA_CB_DC, ATA_CB_DC_HD15);
+    return 0;
+}
+
 
 // ---------------------------------------------------------------------------

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

@@ -222 +222 @@
                                uint16_t header, uint32_t length, uint8_t inout, char __far *buffer);
 
+extern uint16_t ata_soft_reset(uint16_t device);
+
 /* All BIOS disk information. Disk-related code in the BIOS should not need
  * anything outside of this structure.

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

@@ -109 +109 @@
 };
 
+/* Generic reset routine signature. */
+typedef uint16_t (* cd_rst_func)(uint16_t device_id);
+
+/* Pointers to HW specific CD-ROM reset routines. */
+cd_rst_func     softrst[DSKTYP_CNT] = {
+    [DSK_TYPE_ATAPI]  = { ata_soft_reset },
+#ifdef VBOX_WITH_AHCI
+    [DSK_TYPE_AHCI]   = NULL,
+#endif
+#ifdef VBOX_WITH_SCSI
+    [DSK_TYPE_SCSI]   = NULL,
+#endif
+};
+
+
 // ---------------------------------------------------------------------------
 // Start of El-Torito boot functions
@@ -474 +489 @@
     switch (GET_AH()) {
 
+    case 0x00: /* disk controller reset */
+        if (pktacc[bios_dsk->devices[device].type])
+        {
+            status = softrst[bios_dsk->devices[device].type](device);
+        }
+        goto int13_success;
+        break;
     // all those functions return SUCCESS
-    case 0x00: /* disk controller reset */
     case 0x09: /* initialize drive parameters */
     case 0x0c: /* seek to specified cylinder */