X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=7534f1e22307e5f54dadfb5c71726f8df43ae01a;hb=5e83847991f155d6aabffc2b71f5a9224a5fbd59;hp=d0adb6327ecb4d9163c257f1b5598d2b5940b7e6;hpb=262421e0f445e5427698043eb5b3309f9768a1f2;p=palacios.git diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index d0adb63..7534f1e 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -21,7 +21,8 @@ #include #include "ide-types.h" - +#define PRI_DEFAULT_IRQ 14 +#define SEC_DEFAULT_IRQ 15 #define PRI_DATA_PORT 0x1f0 #define PRI_FEATURES_PORT 0x1f1 @@ -46,11 +47,11 @@ #define SEC_ADDR_REG_PORT 0x377 -typedef enum {IDE_DISK, IDE_CDROM, IDE_NONE} ide_dev_type_t; + static const char * ide_dev_type_strs[] = {"HARDDISK", "CDROM", "NONE"}; -static inline const char * device_type_to_str(ide_dev_type_t type) { +static inline const char * device_type_to_str(v3_ide_dev_type_t type) { if (type > 2) { return NULL; } @@ -65,8 +66,22 @@ static inline const char * device_type_to_str(ide_dev_type_t type) { struct ide_drive { // Command Registers - ide_dev_type_t drive_type; + v3_ide_dev_type_t drive_type; + + union { + struct v3_ide_cd_ops * cd_ops; + struct v3_ide_hd_ops * hd_ops; + }; + + + char model[41]; + uint_t data_offset; + + // data buffer... + uint8_t buffer[2048]; + + void * private_data; uint8_t sector_count; // 0x1f2,0x172 uint8_t sector_num; // 0x1f3,0x173 @@ -96,6 +111,8 @@ struct ide_channel { struct ide_status_reg status; // [read] 0x1f7,0x177 uint8_t command_reg; // [write] 0x1f7,0x177 + int irq; // this is temporary until we add PCI support + // Control Registers struct ide_ctrl_reg ctrl_reg; // [write] 0x3f6,0x376 }; @@ -136,6 +153,13 @@ static inline int is_lba_enabled(struct ide_channel * channel) { } +static void ide_raise_irq(struct vm_device * dev, struct ide_channel * channel) { + if (channel->ctrl_reg.irq_disable == 0) { + v3_raise_irq(dev->vm, channel->irq); + } +} + + static void drive_reset(struct ide_drive * drive) { drive->sector_count = 0x01; drive->sector_num = 0x01; @@ -162,7 +186,7 @@ static void channel_reset(struct ide_channel * channel) { // clear commands channel->command_reg = 0x00; - channel->ctrl_reg.irq_enable = 0; + channel->ctrl_reg.irq_disable = 0; } static void channel_reset_complete(struct ide_channel * channel) { @@ -176,9 +200,74 @@ static void channel_reset_complete(struct ide_channel * channel) { } +static void ide_abort_command(struct vm_device * dev, struct ide_channel * channel) { + channel->status.val = 0x41; // Error + ready + channel->error_reg.val = 0x04; // No idea... + + ide_raise_irq(dev, channel); +} + + + + +// Include the ATAPI interface handlers +#include "atapi.h" + + + 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); + 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); + return -1; + } + + channel->command_reg = *(uint8_t *)src; + + PrintDebug("IDE: Writing Command Port %x (val=%x)\n", port, *(uint8_t *)src); + + switch (channel->command_reg) { + + case 0xa0: // ATAPI Command Packet + if (drive->drive_type != IDE_CDROM) { + ide_abort_command(dev, channel); + } + + drive->sector_count = 1; + + channel->status.busy = 0; + channel->status.write_fault = 0; + channel->status.data_req = 1; + channel->status.error = 0; + + drive->data_offset = 0; + + case 0xa1: // ATAPI Identify Device Packet + atapi_identify_device(drive); + + channel->error_reg.val = 0; + channel->status.val = 0x58; // ready, data_req, seek_complete + + ide_raise_irq(dev, channel); + case 0xec: // Identify Device + if (drive->drive_type != IDE_DISK) { + drive_reset(drive); + + // JRL: Should we abort here? + ide_abort_command(dev, channel); + } else { + PrintError("IDE Disks currently not implemented\n"); + return -1; + } + break; + + } + return -1; } @@ -354,6 +443,8 @@ static int read_port_std(ushort_t port, void * dst, uint_t length, struct vm_dev return -1; } + PrintDebug("\tVal=%x\n", *(uint8_t *)dst); + return length; } @@ -365,9 +456,14 @@ static void init_drive(struct ide_drive * drive) { drive->sector_num = 0x01; drive->cylinder = 0x0000; - drive->drive_type = IDE_NONE; + drive->data_offset = 0; + memset(drive->model, 0, sizeof(drive->model)); + memset(drive->buffer, 0, sizeof(drive->buffer)); + + drive->private_data = NULL; + drive->cd_ops = NULL; } static void init_channel(struct ide_channel * channel) { @@ -379,6 +475,7 @@ static void init_channel(struct ide_channel * channel) { channel->command_reg = 0x00; channel->ctrl_reg.val = 0x08; + for (i = 0; i < 2; i++) { init_drive(&(channel->drives[i])); } @@ -390,6 +487,9 @@ static void init_ide_state(struct ide_internal * ide) { for (i = 0; i < 2; i++) { init_channel(&(ide->channels[i])); + + // JRL: this is a terrible hack... + ide->channels[i].irq = PRI_DEFAULT_IRQ + i; } } @@ -482,3 +582,79 @@ struct vm_device * v3_create_ide() { return device; } + + + + + +int v3_ide_register_cdrom(struct vm_device * ide_dev, + uint_t bus_num, + uint_t drive_num, + char * dev_name, + struct v3_ide_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 != IDE_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 = IDE_CDROM; + + drive->cd_ops = ops; + + 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_ide_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 != IDE_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 = IDE_DISK; + + drive->hd_ops = ops; + + drive->private_data = private_data; + + return 0; +}