Merge branch 'devel' into ide

[palacios.git] / palacios / src / devices / ramdisk.c

diff --git a/palacios/src/devices/ramdisk.c b/palacios/src/devices/ramdisk.c
index 6c18c31..04602f7 100644 (file)
--- a/palacios/src/devices/ramdisk.c
+++ b/palacios/src/devices/ramdisk.c
@@ -498,15 +498,13 @@ static int read_data_port(ushort_t port, void * dst, uint_t length, struct vm_de
        case 0xec:    // IDENTIFY DEVICE
        case 0xa1:
            {
-
-
                controller->status.busy = 0;
                controller->status.drive_ready = 1;
                controller->status.write_fault = 0;
                controller->status.seek_complete = 1;
                controller->status.corrected_data = 0;
                controller->status.err = 0;
-      
+               
                /*
                  value32 = controller->buffer[index];
                  index++;
@@ -531,7 +529,7 @@ static int read_data_port(ushort_t port, void * dst, uint_t length, struct vm_de
                if (controller->buffer_index >= 512) {
                    controller->status.drq = 0;
                }
-      
+               
                return length;
            }
        case 0xa0: //send packet cmd 
@@ -2239,14 +2237,6 @@ void rd_identify_ATAPI_drive(struct vm_device * dev, struct channel_t * channel)
        drive->id_drive[i] = 0;
     }
 
-    // now convert the id_drive array (native 256 word format) to
-    // the controller buffer (512 bytes)
-    Bit16u temp16;
-    for (i = 0; i <= 255; i++) {
-       temp16 = drive->id_drive[i];
-       controller->buffer[i * 2] = temp16 & 0x00ff;
-       controller->buffer[i * 2 + 1] = temp16 >> 8;
-    }
 
     return;
 }