X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=e11944f42d984c54f1f8881e58b3277fad26ce0c;hb=61597ea2c5ccace036d8a65e429e32b8f8a7ed4a;hp=60be9de2de0ea7f98688cb37759a3d5e2aea922d;hpb=942df9bb1e2570764d24c74f797247536639502e;p=palacios.git diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index 60be9de..e11944f 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -26,7 +26,7 @@ #include "ide-types.h" #include "atapi-types.h" -#ifndef DEBUG_IDE +#ifndef CONFIG_DEBUG_IDE #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -353,7 +353,7 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel); #include "ata.h" -#ifdef DEBUG_IDE +#ifdef CONFIG_DEBUG_IDE static void print_prd_table(struct vm_device * dev, struct ide_channel * channel) { struct ide_dma_prd prd_entry; int index = 0; @@ -395,7 +395,7 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { // Read in the data buffer.... // Read a sector/block at a time until the prd entry is full. -#ifdef DEBUG_IDE +#ifdef CONFIG_DEBUG_IDE print_prd_table(dev, channel); #endif @@ -1157,7 +1157,7 @@ static int ide_read_data_port(ushort_t port, void * dst, uint_t length, struct v 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("IDE: Reading Data Port %x (len=%d)\n", port, length); if ((channel->cmd_reg == 0xec) || (channel->cmd_reg == 0xa1)) { @@ -1554,7 +1554,8 @@ static int ide_init(struct guest_info * vm, void * cfg_data) { } bars[4].type = PCI_BAR_IO; - bars[4].default_base_port = PRI_DEFAULT_DMA_PORT; + // bars[4].default_base_port = PRI_DEFAULT_DMA_PORT; + bars[4].default_base_port = -1; bars[4].num_ports = 16; bars[4].io_read = read_dma_port;