X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=4dd5db63d95c23683ab5ef7f4802244120facb12;hb=4a8f339db9b852ccd1d4d785906ef71b6b848350;hp=e11944f42d984c54f1f8881e58b3277fad26ce0c;hpb=61597ea2c5ccace036d8a65e429e32b8f8a7ed4a;p=palacios.git diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index e11944f..4dd5db6 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -18,15 +18,15 @@ */ #include +#include #include #include #include #include -#include #include "ide-types.h" #include "atapi-types.h" -#ifndef CONFIG_DEBUG_IDE +#ifndef V3_CONFIG_DEBUG_IDE #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -63,6 +63,10 @@ #define DATA_BUFFER_SIZE 2048 +#define ATAPI_BLOCK_SIZE 2048 +#define HD_SECTOR_SIZE 512 + + static const char * ide_pri_port_strs[] = {"PRI_DATA", "PRI_FEATURES", "PRI_SECT_CNT", "PRI_SECT_NUM", "PRI_CYL_LOW", "PRI_CYL_HIGH", "PRI_DRV_SEL", "PRI_CMD", "PRI_CTRL", "PRI_ADDR_REG"}; @@ -76,6 +80,7 @@ static const char * ide_dma_port_strs[] = {"DMA_CMD", NULL, "DMA_STATUS", NULL, "DMA_PRD0", "DMA_PRD1", "DMA_PRD2", "DMA_PRD3"}; +typedef enum {BLOCK_NONE, BLOCK_DISK, BLOCK_CDROM} v3_block_type_t; static inline const char * io_port_to_str(uint16_t port) { if ((port >= PRI_DATA_PORT) && (port <= PRI_CMD_PORT)) { @@ -105,16 +110,16 @@ struct ide_cd_state { }; struct ide_hd_state { - int accessed; + uint32_t accessed; /* this is the multiple sector transfer size as configured for read/write multiple sectors*/ - uint_t mult_sector_num; + uint32_t mult_sector_num; /* This is the current op sector size: * for multiple sector ops this equals mult_sector_num * for standard ops this equals 1 */ - uint_t cur_sector_num; + uint32_t cur_sector_num; }; struct ide_drive { @@ -122,11 +127,7 @@ struct ide_drive { v3_block_type_t drive_type; - union { - struct v3_cd_ops * cd_ops; - struct v3_hd_ops * hd_ops; - }; - + struct v3_dev_blk_ops * ops; union { struct ide_cd_state cd_state; @@ -136,11 +137,11 @@ struct ide_drive { char model[41]; // Where we are in the data transfer - uint_t transfer_index; + uint32_t transfer_index; // the length of a transfer // calculated for easy access - uint_t transfer_length; + uint32_t transfer_length; uint64_t current_lba; @@ -205,10 +206,18 @@ struct ide_channel { // Control Registers struct ide_ctrl_reg ctrl_reg; // [write] 0x3f6,0x376 - struct ide_dma_cmd_reg dma_cmd; - struct ide_dma_status_reg dma_status; - uint32_t dma_prd_addr; - uint_t dma_tbl_index; + union { + uint8_t dma_ports[8]; + struct { + struct ide_dma_cmd_reg dma_cmd; + uint8_t rsvd1; + struct ide_dma_status_reg dma_status; + uint8_t rsvd2; + uint32_t dma_prd_addr; + } __attribute__((packed)); + } __attribute__((packed)); + + uint32_t dma_tbl_index; }; @@ -220,6 +229,8 @@ struct ide_internal { struct vm_device * pci_bus; struct pci_device * ide_pci; + + struct v3_vm_info * vm; }; @@ -278,11 +289,15 @@ static inline int is_lba_enabled(struct ide_channel * channel) { /* Drive Commands */ -static void ide_raise_irq(struct vm_device * dev, struct ide_channel * channel) { +static void ide_raise_irq(struct ide_internal * ide, struct ide_channel * channel) { if (channel->ctrl_reg.irq_disable == 0) { - PrintDebug("Raising IDE Interrupt %d\n", channel->irq); - channel->dma_status.int_gen = 1; - v3_raise_irq(dev->vm, channel->irq); + + PrintDebug(ide->vm,VCORE_NONE, "Raising IDE Interrupt %d\n", channel->irq); + + channel->dma_status.int_gen = 1; + v3_raise_irq(ide->vm, channel->irq); + } else { + PrintDebug(ide->vm,VCORE_NONE, "IDE Interrupt %d cannot be raised as irq is disabled on channel\n",channel->irq); } } @@ -291,7 +306,7 @@ static void drive_reset(struct ide_drive * drive) { drive->sector_count = 0x01; drive->sector_num = 0x01; - PrintDebug("Resetting drive %s\n", drive->model); + PrintDebug(VM_NONE,VCORE_NONE, "Resetting drive %s\n", drive->model); if (drive->drive_type == BLOCK_CDROM) { drive->cylinder = 0xeb14; @@ -334,16 +349,16 @@ static void channel_reset_complete(struct ide_channel * channel) { } -static void ide_abort_command(struct vm_device * dev, struct ide_channel * channel) { +static void ide_abort_command(struct ide_internal * ide, struct ide_channel * channel) { channel->status.val = 0x41; // Error + ready channel->error_reg.val = 0x04; // No idea... - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); } -static int dma_read(struct vm_device * dev, struct ide_channel * channel); -static int dma_write(struct vm_device * dev, struct ide_channel * channel); +static int dma_read(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel); +static int dma_write(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel); /* ATAPI functions */ @@ -353,26 +368,28 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel); #include "ata.h" -#ifdef CONFIG_DEBUG_IDE -static void print_prd_table(struct vm_device * dev, struct ide_channel * channel) { + +static void print_prd_table(struct ide_internal * ide, struct ide_channel * channel) { struct ide_dma_prd prd_entry; int index = 0; - PrintDebug("Dumping PRD table\n"); + V3_Print(VM_NONE, VCORE_NONE,"Dumping PRD table\n"); while (1) { uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * index); int ret; - ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); + ret = v3_read_gpa_memory(&(ide->vm->cores[0]), prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); if (ret != sizeof(struct ide_dma_prd)) { - PrintError("Could not read PRD\n"); + PrintError(VM_NONE, VCORE_NONE, "Could not read PRD\n"); return; } - PrintDebug("\tPRD Addr: %x, PRD Len: %d, EOT: %d\n", - prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table); + V3_Print(VM_NONE, VCORE_NONE,"\tPRD Addr: %x, PRD Len: %d, EOT: %d\n", + prd_entry.base_addr, + (prd_entry.size == 0) ? 0x10000 : prd_entry.size, + prd_entry.end_of_table); if (prd_entry.end_of_table) { break; @@ -383,23 +400,23 @@ static void print_prd_table(struct vm_device * dev, struct ide_channel * channel return; } -#endif + /* IO Operations */ -static int dma_read(struct vm_device * dev, struct ide_channel * channel) { +static int dma_read(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); // This is at top level scope to do the EOT test at the end - struct ide_dma_prd prd_entry; + struct ide_dma_prd prd_entry = {}; uint_t bytes_left = drive->transfer_length; // Read in the data buffer.... // Read a sector/block at a time until the prd entry is full. -#ifdef CONFIG_DEBUG_IDE - print_prd_table(dev, channel); +#ifdef V3_CONFIG_DEBUG_IDE + print_prd_table(ide, channel); #endif - PrintDebug("DMA read for %d bytes\n", bytes_left); + PrintDebug(core->vm_info, core, "DMA read for %d bytes\n", bytes_left); // Loop through the disk data while (bytes_left > 0) { @@ -408,21 +425,26 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { uint_t prd_offset = 0; int ret; - PrintDebug("PRD table address = %x\n", channel->dma_prd_addr); + PrintDebug(core->vm_info, core, "PRD table address = %x\n", channel->dma_prd_addr); - ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); + ret = v3_read_gpa_memory(core, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); if (ret != sizeof(struct ide_dma_prd)) { - PrintError("Could not read PRD\n"); + PrintError(core->vm_info, core, "Could not read PRD\n"); return -1; } - PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n", + PrintDebug(core->vm_info, core, "PRD Addr: %x, PRD Len: %d, EOT: %d\n", prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table); // loop through the PRD data.... - prd_bytes_left = prd_entry.size; + if (prd_entry.size == 0) { + // a size of 0 means 64k + prd_bytes_left = 0x10000; + } else { + prd_bytes_left = prd_entry.size; + } while (prd_bytes_left > 0) { @@ -432,40 +454,70 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { bytes_to_write = (prd_bytes_left > HD_SECTOR_SIZE) ? HD_SECTOR_SIZE : prd_bytes_left; - if (ata_read(dev, channel, drive->data_buf, 1) == -1) { - PrintError("Failed to read next disk sector\n"); + if (ata_read(ide, channel, drive->data_buf, 1) == -1) { + PrintError(core->vm_info, core, "Failed to read next disk sector\n"); return -1; } } else if (drive->drive_type == BLOCK_CDROM) { if (atapi_cmd_is_data_op(drive->cd_state.atapi_cmd)) { bytes_to_write = (prd_bytes_left > ATAPI_BLOCK_SIZE) ? ATAPI_BLOCK_SIZE : prd_bytes_left; - if (atapi_read_chunk(dev, channel) == -1) { - PrintError("Failed to read next disk sector\n"); + if (atapi_read_chunk(ide, channel) == -1) { + PrintError(core->vm_info, core, "Failed to read next disk sector\n"); return -1; } } else { - PrintDebug("DMA of command packet\n"); - PrintError("How does this work???\n"); + /* + PrintError(core->vm_info, core, "How does this work (ATAPI CMD=%x)???\n", drive->cd_state.atapi_cmd); return -1; + */ + int cmd_ret = 0; + + //V3_Print(core->vm_info, core, "DMA of command packet\n"); + bytes_to_write = (prd_bytes_left > bytes_left) ? bytes_left : prd_bytes_left; prd_bytes_left = bytes_to_write; + + + // V3_Print(core->vm_info, core, "Writing ATAPI cmd OP DMA (cmd=%x) (len=%d)\n", drive->cd_state.atapi_cmd, prd_bytes_left); + cmd_ret = v3_write_gpa_memory(core, prd_entry.base_addr + prd_offset, + bytes_to_write, drive->data_buf); + + // check cmd_ret + + + bytes_to_write = 0; + prd_bytes_left = 0; + drive->transfer_index += bytes_to_write; + + channel->status.busy = 0; + channel->status.ready = 1; + channel->status.data_req = 0; + channel->status.error = 0; + channel->status.seek_complete = 1; + + channel->dma_status.active = 0; + channel->dma_status.err = 0; + + ide_raise_irq(ide, channel); + + return 0; } } - PrintDebug("Writing DMA data to guest Memory ptr=%p, len=%d\n", + PrintDebug(core->vm_info, core, "Writing DMA data to guest Memory ptr=%p, len=%d\n", (void *)(addr_t)(prd_entry.base_addr + prd_offset), bytes_to_write); drive->current_lba++; - ret = write_guest_pa_memory(dev->vm, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); + ret = v3_write_gpa_memory(core, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); if (ret != bytes_to_write) { - PrintError("Failed to copy data into guest memory... (ret=%d)\n", ret); + PrintError(core->vm_info, core, "Failed to copy data into guest memory... (ret=%d)\n", ret); return -1; } - PrintDebug("\t DMA ret=%d, (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left); + PrintDebug(core->vm_info, core, "\t DMA ret=%d, (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left); drive->transfer_index += ret; prd_bytes_left -= ret; @@ -477,14 +529,14 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { if (drive->drive_type == BLOCK_DISK) { if (drive->transfer_index % HD_SECTOR_SIZE) { - PrintError("We currently don't handle sectors that span PRD descriptors\n"); + PrintError(core->vm_info, core, "We currently don't handle sectors that span PRD descriptors\n"); return -1; } } else if (drive->drive_type == BLOCK_CDROM) { if (atapi_cmd_is_data_op(drive->cd_state.atapi_cmd)) { if (drive->transfer_index % ATAPI_BLOCK_SIZE) { - PrintError("We currently don't handle ATAPI BLOCKS that span PRD descriptors\n"); - PrintError("transfer_index=%d, transfer_length=%d\n", + PrintError(core->vm_info, core, "We currently don't handle ATAPI BLOCKS that span PRD descriptors\n"); + PrintError(core->vm_info, core, "transfer_index=%d, transfer_length=%d\n", drive->transfer_index, drive->transfer_length); return -1; } @@ -493,7 +545,7 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { if ((prd_entry.end_of_table == 1) && (bytes_left > 0)) { - PrintError("DMA table not large enough for data transfer...\n"); + PrintError(core->vm_info, core, "DMA table not large enough for data transfer...\n"); return -1; } } @@ -520,20 +572,20 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { channel->dma_status.err = 0; } - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); return 0; } -static int dma_write(struct vm_device * dev, struct ide_channel * channel) { +static int dma_write(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); // This is at top level scope to do the EOT test at the end - struct ide_dma_prd prd_entry; + struct ide_dma_prd prd_entry = {}; uint_t bytes_left = drive->transfer_length; - PrintDebug("DMA write from %d bytes\n", bytes_left); + PrintDebug(core->vm_info, core, "DMA write from %d bytes\n", bytes_left); // Loop through disk data while (bytes_left > 0) { @@ -542,19 +594,25 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel) { uint_t prd_offset = 0; int ret; - PrintDebug("PRD Table address = %x\n", channel->dma_prd_addr); + PrintDebug(core->vm_info, core, "PRD Table address = %x\n", channel->dma_prd_addr); - ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); + ret = v3_read_gpa_memory(core, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); if (ret != sizeof(struct ide_dma_prd)) { - PrintError("Could not read PRD\n"); + PrintError(core->vm_info, core, "Could not read PRD\n"); return -1; } - PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n", + PrintDebug(core->vm_info, core, "PRD Addr: %x, PRD Len: %d, EOT: %d\n", prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table); - prd_bytes_left = prd_entry.size; + + if (prd_entry.size == 0) { + // a size of 0 means 64k + prd_bytes_left = 0x10000; + } else { + prd_bytes_left = prd_entry.size; + } while (prd_bytes_left > 0) { uint_t bytes_to_write = 0; @@ -563,18 +621,18 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel) { bytes_to_write = (prd_bytes_left > HD_SECTOR_SIZE) ? HD_SECTOR_SIZE : prd_bytes_left; - ret = read_guest_pa_memory(dev->vm, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); + ret = v3_read_gpa_memory(core, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); if (ret != bytes_to_write) { - PrintError("Faild to copy data from guest memory... (ret=%d)\n", ret); + PrintError(core->vm_info, core, "Faild to copy data from guest memory... (ret=%d)\n", ret); return -1; } - PrintDebug("\t DMA ret=%d (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left); + PrintDebug(core->vm_info, core, "\t DMA ret=%d (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left); - if (ata_write(dev, channel, drive->data_buf, 1) == -1) { - PrintError("Failed to write data to disk\n"); + if (ata_write(ide, channel, drive->data_buf, 1) == -1) { + PrintError(core->vm_info, core, "Failed to write data to disk\n"); return -1; } @@ -589,12 +647,18 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel) { channel->dma_tbl_index++; if (drive->transfer_index % HD_SECTOR_SIZE) { - PrintError("We currently don't handle sectors that span PRD descriptors\n"); + PrintError(core->vm_info, core, "We currently don't handle sectors that span PRD descriptors\n"); return -1; } if ((prd_entry.end_of_table == 1) && (bytes_left > 0)) { - PrintError("DMA table not large enough for data transfer...\n"); + PrintError(core->vm_info, core, "DMA table not large enough for data transfer...\n"); + PrintError(core->vm_info, core, "\t(bytes_left=%u) (transfer_length=%u)...\n", + bytes_left, drive->transfer_length); + PrintError(core->vm_info, core, "PRD Addr: %x, PRD Len: %d, EOT: %d\n", + prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table); + + print_prd_table(ide, channel); return -1; } } @@ -610,7 +674,7 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel) { channel->dma_status.err = 0; } - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); return 0; } @@ -626,13 +690,13 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel) { #define DMA_CHANNEL_FLAG 0x08 -static int write_dma_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct ide_internal * ide = (struct ide_internal *)(dev->private_data); +static int write_dma_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * private_data) { + struct ide_internal * ide = (struct ide_internal *)private_data; uint16_t port_offset = port & (DMA_CHANNEL_FLAG - 1); uint_t channel_flag = (port & DMA_CHANNEL_FLAG) >> 3; struct ide_channel * channel = &(ide->channels[channel_flag]); - PrintDebug("IDE: Writing DMA Port %x (%s) (val=%x) (len=%d) (channel=%d)\n", + PrintDebug(core->vm_info, core, "IDE: Writing DMA Port %x (%s) (val=%x) (len=%d) (channel=%d)\n", port, dma_port_to_str(port_offset), *(uint32_t *)src, length, channel_flag); switch (port_offset) { @@ -646,14 +710,14 @@ static int write_dma_port(ushort_t port, void * src, uint_t length, struct vm_de if (channel->dma_cmd.read == 1) { // DMA Read - if (dma_read(dev, channel) == -1) { - PrintError("Failed DMA Read\n"); + if (dma_read(core, ide, channel) == -1) { + PrintError(core->vm_info, core, "Failed DMA Read\n"); return -1; } } else { // DMA write - if (dma_write(dev, channel) == -1) { - PrintError("Failed DMA Write\n"); + if (dma_write(core, ide, channel) == -1) { + PrintError(core->vm_info, core, "Failed DMA Write\n"); return -1; } } @@ -667,7 +731,7 @@ static int write_dma_port(ushort_t port, void * src, uint_t length, struct vm_de uint8_t val = *(uint8_t *)src; if (length != 1) { - PrintError("Invalid read length for DMA status port\n"); + PrintError(core->vm_info, core, "Invalid read length for DMA status port\n"); return -1; } @@ -687,7 +751,7 @@ static int write_dma_port(ushort_t port, void * src, uint_t length, struct vm_de int i = 0; if (addr_index + length > 4) { - PrintError("DMA Port space overrun port=%x len=%d\n", port_offset, length); + PrintError(core->vm_info, core, "DMA Port space overrun port=%x len=%d\n", port_offset, length); return -1; } @@ -695,94 +759,63 @@ static int write_dma_port(ushort_t port, void * src, uint_t length, struct vm_de addr_buf[addr_index + i] = *((uint8_t *)src + i); } - PrintDebug("Writing PRD Port %x (val=%x)\n", port_offset, channel->dma_prd_addr); + PrintDebug(core->vm_info, core, "Writing PRD Port %x (val=%x)\n", port_offset, channel->dma_prd_addr); break; } default: - PrintError("IDE: Invalid DMA Port (%s)\n", dma_port_to_str(port_offset)); - return -1; + PrintError(core->vm_info, core, "IDE: Invalid DMA Port (%d) (%s)\n", port, dma_port_to_str(port_offset)); + break; } return length; } -static int read_dma_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { - struct ide_internal * ide = (struct ide_internal *)(dev->private_data); +static int read_dma_port(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * private_data) { + struct ide_internal * ide = (struct ide_internal *)private_data; uint16_t port_offset = port & (DMA_CHANNEL_FLAG - 1); uint_t channel_flag = (port & DMA_CHANNEL_FLAG) >> 3; struct ide_channel * channel = &(ide->channels[channel_flag]); - PrintDebug("Reading DMA port %d (%x) (channel=%d)\n", port, port, channel_flag); - - switch (port_offset) { - case DMA_CMD_PORT: - *(uint8_t *)dst = channel->dma_cmd.val; - break; - - case DMA_STATUS_PORT: - if (length != 1) { - PrintError("Invalid read length for DMA status port\n"); - return -1; - } + PrintDebug(core->vm_info, core, "Reading DMA port %d (%x) (channel=%d)\n", port, port, channel_flag); - *(uint8_t *)dst = channel->dma_status.val; - break; - - case DMA_PRD_PORT0: - case DMA_PRD_PORT1: - case DMA_PRD_PORT2: - case DMA_PRD_PORT3: { - uint_t addr_index = port_offset & 0x3; - uint8_t * addr_buf = (uint8_t *)&(channel->dma_prd_addr); - int i = 0; - - if (addr_index + length > 4) { - PrintError("DMA Port space overrun port=%x len=%d\n", port_offset, length); - return -1; - } - - for (i = 0; i < length; i++) { - *((uint8_t *)dst + i) = addr_buf[addr_index + i]; - } - - break; - } - default: - PrintError("IDE: Invalid DMA Port (%s)\n", dma_port_to_str(port_offset)); - return -1; + if (port_offset + length > 16) { + PrintError(core->vm_info, core, "DMA Port Read: Port overrun (port_offset=%d, length=%d)\n", port_offset, length); + return -1; } - PrintDebug("\tval=%x (len=%d)\n", *(uint32_t *)dst, length); + memcpy(dst, channel->dma_ports + port_offset, length); + + PrintDebug(core->vm_info, core, "\tval=%x (len=%d)\n", *(uint32_t *)dst, length); return length; } -static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct ide_internal * ide = (struct ide_internal *)(dev->private_data); +static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct ide_internal * ide = priv_data; struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); if (length != 1) { - PrintError("Invalid Write Length on IDE command Port %x\n", port); + PrintError(core->vm_info, core, "Invalid Write Length on IDE command Port %x\n", port); return -1; } - PrintDebug("IDE: Writing Command Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src); + PrintDebug(core->vm_info, core, "IDE: Writing Command Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src); channel->cmd_reg = *(uint8_t *)src; switch (channel->cmd_reg) { - case 0xa1: // ATAPI Identify Device Packet + case ATAPI_PIDENTIFY: // ATAPI Identify Device Packet if (drive->drive_type != BLOCK_CDROM) { drive_reset(drive); // JRL: Should we abort here? - ide_abort_command(dev, channel); + ide_abort_command(ide, channel); } else { atapi_identify_device(drive); @@ -790,28 +823,28 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de channel->error_reg.val = 0; channel->status.val = 0x58; // ready, data_req, seek_complete - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); } break; - case 0xec: // Identify Device + case ATAPI_IDENTIFY: // Identify Device if (drive->drive_type != BLOCK_DISK) { drive_reset(drive); // JRL: Should we abort here? - ide_abort_command(dev, channel); + ide_abort_command(ide, channel); } else { ata_identify_device(drive); channel->error_reg.val = 0; channel->status.val = 0x58; - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); } break; - case 0xa0: // ATAPI Command Packet + case ATAPI_PACKETCMD: // ATAPI Command Packet if (drive->drive_type != BLOCK_CDROM) { - ide_abort_command(dev, channel); + ide_abort_command(ide, channel); } drive->sector_count = 1; @@ -821,37 +854,49 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de channel->status.data_req = 1; channel->status.error = 0; - // reset the data buffer... + // reset the datxgoto-la buffer... drive->transfer_length = ATAPI_PACKET_SIZE; drive->transfer_index = 0; break; - case 0x20: // Read Sectors with Retry - case 0x21: // Read Sectors without Retry + case ATAPI_READ: // Read Sectors with Retry + case ATAPI_READ_ONCE: // Read Sectors without Retry drive->hd_state.cur_sector_num = 1; - if (ata_read_sectors(dev, channel) == -1) { - PrintError("Error reading sectors\n"); + if (ata_read_sectors(ide, channel) == -1) { + PrintError(core->vm_info, core, "Error reading sectors\n"); return -1; } break; - case 0x24: // Read Sectors Extended + case ATAPI_READ_EXT: // Read Sectors Extended drive->hd_state.cur_sector_num = 1; - if (ata_read_sectors_ext(dev, channel) == -1) { - PrintError("Error reading extended sectors\n"); + if (ata_read_sectors_ext(ide, channel) == -1) { + PrintError(core->vm_info, core, "Error reading extended sectors\n"); return -1; } break; - case 0xc8: // Read DMA with retry - case 0xc9: { // Read DMA + case ATAPI_WRITE: {// Write Sector + drive->hd_state.cur_sector_num = 1; + + if (ata_write_sectors(ide, channel) == -1) { + PrintError(core->vm_info, core, "Error writing sectors\n"); + return -1; + } + break; + } + + + + case ATAPI_READDMA: // Read DMA with retry + case ATAPI_READDMA_ONCE: { // Read DMA 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; } @@ -862,19 +907,19 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de if (channel->dma_status.active == 1) { // DMA Read - if (dma_read(dev, channel) == -1) { - PrintError("Failed DMA Read\n"); + if (dma_read(core, ide, channel) == -1) { + PrintError(core->vm_info, core, "Failed DMA Read\n"); return -1; } } break; } - case 0xca: { // Write DMA + case ATAPI_WRITEDMA: { // Write DMA 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; } @@ -885,29 +930,29 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de if (channel->dma_status.active == 1) { // DMA Write - if (dma_write(dev, channel) == -1) { - PrintError("Failed DMA Write\n"); + if (dma_write(core, ide, channel) == -1) { + PrintError(core->vm_info, core, "Failed DMA Write\n"); return -1; } } break; } - case 0xe0: // Standby Now 1 - case 0xe1: // Set Idle Immediate - case 0xe2: // Standby - case 0xe3: // Set Idle 1 - case 0xe6: // Sleep Now 1 - case 0x94: // Standby Now 2 - case 0x95: // Idle Immediate (CFA) - case 0x96: // Standby 2 - case 0x97: // Set idle 2 - case 0x99: // Sleep Now 2 + case ATAPI_STANDBYNOW1: // Standby Now 1 + case ATAPI_IDLEIMMEDIATE: // Set Idle Immediate + case ATAPI_STANDBY: // Standby + case ATAPI_SETIDLE1: // Set Idle 1 + case ATAPI_SLEEPNOW1: // Sleep Now 1 + case ATAPI_STANDBYNOW2: // Standby Now 2 + case ATAPI_IDLEIMMEDIATE2: // Idle Immediate (CFA) + case ATAPI_STANDBY2: // Standby 2 + case ATAPI_SETIDLE2: // Set idle 2 + case ATAPI_SLEEPNOW2: // Sleep Now 2 channel->status.val = 0; channel->status.ready = 1; - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); break; - case 0xef: // Set Features + case ATAPI_SETFEATURES: // Set Features // Prior to this the features register has been written to. // This command tells the drive to check if the new value is supported (the value is drive specific) // Common is that bit0=DMA enable @@ -921,22 +966,22 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de channel->status.ready = 1; channel->status.seek_complete = 1; - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); break; - case 0x91: // Initialize Drive Parameters - case 0x10: // recalibrate? + case ATAPI_SPECIFY: // Initialize Drive Parameters + case ATAPI_RECAL: // recalibrate? channel->status.error = 0; channel->status.ready = 1; channel->status.seek_complete = 1; - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); break; - case 0xc6: { // Set multiple mode (IDE Block mode) + case ATAPI_SETMULT: { // Set multiple mode (IDE Block mode) // This makes the drive transfer multiple sectors before generating an interrupt uint32_t tmp_sect_num = drive->sector_num; // GCC SUCKS if (tmp_sect_num > MAX_MULT_SECTORS) { - ide_abort_command(dev, channel); + ide_abort_command(ide, channel); break; } @@ -949,14 +994,34 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de channel->status.ready = 1; channel->status.error = 0; - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); break; } - case 0xc4: // read multiple sectors + + case ATAPI_DEVICE_RESET: // Reset Device + drive_reset(drive); + channel->error_reg.val = 0x01; + channel->status.busy = 0; + channel->status.ready = 1; + channel->status.seek_complete = 1; + channel->status.write_fault = 0; + channel->status.error = 0; + break; + + case ATAPI_CHECKPOWERMODE1: // Check power mode + drive->sector_count = 0xff; /* 0x00=standby, 0x80=idle, 0xff=active or idle */ + channel->status.busy = 0; + channel->status.ready = 1; + channel->status.write_fault = 0; + channel->status.data_req = 0; + channel->status.error = 0; + break; + + case ATAPI_MULTREAD: // read multiple sectors drive->hd_state.cur_sector_num = drive->hd_state.mult_sector_num; default: - PrintError("Unimplemented IDE command (%x)\n", channel->cmd_reg); + PrintError(core->vm_info, core, "Unimplemented IDE command (%x)\n", channel->cmd_reg); return -1; } @@ -964,48 +1029,63 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de } -static int write_data_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct ide_internal * ide = (struct ide_internal *)(dev->private_data); +static int write_data_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct ide_internal * ide = priv_data; struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); - // PrintDebug("IDE: Writing Data Port %x (val=%x, len=%d)\n", - // port, *(uint32_t *)src, length); - + PrintDebug(core->vm_info, core, "IDE: Writing Data Port %x (val=%x, len=%d)\n", + port, *(uint32_t *)src, length); + memcpy(drive->data_buf + drive->transfer_index, src, length); drive->transfer_index += length; // Transfer is complete, dispatch the command if (drive->transfer_index >= drive->transfer_length) { - switch (channel->cmd_reg) { - case 0x30: // Write Sectors - PrintError("Writing Data not yet implemented\n"); - return -1; - - case 0xa0: // ATAPI packet command - if (atapi_handle_packet(dev, channel) == -1) { - PrintError("Error handling ATAPI packet\n"); - return -1; - } - break; - default: - PrintError("Unhandld IDE Command %x\n", channel->cmd_reg); - return -1; - } + switch (channel->cmd_reg) { + + case ATAPI_WRITE: // Write Sectors + + channel->status.busy = 1; + channel->status.data_req = 0; + + if (ata_write(ide, channel, drive->data_buf, drive->transfer_length/HD_SECTOR_SIZE) == -1) { + PrintError(core->vm_info, core, "Error writing to disk\n"); + return -1; + } + + PrintDebug(core->vm_info, core, "IDE: Write sectors complete\n"); + + channel->status.error = 0; + channel->status.busy = 0; + + ide_raise_irq(ide, channel); + break; + + case ATAPI_PACKETCMD: // ATAPI packet command + if (atapi_handle_packet(core, ide, channel) == -1) { + PrintError(core->vm_info, core, "Error handling ATAPI packet\n"); + return -1; + } + break; + default: + PrintError(core->vm_info, core, "Unhandld IDE Command %x\n", channel->cmd_reg); + return -1; + } } return length; } -static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) { +static int read_hd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); int data_offset = drive->transfer_index % HD_SECTOR_SIZE; if (drive->transfer_index >= drive->transfer_length) { - PrintError("Buffer overrun... (xfer_len=%d) (cur_idx=%x) (post_idx=%d)\n", + PrintError(VM_NONE, VCORE_NONE, "Buffer overrun... (xfer_len=%d) (cur_idx=%x) (post_idx=%d)\n", drive->transfer_length, drive->transfer_index, drive->transfer_index + length); return -1; @@ -1015,14 +1095,14 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st if ((data_offset == 0) && (drive->transfer_index > 0)) { drive->current_lba++; - if (ata_read(dev, channel, drive->data_buf, 1) == -1) { - PrintError("Could not read next disk sector\n"); + if (ata_read(ide, channel, drive->data_buf, 1) == -1) { + PrintError(VM_NONE, VCORE_NONE, "Could not read next disk sector\n"); return -1; } } /* - PrintDebug("Reading HD Data (Val=%x), (len=%d) (offset=%d)\n", + PrintDebug(VM_NONE, VCORE_NONE, "Reading HD Data (Val=%x), (len=%d) (offset=%d)\n", *(uint32_t *)(drive->data_buf + data_offset), length, data_offset); */ @@ -1041,12 +1121,12 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st (drive->transfer_index == drive->transfer_length)) { if (drive->transfer_index < drive->transfer_length) { // An increment is complete, but there is still more data to be transferred... - PrintDebug("Integral Complete, still transferring more sectors\n"); + PrintDebug(VM_NONE, VCORE_NONE, "Integral Complete, still transferring more sectors\n"); channel->status.data_req = 1; drive->irq_flags.c_d = 0; } else { - PrintDebug("Final Sector Transferred\n"); + PrintDebug(VM_NONE, VCORE_NONE, "Final Sector Transferred\n"); // This was the final read of the request channel->status.data_req = 0; @@ -1059,7 +1139,7 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st drive->irq_flags.io_dir = 1; channel->status.busy = 0; - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); } @@ -1068,17 +1148,20 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st -static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) { +static int read_cd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); int data_offset = drive->transfer_index % ATAPI_BLOCK_SIZE; - int req_offset = drive->transfer_index % drive->req_len; + // int req_offset = drive->transfer_index % drive->req_len; if (drive->cd_state.atapi_cmd != 0x28) { - PrintDebug("IDE: Reading CD Data (len=%d) (req_len=%d)\n", length, drive->req_len); + PrintDebug(VM_NONE, VCORE_NONE, "IDE: Reading CD Data (len=%d) (req_len=%d)\n", length, drive->req_len); + PrintDebug(VM_NONE, VCORE_NONE, "IDE: transfer len=%d, transfer idx=%d\n", drive->transfer_length, drive->transfer_index); } + + if (drive->transfer_index >= drive->transfer_length) { - PrintError("Buffer Overrun... (xfer_len=%d) (cur_idx=%d) (post_idx=%d)\n", + PrintError(VM_NONE, VCORE_NONE, "Buffer Overrun... (xfer_len=%d) (cur_idx=%d) (post_idx=%d)\n", drive->transfer_length, drive->transfer_index, drive->transfer_index + length); return -1; @@ -1086,8 +1169,8 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st if ((data_offset == 0) && (drive->transfer_index > 0)) { - if (atapi_update_data_buf(dev, channel) == -1) { - PrintError("Could not update CDROM data buffer\n"); + if (atapi_update_data_buf(ide, channel) == -1) { + PrintError(VM_NONE, VCORE_NONE, "Could not update CDROM data buffer\n"); return -1; } } @@ -1098,7 +1181,7 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st // Should the req_offset be recalculated here????? - if ((req_offset == 0) && (drive->transfer_index > 0)) { + if (/*(req_offset == 0) &&*/ (drive->transfer_index > 0)) { if (drive->transfer_index < drive->transfer_length) { // An increment is complete, but there is still more data to be transferred... @@ -1107,12 +1190,14 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st drive->irq_flags.c_d = 0; // Update the request length in the cylinder regs - if (atapi_update_req_len(dev, channel, drive->transfer_length - drive->transfer_index) == -1) { - PrintError("Could not update request length after completed increment\n"); + if (atapi_update_req_len(ide, channel, drive->transfer_length - drive->transfer_index) == -1) { + PrintError(VM_NONE, VCORE_NONE, "Could not update request length after completed increment\n"); return -1; } } else { // This was the final read of the request + + drive->req_len = 0; channel->status.data_req = 0; channel->status.ready = 1; @@ -1123,14 +1208,14 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st drive->irq_flags.io_dir = 1; channel->status.busy = 0; - ide_raise_irq(dev, channel); + ide_raise_irq(ide, channel); } return length; } -static int read_drive_id(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) { +static int read_drive_id( uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); channel->status.busy = 0; @@ -1152,26 +1237,26 @@ static int read_drive_id(uint8_t * dst, uint_t length, struct vm_device * dev, s } -static int ide_read_data_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { - struct ide_internal * ide = (struct ide_internal *)(dev->private_data); +static int ide_read_data_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) { + struct ide_internal * ide = priv_data; struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); - PrintDebug("IDE: Reading Data Port %x (len=%d)\n", port, length); + // PrintDebug(core->vm_info, core, "IDE: Reading Data Port %x (len=%d)\n", port, length); if ((channel->cmd_reg == 0xec) || (channel->cmd_reg == 0xa1)) { - return read_drive_id((uint8_t *)dst, length, dev, channel); + return read_drive_id((uint8_t *)dst, length, ide, channel); } if (drive->drive_type == BLOCK_CDROM) { - if (read_cd_data((uint8_t *)dst, length, dev, channel) == -1) { - PrintError("IDE: Could not read CD Data\n"); + if (read_cd_data((uint8_t *)dst, length, ide, channel) == -1) { + PrintError(core->vm_info, core, "IDE: Could not read CD Data (atapi cmd=%x)\n", drive->cd_state.atapi_cmd); return -1; } } else if (drive->drive_type == BLOCK_DISK) { - if (read_hd_data((uint8_t *)dst, length, dev, channel) == -1) { - PrintError("IDE: Could not read HD Data\n"); + if (read_hd_data((uint8_t *)dst, length, ide, channel) == -1) { + PrintError(core->vm_info, core, "IDE: Could not read HD Data\n"); return -1; } } else { @@ -1181,17 +1266,17 @@ static int ide_read_data_port(ushort_t port, void * dst, uint_t length, struct v return length; } -static int write_port_std(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct ide_internal * ide = (struct ide_internal *)(dev->private_data); +static int write_port_std(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct ide_internal * ide = priv_data; struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); if (length != 1) { - PrintError("Invalid Write length on IDE port %x\n", port); + PrintError(core->vm_info, core, "Invalid Write length on IDE port %x\n", port); return -1; } - PrintDebug("IDE: Writing Standard Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src); + PrintDebug(core->vm_info, core, "IDE: Writing Standard Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src); switch (port) { // reset and interrupt enable @@ -1249,32 +1334,41 @@ static int write_port_std(ushort_t port, void * src, uint_t length, struct vm_de // Selecting a non-present device is a no-no if (drive->drive_type == BLOCK_NONE) { - PrintDebug("Attempting to select a non-present drive\n"); + PrintDebug(core->vm_info, core, "Attempting to select a non-present drive\n"); channel->error_reg.abort = 1; channel->status.error = 1; + } else { + channel->status.busy = 0; + channel->status.ready = 1; + channel->status.data_req = 0; + channel->status.error = 0; + channel->status.seek_complete = 1; + + channel->dma_status.active = 0; + channel->dma_status.err = 0; } break; } default: - PrintError("IDE: Write to unknown Port %x\n", port); + PrintError(core->vm_info, core, "IDE: Write to unknown Port %x\n", port); return -1; } return length; } -static int read_port_std(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { - struct ide_internal * ide = (struct ide_internal *)(dev->private_data); +static int read_port_std(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) { + struct ide_internal * ide = priv_data; struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); if (length != 1) { - PrintError("Invalid Read length on IDE port %x\n", port); + PrintError(core->vm_info, core, "Invalid Read length on IDE port %x\n", port); return -1; } - PrintDebug("IDE: Reading Standard Port %x (%s)\n", port, io_port_to_str(port)); + PrintDebug(core->vm_info, core, "IDE: Reading Standard Port %x (%s)\n", port, io_port_to_str(port)); if ((port == PRI_ADDR_REG_PORT) || (port == SEC_ADDR_REG_PORT)) { @@ -1339,11 +1433,11 @@ static int read_port_std(ushort_t port, void * dst, uint_t length, struct vm_dev break; default: - PrintError("Invalid Port: %x\n", port); + PrintError(core->vm_info, core, "Invalid Port: %x\n", port); return -1; } - PrintDebug("\tVal=%x\n", *(uint8_t *)dst); + PrintDebug(core->vm_info, core, "\tVal=%x\n", *(uint8_t *)dst); return length; } @@ -1370,19 +1464,21 @@ static void init_drive(struct ide_drive * drive) { drive->private_data = NULL; - drive->cd_ops = NULL; + drive->ops = NULL; } static void init_channel(struct ide_channel * channel) { int i = 0; channel->error_reg.val = 0x01; + + //** channel->features = 0x0; + channel->drive_head.val = 0x00; channel->status.val = 0x00; channel->cmd_reg = 0x00; channel->ctrl_reg.val = 0x08; - channel->dma_cmd.val = 0; channel->dma_status.val = 0; channel->dma_prd_addr = 0; @@ -1395,27 +1491,28 @@ static void init_channel(struct ide_channel * channel) { } -static int pci_config_update(struct pci_device * pci_dev, uint_t reg_num, int length) { - PrintDebug("PCI Config Update\n"); - PrintDebug("\t\tInterupt register (Dev=%s), irq=%d\n", pci_dev->name, pci_dev->config_header.intr_line); +static int pci_config_update(struct pci_device * pci_dev, uint32_t reg_num, void * src, uint_t length, void * private_data) { + PrintDebug(VM_NONE, VCORE_NONE, "PCI Config Update\n"); + /* + struct ide_internal * ide = (struct ide_internal *)(private_data); + + PrintDebug(VM_NONE, VCORE_NONE, info, "\t\tInterupt register (Dev=%s), irq=%d\n", ide->ide_pci->name, ide->ide_pci->config_header.intr_line); + */ return 0; } -static int init_ide_state(struct vm_device * dev) { - struct ide_internal * ide = (struct ide_internal *)(dev->private_data); - int i; +static int init_ide_state(struct ide_internal * ide) { /* * Check if the PIIX 3 actually represents both IDE channels in a single PCI entry */ - for (i = 0; i < 1; i++) { - init_channel(&(ide->channels[i])); + init_channel(&(ide->channels[0])); + ide->channels[0].irq = PRI_DEFAULT_IRQ ; - // JRL: this is a terrible hack... - ide->channels[i].irq = PRI_DEFAULT_IRQ + i; - } + init_channel(&(ide->channels[1])); + ide->channels[1].irq = SEC_DEFAULT_IRQ ; return 0; @@ -1424,120 +1521,408 @@ static int init_ide_state(struct vm_device * dev) { -static int ide_free(struct vm_device * dev) { - // unhook io ports.... +static int ide_free(struct ide_internal * ide) { + // deregister from PCI? + + V3_Free(ide); + return 0; } +#ifdef V3_CONFIG_CHECKPOINT -static struct v3_device_ops dev_ops = { - .free = ide_free, - .reset = NULL, - .start = NULL, - .stop = NULL, -}; +#include +static int ide_save_extended(struct v3_chkpt *chkpt, char *id, void * private_data) { + struct ide_internal * ide = (struct ide_internal *)private_data; + struct v3_chkpt_ctx *ctx=0; + int ch_num = 0; + int drive_num = 0; + char buf[128]; + + ctx=v3_chkpt_open_ctx(chkpt,id); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Failed to open context for save\n"); + goto savefailout; + } -static int ide_init(struct guest_info * vm, void * cfg_data) { - struct ide_internal * ide = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal)); - struct ide_cfg * cfg = (struct ide_cfg *)(cfg_data); + // nothing saved yet - PrintDebug("IDE: Initializing IDE\n"); - memset(ide, 0, sizeof(struct ide_internal)); + v3_chkpt_close_ctx(ctx);ctx=0; + + for (ch_num = 0; ch_num < 2; ch_num++) { + struct ide_channel * ch = &(ide->channels[ch_num]); - if (cfg->pci != NULL) { - if (cfg->southbridge == NULL) { - PrintError("PCI Enabled BUT southbridge is NULL\n"); - return -1; + snprintf(buf, 128, "%s-%d", id, ch_num); + + ctx = v3_chkpt_open_ctx(chkpt, buf); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Unable to open context to save channel %d\n",ch_num); + goto savefailout; + } + + V3_CHKPT_SAVE(ctx, "ERROR", ch->error_reg.val, savefailout); + V3_CHKPT_SAVE(ctx, "FEATURES", ch->features.val, savefailout); + V3_CHKPT_SAVE(ctx, "DRIVE_HEAD", ch->drive_head.val, savefailout); + V3_CHKPT_SAVE(ctx, "STATUS", ch->status.val, savefailout); + V3_CHKPT_SAVE(ctx, "CMD_REG", ch->cmd_reg, savefailout); + V3_CHKPT_SAVE(ctx, "CTRL_REG", ch->ctrl_reg.val, savefailout); + V3_CHKPT_SAVE(ctx, "DMA_CMD", ch->dma_cmd.val, savefailout); + V3_CHKPT_SAVE(ctx, "DMA_STATUS", ch->dma_status.val, savefailout); + V3_CHKPT_SAVE(ctx, "PRD_ADDR", ch->dma_prd_addr, savefailout); + V3_CHKPT_SAVE(ctx, "DMA_TBL_IDX", ch->dma_tbl_index, savefailout); + + v3_chkpt_close_ctx(ctx); ctx=0; + + for (drive_num = 0; drive_num < 2; drive_num++) { + struct ide_drive * drive = &(ch->drives[drive_num]); + + snprintf(buf, 128, "%s-%d-%d", id, ch_num, drive_num); + + ctx = v3_chkpt_open_ctx(chkpt, buf); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Unable to open context to save drive %d\n",drive_num); + goto savefailout; + } + + V3_CHKPT_SAVE(ctx, "DRIVE_TYPE", drive->drive_type, savefailout); + V3_CHKPT_SAVE(ctx, "SECTOR_COUNT", drive->sector_count, savefailout); + V3_CHKPT_SAVE(ctx, "SECTOR_NUM", drive->sector_num, savefailout); + V3_CHKPT_SAVE(ctx, "CYLINDER", drive->cylinder,savefailout); + + V3_CHKPT_SAVE(ctx, "CURRENT_LBA", drive->current_lba, savefailout); + V3_CHKPT_SAVE(ctx, "TRANSFER_LENGTH", drive->transfer_length, savefailout); + V3_CHKPT_SAVE(ctx, "TRANSFER_INDEX", drive->transfer_index, savefailout); + + V3_CHKPT_SAVE(ctx, "DATA_BUF", drive->data_buf, savefailout); + + + /* For now we'll just pack the type specific data at the end... */ + /* We should probably add a new context here in the future... */ + if (drive->drive_type == BLOCK_CDROM) { + V3_CHKPT_SAVE(ctx, "ATAPI_SENSE_DATA", drive->cd_state.sense.buf, savefailout); + V3_CHKPT_SAVE(ctx, "ATAPI_CMD", drive->cd_state.atapi_cmd, savefailout); + V3_CHKPT_SAVE(ctx, "ATAPI_ERR_RECOVERY", drive->cd_state.err_recovery.buf, savefailout); + } else if (drive->drive_type == BLOCK_DISK) { + V3_CHKPT_SAVE(ctx, "ACCESSED", drive->hd_state.accessed, savefailout); + V3_CHKPT_SAVE(ctx, "MULT_SECT_NUM", drive->hd_state.mult_sector_num, savefailout); + V3_CHKPT_SAVE(ctx, "CUR_SECT_NUM", drive->hd_state.cur_sector_num, savefailout); + } else if (drive->drive_type == BLOCK_NONE) { + // no drive connected, so no data + } else { + PrintError(VM_NONE, VCORE_NONE, "Invalid drive type %d\n",drive->drive_type); + goto savefailout; + } + + v3_chkpt_close_ctx(ctx); ctx=0; } + } - ide->pci_bus = v3_find_dev(vm, (char *)cfg->pci); +// goodout: + return 0; + + savefailout: + PrintError(VM_NONE, VCORE_NONE, "Failed to save IDE\n"); + if (ctx) {v3_chkpt_close_ctx(ctx); } + return -1; +} + + + +static int ide_load_extended(struct v3_chkpt *chkpt, char *id, void * private_data) { + struct ide_internal * ide = (struct ide_internal *)private_data; + struct v3_chkpt_ctx *ctx=0; + int ch_num = 0; + int drive_num = 0; + char buf[128]; + + ctx=v3_chkpt_open_ctx(chkpt,id); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Failed to open context for load\n"); + goto loadfailout; + } + + // nothing saved yet + + v3_chkpt_close_ctx(ctx);ctx=0; + + + for (ch_num = 0; ch_num < 2; ch_num++) { + struct ide_channel * ch = &(ide->channels[ch_num]); + + snprintf(buf, 128, "%s-%d", id, ch_num); + + ctx = v3_chkpt_open_ctx(chkpt, buf); - if (ide->pci_bus == NULL) { - PrintError("Could not find PCI device\n"); - return -1; + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Unable to open context to load channel %d\n",ch_num); + goto loadfailout; } - struct vm_device * southbridge = v3_find_dev(vm, cfg->southbridge); + V3_CHKPT_LOAD(ctx, "ERROR", ch->error_reg.val, loadfailout); + V3_CHKPT_LOAD(ctx, "FEATURES", ch->features.val, loadfailout); + V3_CHKPT_LOAD(ctx, "DRIVE_HEAD", ch->drive_head.val, loadfailout); + V3_CHKPT_LOAD(ctx, "STATUS", ch->status.val, loadfailout); + V3_CHKPT_LOAD(ctx, "CMD_REG", ch->cmd_reg, loadfailout); + V3_CHKPT_LOAD(ctx, "CTRL_REG", ch->ctrl_reg.val, loadfailout); + V3_CHKPT_LOAD(ctx, "DMA_CMD", ch->dma_cmd.val, loadfailout); + V3_CHKPT_LOAD(ctx, "DMA_STATUS", ch->dma_status.val, loadfailout); + V3_CHKPT_LOAD(ctx, "PRD_ADDR", ch->dma_prd_addr, loadfailout); + V3_CHKPT_LOAD(ctx, "DMA_TBL_IDX", ch->dma_tbl_index, loadfailout); + + v3_chkpt_close_ctx(ctx); ctx=0; + + for (drive_num = 0; drive_num < 2; drive_num++) { + struct ide_drive * drive = &(ch->drives[drive_num]); + + snprintf(buf, 128, "%s-%d-%d", id, ch_num, drive_num); + + ctx = v3_chkpt_open_ctx(chkpt, buf); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Unable to open context to load drive %d\n",drive_num); + goto loadfailout; + } + + V3_CHKPT_LOAD(ctx, "DRIVE_TYPE", drive->drive_type, loadfailout); + V3_CHKPT_LOAD(ctx, "SECTOR_COUNT", drive->sector_count, loadfailout); + V3_CHKPT_LOAD(ctx, "SECTOR_NUM", drive->sector_num, loadfailout); + V3_CHKPT_LOAD(ctx, "CYLINDER", drive->cylinder,loadfailout); + + V3_CHKPT_LOAD(ctx, "CURRENT_LBA", drive->current_lba, loadfailout); + V3_CHKPT_LOAD(ctx, "TRANSFER_LENGTH", drive->transfer_length, loadfailout); + V3_CHKPT_LOAD(ctx, "TRANSFER_INDEX", drive->transfer_index, loadfailout); + + V3_CHKPT_LOAD(ctx, "DATA_BUF", drive->data_buf, loadfailout); + + + /* For now we'll just pack the type specific data at the end... */ + /* We should probably add a new context here in the future... */ + if (drive->drive_type == BLOCK_CDROM) { + V3_CHKPT_LOAD(ctx, "ATAPI_SENSE_DATA", drive->cd_state.sense.buf, loadfailout); + V3_CHKPT_LOAD(ctx, "ATAPI_CMD", drive->cd_state.atapi_cmd, loadfailout); + V3_CHKPT_LOAD(ctx, "ATAPI_ERR_RECOVERY", drive->cd_state.err_recovery.buf, loadfailout); + } else if (drive->drive_type == BLOCK_DISK) { + V3_CHKPT_LOAD(ctx, "ACCESSED", drive->hd_state.accessed, loadfailout); + V3_CHKPT_LOAD(ctx, "MULT_SECT_NUM", drive->hd_state.mult_sector_num, loadfailout); + V3_CHKPT_LOAD(ctx, "CUR_SECT_NUM", drive->hd_state.cur_sector_num, loadfailout); + } else if (drive->drive_type == BLOCK_NONE) { + // no drive connected, so no data + } else { + PrintError(VM_NONE, VCORE_NONE, "Invalid drive type %d\n",drive->drive_type); + goto loadfailout; + } + } + } +// goodout: + return 0; + + loadfailout: + PrintError(VM_NONE, VCORE_NONE, "Failed to load IDE\n"); + if (ctx) {v3_chkpt_close_ctx(ctx); } + return -1; + +} + + + +#endif + + +static struct v3_device_ops dev_ops = { + .free = (int (*)(void *))ide_free, +#ifdef V3_CONFIG_CHECKPOINT + .save_extended = ide_save_extended, + .load_extended = ide_load_extended +#endif +}; + + + + +static int connect_fn(struct v3_vm_info * vm, + void * frontend_data, + struct v3_dev_blk_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data) { + struct ide_internal * ide = (struct ide_internal *)(frontend_data); + struct ide_channel * channel = NULL; + struct ide_drive * drive = NULL; + + char * bus_str = v3_cfg_val(cfg, "bus_num"); + char * drive_str = v3_cfg_val(cfg, "drive_num"); + char * type_str = v3_cfg_val(cfg, "type"); + char * model_str = v3_cfg_val(cfg, "model"); + uint_t bus_num = 0; + uint_t drive_num = 0; + + + if ((!type_str) || (!drive_str) || (!bus_str)) { + PrintError(vm, VCORE_NONE, "Incomplete IDE Configuration\n"); + return -1; + } + + bus_num = atoi(bus_str); + drive_num = atoi(drive_str); + + channel = &(ide->channels[bus_num]); + drive = &(channel->drives[drive_num]); + + if (drive->drive_type != BLOCK_NONE) { + PrintError(vm, VCORE_NONE, "Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num); + return -1; + } + + if (model_str != NULL) { + strncpy(drive->model, model_str, sizeof(drive->model) - 1); + } + + if (strcasecmp(type_str, "cdrom") == 0) { + drive->drive_type = BLOCK_CDROM; + + while (strlen((char *)(drive->model)) < 40) { + strcat((char*)(drive->model), " "); + } + + } else if (strcasecmp(type_str, "hd") == 0) { + drive->drive_type = BLOCK_DISK; + + drive->hd_state.accessed = 0; + drive->hd_state.mult_sector_num = 1; + + drive->num_sectors = 63; + drive->num_heads = 16; + drive->num_cylinders = (ops->get_capacity(private_data) / HD_SECTOR_SIZE) / (drive->num_sectors * drive->num_heads); + } else { + PrintError(vm, VCORE_NONE, "invalid IDE drive type\n"); + return -1; + } + + drive->ops = ops; + + if (ide->ide_pci) { + // Hardcode this for now, but its not a good idea.... + ide->ide_pci->config_space[0x41 + (bus_num * 2)] = 0x80; + } + + drive->private_data = private_data; + + return 0; +} + + + + +static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { + struct ide_internal * ide = NULL; + char * dev_id = v3_cfg_val(cfg, "ID"); + int ret = 0; + + PrintDebug(vm, VCORE_NONE, "IDE: Initializing IDE\n"); + + ide = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal)); + + if (ide == NULL) { + PrintError(vm, VCORE_NONE, "Error allocating IDE state\n"); + return -1; + } + + memset(ide, 0, sizeof(struct ide_internal)); + + ide->vm = vm; + ide->pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus")); + + if (ide->pci_bus != NULL) { + struct vm_device * southbridge = v3_find_dev(vm, v3_cfg_val(cfg, "controller")); if (!southbridge) { - PrintError("Could not find southbridge\n"); + PrintError(vm, VCORE_NONE, "Could not find southbridge\n"); + V3_Free(ide); return -1; } ide->southbridge = (struct v3_southbridge *)(southbridge->private_data); } + PrintDebug(vm, VCORE_NONE, "IDE: Creating IDE bus x 2\n"); - PrintDebug("IDE: Creating IDE bus x 2\n"); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ide); - struct vm_device * dev = v3_allocate_device("IDE", &dev_ops, ide); - - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", "IDE"); + if (dev == NULL) { + PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id); + V3_Free(ide); return -1; } - - if (init_ide_state(dev) == -1) { - PrintError("Failed to initialize IDE state\n"); + if (init_ide_state(ide) == -1) { + PrintError(vm, VCORE_NONE, "Failed to initialize IDE state\n"); + v3_remove_device(dev); return -1; } - PrintDebug("Connecting to IDE IO ports\n"); - - v3_dev_hook_io(dev, PRI_DATA_PORT, - &ide_read_data_port, &write_data_port); - v3_dev_hook_io(dev, PRI_FEATURES_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, PRI_SECT_CNT_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, PRI_SECT_NUM_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, PRI_CYL_LOW_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, PRI_CYL_HIGH_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, PRI_DRV_SEL_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, PRI_CMD_PORT, - &read_port_std, &write_cmd_port); - - v3_dev_hook_io(dev, SEC_DATA_PORT, - &ide_read_data_port, &write_data_port); - v3_dev_hook_io(dev, SEC_FEATURES_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, SEC_SECT_CNT_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, SEC_SECT_NUM_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, SEC_CYL_LOW_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, SEC_CYL_HIGH_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, SEC_DRV_SEL_PORT, - &read_port_std, &write_port_std); - v3_dev_hook_io(dev, SEC_CMD_PORT, - &read_port_std, &write_cmd_port); + PrintDebug(vm, VCORE_NONE, "Connecting to IDE IO ports\n"); + + ret |= v3_dev_hook_io(dev, PRI_DATA_PORT, + &ide_read_data_port, &write_data_port); + ret |= v3_dev_hook_io(dev, PRI_FEATURES_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, PRI_SECT_CNT_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, PRI_SECT_NUM_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, PRI_CYL_LOW_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, PRI_CYL_HIGH_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, PRI_DRV_SEL_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, PRI_CMD_PORT, + &read_port_std, &write_cmd_port); + + ret |= v3_dev_hook_io(dev, SEC_DATA_PORT, + &ide_read_data_port, &write_data_port); + ret |= v3_dev_hook_io(dev, SEC_FEATURES_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, SEC_SECT_CNT_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, SEC_SECT_NUM_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, SEC_CYL_LOW_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, SEC_CYL_HIGH_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, SEC_DRV_SEL_PORT, + &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, SEC_CMD_PORT, + &read_port_std, &write_cmd_port); - v3_dev_hook_io(dev, PRI_CTRL_PORT, - &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, PRI_CTRL_PORT, + &read_port_std, &write_port_std); - v3_dev_hook_io(dev, SEC_CTRL_PORT, - &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, SEC_CTRL_PORT, + &read_port_std, &write_port_std); - v3_dev_hook_io(dev, SEC_ADDR_REG_PORT, - &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, SEC_ADDR_REG_PORT, + &read_port_std, &write_port_std); - v3_dev_hook_io(dev, PRI_ADDR_REG_PORT, - &read_port_std, &write_port_std); + ret |= v3_dev_hook_io(dev, PRI_ADDR_REG_PORT, + &read_port_std, &write_port_std); + if (ret != 0) { + PrintError(vm, VCORE_NONE, "Error hooking IDE IO port\n"); + v3_remove_device(dev); + return -1; + } if (ide->pci_bus) { @@ -1547,7 +1932,7 @@ static int ide_init(struct guest_info * vm, void * cfg_data) { struct pci_device * pci_dev = NULL; int i; - PrintDebug("Connecting IDE to PCI bus\n"); + PrintDebug(vm, VCORE_NONE, "Connecting IDE to PCI bus\n"); for (i = 0; i < 6; i++) { bars[i].type = PCI_BAR_NONE; @@ -1560,13 +1945,15 @@ static int ide_init(struct guest_info * vm, void * cfg_data) { bars[4].io_read = read_dma_port; bars[4].io_write = write_dma_port; - + bars[4].private_data = ide; + pci_dev = v3_pci_register_device(ide->pci_bus, PCI_STD_DEVICE, 0, sb_pci->dev_num, 1, "PIIX3_IDE", bars, - pci_config_update, NULL, NULL, dev); + pci_config_update, NULL, NULL, NULL, ide); if (pci_dev == NULL) { - PrintError("Failed to register IDE BUS %d with PCI\n", i); + PrintError(vm, VCORE_NONE, "Failed to register IDE BUS %d with PCI\n", i); + v3_remove_device(dev); return -1; } @@ -1592,7 +1979,14 @@ static int ide_init(struct guest_info * vm, void * cfg_data) { } - PrintDebug("IDE Initialized\n"); + if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, (void *)ide) == -1) { + PrintError(vm, VCORE_NONE, "Could not register %s as frontend\n", dev_id); + v3_remove_device(dev); + return -1; + } + + + PrintDebug(vm, VCORE_NONE, "IDE Initialized\n"); return 0; } @@ -1603,15 +1997,10 @@ device_register("IDE", ide_init) - - - - - -int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_num, +int v3_ide_get_geometry(void * ide_data, int channel_num, int drive_num, uint32_t * cylinders, uint32_t * heads, uint32_t * sectors) { - struct ide_internal * ide = (struct ide_internal *)(ide_dev->private_data); + struct ide_internal * ide = ide_data; struct ide_channel * channel = &(ide->channels[channel_num]); struct ide_drive * drive = &(channel->drives[drive_num]); @@ -1625,101 +2014,3 @@ int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_n return 0; } - - - - -int v3_ide_register_cdrom(struct vm_device * ide_dev, - uint_t bus_num, - uint_t drive_num, - char * dev_name, - struct v3_cd_ops * ops, - void * private_data) { - - struct ide_internal * ide = (struct ide_internal *)(ide_dev->private_data); - struct ide_channel * channel = NULL; - struct ide_drive * drive = NULL; - - V3_ASSERT((bus_num >= 0) && (bus_num < 2)); - V3_ASSERT((drive_num >= 0) && (drive_num < 2)); - - channel = &(ide->channels[bus_num]); - drive = &(channel->drives[drive_num]); - - if (drive->drive_type != BLOCK_NONE) { - PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num); - return -1; - } - - strncpy(drive->model, dev_name, sizeof(drive->model) - 1); - - while (strlen((char *)(drive->model)) < 40) { - strcat((char*)(drive->model), " "); - } - - - drive->drive_type = BLOCK_CDROM; - - drive->cd_ops = ops; - - if (ide->ide_pci) { - // Hardcode this for now, but its not a good idea.... - ide->ide_pci->config_space[0x41 + (bus_num * 2)] = 0x80; - } - - drive->private_data = private_data; - - return 0; -} - - -int v3_ide_register_harddisk(struct vm_device * ide_dev, - uint_t bus_num, - uint_t drive_num, - char * dev_name, - struct v3_hd_ops * ops, - void * private_data) { - - struct ide_internal * ide = (struct ide_internal *)(ide_dev->private_data); - struct ide_channel * channel = NULL; - struct ide_drive * drive = NULL; - - V3_ASSERT((bus_num >= 0) && (bus_num < 2)); - V3_ASSERT((drive_num >= 0) && (drive_num < 2)); - - channel = &(ide->channels[bus_num]); - drive = &(channel->drives[drive_num]); - - if (drive->drive_type != BLOCK_NONE) { - PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num); - return -1; - } - - strncpy(drive->model, dev_name, sizeof(drive->model) - 1); - - drive->drive_type = BLOCK_DISK; - - drive->hd_state.accessed = 0; - drive->hd_state.mult_sector_num = 1; - - drive->hd_ops = ops; - - /* this is something of a hack... */ - drive->num_sectors = 63; - drive->num_heads = 16; - drive->num_cylinders = ops->get_capacity(private_data) / (drive->num_sectors * drive->num_heads); - - if (ide->ide_pci) { - // Hardcode this for now, but its not a good idea.... - ide->ide_pci->config_space[0x41 + (bus_num * 2)] = 0x80; - } - - - - drive->private_data = private_data; - - return 0; -} - - -