X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fata.h;h=423679e6c5996b41cf2cde8281bf8efc9f2f476c;hb=65286d916b384837567b0da69b4d5a77f190fdc0;hp=721f2f499e10576dcbca1f39d9c0aa2bbb4f9bb4;hpb=d0886c953a9e5969ee0f54f11bb146bfe888bfe3;p=palacios.git diff --git a/palacios/src/devices/ata.h b/palacios/src/devices/ata.h index 721f2f4..423679e 100644 --- a/palacios/src/devices/ata.h +++ b/palacios/src/devices/ata.h @@ -43,8 +43,8 @@ static void ata_identify_device(struct ide_drive * drive) { // Make it the simplest drive possible (1 head, 1 cyl, 1 sect/track) drive_id->num_cylinders = drive->num_cylinders; drive_id->num_heads = drive->num_heads; - drive_id->bytes_per_track = drive->num_sectors * IDE_SECTOR_SIZE; - drive_id->bytes_per_sector = IDE_SECTOR_SIZE; + drive_id->bytes_per_track = drive->num_sectors * HD_SECTOR_SIZE; + drive_id->bytes_per_sector = HD_SECTOR_SIZE; drive_id->sectors_per_track = drive->num_sectors; @@ -64,10 +64,10 @@ static void ata_identify_device(struct ide_drive * drive) { drive_id->lba_enable = 1; // Drive Capacity (28 bit LBA) - drive_id->lba_capacity = drive->hd_ops->get_capacity(drive->private_data); + drive_id->lba_capacity = drive->ops->get_capacity(drive->private_data) / HD_SECTOR_SIZE; // Drive Capacity (48 bit LBA) - drive_id->lba_capacity_2 = drive->hd_ops->get_capacity(drive->private_data); + drive_id->lba_capacity_2 = drive->ops->get_capacity(drive->private_data) / HD_SECTOR_SIZE; // lower byte is the maximum multiple sector size... @@ -106,7 +106,7 @@ static void ata_identify_device(struct ide_drive * drive) { } -static int ata_read(struct vm_device * dev, struct ide_channel * channel, uint8_t * dst, uint_t sect_cnt) { +static int ata_read(struct ide_internal * ide, struct ide_channel * channel, uint8_t * dst, uint_t sect_cnt) { struct ide_drive * drive = get_selected_drive(channel); if (drive->hd_state.accessed == 0) { @@ -116,7 +116,7 @@ static int ata_read(struct vm_device * dev, struct ide_channel * channel, uint8_ PrintDebug("Reading Drive LBA=%d (count=%d)\n", (uint32_t)(drive->current_lba), sect_cnt); - int ret = drive->hd_ops->read(dst, sect_cnt, drive->current_lba, drive->private_data); + int ret = drive->ops->read(dst, drive->current_lba * HD_SECTOR_SIZE, sect_cnt * HD_SECTOR_SIZE, drive->private_data); if (ret == -1) { PrintError("IDE: Error reading HD block (LBA=%p)\n", (void *)(addr_t)(drive->current_lba)); @@ -124,12 +124,30 @@ static int ata_read(struct vm_device * dev, struct ide_channel * channel, uint8_ } return 0; + + + } +static int ata_write(struct ide_internal * ide, struct ide_channel * channel, uint8_t * src, uint_t sect_cnt) { + struct ide_drive * drive = get_selected_drive(channel); + + PrintDebug("Writing Drive LBA=%d (count=%d)\n", (uint32_t)(drive->current_lba), sect_cnt); + + int ret = drive->ops->write(src, drive->current_lba * HD_SECTOR_SIZE, sect_cnt * HD_SECTOR_SIZE, drive->private_data); + + if (ret == -1) { + PrintError("IDE: Error writing HD block (LBA=%p)\n", (void *)(addr_t)(drive->current_lba)); + return -1; + } + + return 0; +} + -static int ata_get_lba(struct vm_device * dev, struct ide_channel * channel, uint64_t * lba) { +static int ata_get_lba(struct ide_internal * ide, struct ide_channel * channel, uint64_t * lba) { struct ide_drive * drive = get_selected_drive(channel); // The if the sector count == 0 then read 256 sectors (cast up to handle that value) uint32_t sect_cnt = (drive->sector_count == 0) ? 256 : drive->sector_count; @@ -152,12 +170,12 @@ static int ata_get_lba(struct vm_device * dev, struct ide_channel * channel, uin lba_addr.buf[3] = channel->drive_head.lba3; - if (lba_addr.addr + (sect_cnt * IDE_SECTOR_SIZE) > - drive->hd_ops->get_capacity(drive->private_data)) { + if ((lba_addr.addr + sect_cnt) > + drive->ops->get_capacity(drive->private_data) / HD_SECTOR_SIZE) { PrintError("IDE: request size exceeds disk capacity (lba=%d) (sect_cnt=%d) (ReadEnd=%d) (capacity=%p)\n", lba_addr.addr, sect_cnt, - lba_addr.addr + (sect_cnt * IDE_SECTOR_SIZE), - (void *)(addr_t)(drive->hd_ops->get_capacity(drive->private_data))); + lba_addr.addr + (sect_cnt * HD_SECTOR_SIZE), + (void *)(addr_t)(drive->ops->get_capacity(drive->private_data))); return -1; } @@ -167,23 +185,23 @@ static int ata_get_lba(struct vm_device * dev, struct ide_channel * channel, uin // 28 bit LBA -static int ata_read_sectors(struct vm_device * dev, struct ide_channel * channel) { +static int ata_read_sectors(struct ide_internal * ide, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); // The if the sector count == 0 then read 256 sectors (cast up to handle that value) uint32_t sect_cnt = (drive->sector_count == 0) ? 256 : drive->sector_count; - if (ata_get_lba(dev, channel, &(drive->current_lba)) == -1) { - ide_abort_command(dev, channel); + if (ata_get_lba(ide, channel, &(drive->current_lba)) == -1) { + ide_abort_command(ide, channel); return 0; } - if (ata_read(dev, channel, drive->data_buf, 1) == -1) { + if (ata_read(ide, channel, drive->data_buf, 1) == -1) { PrintError("Could not read disk sector\n"); return -1; } - drive->transfer_length = sect_cnt * IDE_SECTOR_SIZE; + drive->transfer_length = sect_cnt * HD_SECTOR_SIZE; drive->transfer_index = 0; channel->status.busy = 0; @@ -197,7 +215,7 @@ static int ata_read_sectors(struct vm_device * dev, struct ide_channel * channel drive->irq_flags.rel = 0; - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); PrintDebug("Returning from read sectors\n"); @@ -206,7 +224,7 @@ static int ata_read_sectors(struct vm_device * dev, struct ide_channel * channel // 48 bit LBA -static int ata_read_sectors_ext(struct vm_device * dev, struct ide_channel * channel) { +static int ata_read_sectors_ext(struct ide_internal * ide, struct ide_channel * channel) { //struct ide_drive * drive = get_selected_drive(channel); // The if the sector count == 0 then read 256 sectors (cast up to handle that value) //uint32_t sector_count = (drive->sector_count == 0) ? 256 : drive->sector_count;