[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] [13497] trunk/bochs/iodev
From:       vruppert--- via Bochs-cvs <bochs-cvs () lists ! sourceforge ! net>
Date:       2018-05-01 15:54:47
Message-ID: 1525190088.118521.4475 () sfp-scm-3 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]

Revision: 13497
Author:   vruppert
Date:     2018-05-01 15:54:37 +0000 (Tue, 01 May 2018)
Log Message:
-----------
Added new macros BX_DEBUG_PCI_READ and BX_DEBUG_PCI_WRITE to unify the debug
output of PCI config space handlers.
Banshee: some PCI register fixes.

Modified Paths:
--------------
    trunk/bochs/iodev/acpi.cc
    trunk/bochs/iodev/devices.cc
    trunk/bochs/iodev/display/banshee.cc
    trunk/bochs/iodev/display/svga_cirrus.cc
    trunk/bochs/iodev/display/vga.cc
    trunk/bochs/iodev/display/voodoo.cc
    trunk/bochs/iodev/iodev.h
    trunk/bochs/iodev/network/e1000.cc
    trunk/bochs/iodev/network/ne2k.cc
    trunk/bochs/iodev/network/pcipnic.cc
    trunk/bochs/iodev/pci.cc
    trunk/bochs/iodev/pci2isa.cc
    trunk/bochs/iodev/pci_ide.cc
    trunk/bochs/iodev/pcidev.cc
    trunk/bochs/iodev/sound/es1370.cc
    trunk/bochs/iodev/usb/uhci_core.cc
    trunk/bochs/iodev/usb/usb_ehci.cc
    trunk/bochs/iodev/usb/usb_ohci.cc
    trunk/bochs/iodev/usb/usb_xhci.cc

Modified: trunk/bochs/iodev/acpi.cc
===================================================================
--- trunk/bochs/iodev/acpi.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/acpi.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -497,6 +497,7 @@
   if ((address >= 0x10) && (address < 0x34))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     value8 = (value >> (i*8)) & 0xFF;
     oldval = BX_ACPI_THIS pci_conf[address+i];
@@ -544,13 +545,6 @@
        BX_INFO(("new SM base address: 0x%04x", BX_ACPI_THIS s.sm_base));
     }
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 #endif // BX_SUPPORT_PCI

Modified: trunk/bochs/iodev/devices.cc
===================================================================
--- trunk/bochs/iodev/devices.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/devices.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -1490,6 +1490,7 @@
   if (((pci_conf[0x0e] & 0x03) == 0) && (address >= 0x10) && (address < 0x28)) {
     bnum = ((address - 0x10) >> 2);
     if (pci_bar[bnum].type != BX_PCI_BAR_TYPE_NONE) {
+      BX_DEBUG_PCI_WRITE(address, value, io_len);
       for (unsigned i=0; i<io_len; i++) {
         value8 = (value >> (i*8)) & 0xff;
         oldval = pci_conf[address+i];
@@ -1522,6 +1523,7 @@
       }
     }
   } else if ((address & 0xfc) == 0x30) {
+    BX_DEBUG_PCI_WRITE(address, value, io_len);
     value &= (0xfffffc01 >> ((address & 0x03) * 8));
     for (unsigned i=0; i<io_len; i++) {
       value8 = (value >> (i*8)) & 0xff;
@@ -1558,12 +1560,7 @@
     value |= (pci_conf[address+i] << (i*8));
   }
 
-  if (io_len == 1)
-    BX_DEBUG(("read  PCI register 0x%02X value 0x%02X (len=1)", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("read  PCI register 0x%02X value 0x%04X (len=2)", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("read  PCI register 0x%02X value 0x%08X (len=4)", address, value));
+  BX_DEBUG_PCI_READ(address, value, io_len);
 
   return value;
 }

Modified: trunk/bochs/iodev/display/banshee.cc
===================================================================
--- trunk/bochs/iodev/display/banshee.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/display/banshee.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -196,8 +196,8 @@
     { 0x60, 0x01 }, { 0x61, 0x00 },
     { 0x62, 0x21 }, { 0x63, 0x00 },
     // ACPI control/status 0x64 - 0x67
-    { 0x60, 0x00 }, { 0x61, 0x00 },
-    { 0x62, 0x00 }, { 0x63, 0x00 },
+    { 0x64, 0x00 }, { 0x65, 0x00 },
+    { 0x66, 0x00 }, { 0x67, 0x00 },
   };
   for (i = 0; i < sizeof(reset_vals2) / sizeof(*reset_vals2); ++i) {
     pci_conf[reset_vals2[i].addr] = reset_vals2[i].val;
@@ -210,6 +210,9 @@
     pci_conf[0x55] = 0x60;
     pci_conf[0x56] = 0x10;
     pci_conf[0x57] = 0x00;
+    pci_conf[0x58] = 0x21;
+    pci_conf[0x59] = 0x02;
+    pci_conf[0x5b] = 0x07;
     v->banshee.io[io_strapInfo] |= 0x0000000c;
     v->banshee.io[io_miscInit1] |= 0x0c000000;
   }
@@ -460,6 +463,7 @@
   if ((address >= 0x1c) && (address < 0x2c))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     value8 = (value >> (i*8)) & 0xFF;
     oldval = pci_conf[address+i];
@@ -486,13 +490,6 @@
     }
     pci_conf[address+i] = value8;
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 Bit32u bx_banshee_c::read_handler(void *this_ptr, Bit32u address, unsigned io_len)

Modified: trunk/bochs/iodev/display/svga_cirrus.cc
===================================================================
--- trunk/bochs/iodev/display/svga_cirrus.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/display/svga_cirrus.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -2336,12 +2336,10 @@
   unsigned write_addr;
   Bit8u new_value, old_value;
 
-  BX_DEBUG(("pci_write: address 0x%02x, io_len 0x%02x, value 0x%x",
-    (unsigned)address, (unsigned)io_len, (unsigned)value));
-
   if ((address > 0x17) && (address < 0x30))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (i = 0; i < io_len; i++) {
     write_addr = address + i;
     old_value = BX_CIRRUS_THIS pci_conf[write_addr];

Modified: trunk/bochs/iodev/display/vga.cc
===================================================================
--- trunk/bochs/iodev/display/vga.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/display/vga.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -1294,16 +1294,10 @@
 // static pci configuration space write callback handler
 void bx_vga_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
 {
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
-
   if ((address >= 0x14) && (address < 0x30))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i = 0; i < io_len; i++) {
     unsigned write_addr = address + i;
 //  Bit8u old_value = BX_VGA_THIS pci_conf[write_addr];

Modified: trunk/bochs/iodev/display/voodoo.cc
===================================================================
--- trunk/bochs/iodev/display/voodoo.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/display/voodoo.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -1064,6 +1064,7 @@
   if ((address >= 0x14) && (address < 0x34))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     value8 = (value >> (i*8)) & 0xFF;
     oldval = pci_conf[address+i];
@@ -1102,13 +1103,6 @@
     }
     pci_conf[address+i] = value8;
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 #endif // BX_SUPPORT_PCI && BX_SUPPORT_VOODOO

Modified: trunk/bochs/iodev/iodev.h
===================================================================
--- trunk/bochs/iodev/iodev.h	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/iodev.h	2018-05-01 15:54:37 UTC (rev 13497)
@@ -88,6 +88,22 @@
 
 #if BX_SUPPORT_PCI
 
+#define BX_DEBUG_PCI_READ(addr, value, io_len) \
+  if (io_len == 1) \
+    BX_DEBUG(("read  PCI register 0x%02X value 0x%02X (len=1)", address, value)); \
+  else if (io_len == 2) \
+    BX_DEBUG(("read  PCI register 0x%02X value 0x%04X (len=2)", address, value)); \
+  else if (io_len == 4) \
+    BX_DEBUG(("read  PCI register 0x%02X value 0x%08X (len=4)", address, value));
+
+#define BX_DEBUG_PCI_WRITE(addr, value, io_len) \
+  if (io_len == 1) \
+    BX_DEBUG(("write PCI register 0x%02X value 0x%02X (len=1)", addr, value)); \
+  else if (io_len == 2) \
+    BX_DEBUG(("write PCI register 0x%02X value 0x%04X (len=2)", addr, value)); \
+  else if (io_len == 4) \
+    BX_DEBUG(("write PCI register 0x%02X value 0x%08X (len=4)", addr, value));
+
 #define BX_PCI_BAR_TYPE_NONE 0
 #define BX_PCI_BAR_TYPE_MEM  1
 #define BX_PCI_BAR_TYPE_IO   2

Modified: trunk/bochs/iodev/network/e1000.cc
===================================================================
--- trunk/bochs/iodev/network/e1000.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/network/e1000.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -1456,6 +1456,7 @@
   if ((address >= 0x18) && (address < 0x30))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     value8 = (value >> (i*8)) & 0xFF;
     oldval = BX_E1000_THIS pci_conf[address+i];
@@ -1468,13 +1469,6 @@
     }
     BX_E1000_THIS pci_conf[address+i] = value8;
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 #endif // BX_SUPPORT_PCI && BX_SUPPORT_E1000

Modified: trunk/bochs/iodev/network/ne2k.cc
===================================================================
--- trunk/bochs/iodev/network/ne2k.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/network/ne2k.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -1692,6 +1692,7 @@
   if ((address > 0x13) && (address < 0x30))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     oldval = BX_NE2K_THIS pci_conf[address+i];
     value8 = (value >> (i*8)) & 0xFF;
@@ -1704,13 +1705,6 @@
     }
     BX_NE2K_THIS pci_conf[address+i] = value8;
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 void bx_ne2k_c::pci_bar_change_notify(void)

Modified: trunk/bochs/iodev/network/pcipnic.cc
===================================================================
--- trunk/bochs/iodev/network/pcipnic.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/network/pcipnic.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -389,6 +389,7 @@
       ((address > 0x23) && (address < 0x30)))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     value8 = (value >> (i*8)) & 0xFF;
     oldval = BX_PNIC_THIS pci_conf[address+i];
@@ -401,13 +402,6 @@
     }
     BX_PNIC_THIS pci_conf[address+i] = value8;
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 

Modified: trunk/bochs/iodev/pci.cc
===================================================================
--- trunk/bochs/iodev/pci.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/pci.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -257,6 +257,8 @@
   old_dram_detect = BX_PCI_THIS dram_detect;
   if ((address >= 0x10) && (address < 0x34))
     return;
+
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     value8 = (value >> (i*8)) & 0xFF;
     oldval = BX_PCI_THIS pci_conf[address+i];
@@ -638,6 +640,8 @@
 // pci configuration space write callback handler
 void bx_pci_vbridge_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
 {
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
+
   for (unsigned i=0; i<io_len; i++) {
     Bit8u value8 = (value >> (i*8)) & 0xff;
     Bit8u oldval = pci_conf[address+i];
@@ -682,12 +686,5 @@
     }
     pci_conf[address+i] = value8;
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 #endif /* BX_SUPPORT_PCI */

Modified: trunk/bochs/iodev/pci2isa.cc
===================================================================
--- trunk/bochs/iodev/pci2isa.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/pci2isa.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -353,6 +353,8 @@
 
   if ((address >= 0x10) && (address < 0x34))
     return;
+
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     value8 = (value >> (i*8)) & 0xFF;
     oldval = BX_P2I_THIS pci_conf[address+i];

Modified: trunk/bochs/iodev/pci_ide.cc
===================================================================
--- trunk/bochs/iodev/pci_ide.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/pci_ide.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -427,6 +427,7 @@
       ((address > 0x23) && (address < 0x40)))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
 //  Bit8u oldval = BX_PIDE_THIS pci_conf[address+i];
     Bit8u value8 = (value >> (i*8)) & 0xFF;

Modified: trunk/bochs/iodev/pcidev.cc
===================================================================
--- trunk/bochs/iodev/pcidev.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/pcidev.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -5,7 +5,7 @@
 /*
  *  PCIDEV: PCI host device mapping
  *  Copyright (C) 2003       Frank Cornelis
- *  Copyright (C) 2003-2017  The Bochs Project
+ *  Copyright (C) 2003-2018  The Bochs Project
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -384,6 +384,7 @@
   if (fd == -1)
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   // we do a host 2 guest irq line mapping
   if (address == PCI_INTERRUPT_LINE) {
     value &= 0xff;

Modified: trunk/bochs/iodev/sound/es1370.cc
===================================================================
--- trunk/bochs/iodev/sound/es1370.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/sound/es1370.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -1088,6 +1088,7 @@
   if ((address >= 0x14) && (address < 0x34))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     Bit8u value8 = (value >> (i*8)) & 0xFF;
 //    Bit8u oldval = BX_ES1370_THIS pci_conf[address+i];
@@ -1107,13 +1108,6 @@
         BX_ES1370_THIS pci_conf[address+i] = value8;
     }
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 // runtime parameter handlers

Modified: trunk/bochs/iodev/usb/uhci_core.cc
===================================================================
--- trunk/bochs/iodev/usb/uhci_core.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/usb/uhci_core.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -896,6 +896,7 @@
       ((address > 0x23) && (address < 0x34)))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     Bit8u value8 = (value >> (i*8)) & 0xFF;
 //  Bit8u oldval = pci_conf[address+i];
@@ -914,13 +915,6 @@
         pci_conf[address+i] = value8;
     }
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 const char *usb_speed[4] = {

Modified: trunk/bochs/iodev/usb/usb_ehci.cc
===================================================================
--- trunk/bochs/iodev/usb/usb_ehci.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/usb/usb_ehci.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -2238,6 +2238,7 @@
   if (((address >= 0x14) && (address <= 0x3b)) || (address > 0x80))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     Bit8u value8 = (value >> (i*8)) & 0xFF;
 //  Bit8u oldval = BX_EHCI_THIS pci_conf[address+i];
@@ -2268,13 +2269,6 @@
         BX_EHCI_THIS pci_conf[address+i] = value8;
     }
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02X value 0x%02X (len=1)", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02X value 0x%04X (len=2)", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02X value 0x%08X (len=4)", address, value));
 }
 
 // USB runtime parameter handler

Modified: trunk/bochs/iodev/usb/usb_ohci.cc
===================================================================
--- trunk/bochs/iodev/usb/usb_ohci.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/usb/usb_ohci.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -1439,6 +1439,7 @@
   if (((address >= 0x14) && (address <= 0x34)))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     value8 = (value >> (i*8)) & 0xFF;
 //  Bit8u oldval = BX_OHCI_THIS pci_conf[address+i];
@@ -1457,13 +1458,6 @@
         BX_OHCI_THIS pci_conf[address+i] = value8;
     }
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
 }
 
 void bx_usb_ohci_c::usb_set_connect_status(Bit8u port, int type, bx_bool connected)

Modified: trunk/bochs/iodev/usb/usb_xhci.cc
===================================================================
--- trunk/bochs/iodev/usb/usb_xhci.cc	2018-05-01 07:05:28 UTC (rev 13496)
+++ trunk/bochs/iodev/usb/usb_xhci.cc	2018-05-01 15:54:37 UTC (rev 13497)
@@ -3109,6 +3109,7 @@
   if (((address >= 0x14) && (address <= 0x34)))
     return;
 
+  BX_DEBUG_PCI_WRITE(address, value, io_len);
   for (unsigned i=0; i<io_len; i++) {
     Bit8u value8 = (value >> (i*8)) & 0xFF;
 //  Bit8u oldval = BX_XHCI_THIS pci_conf[address+i];
@@ -3138,13 +3139,6 @@
         BX_XHCI_THIS pci_conf[address+i] = value8;
     }
   }
-
-  if (io_len == 1)
-    BX_DEBUG(("write PCI register 0x%02X value 0x%02X (len=1)", address, value));
-  else if (io_len == 2)
-    BX_DEBUG(("write PCI register 0x%02X value 0x%04X (len=2)", address, value));
-  else if (io_len == 4)
-    BX_DEBUG(("write PCI register 0x%02X value 0x%08X (len=4)", address, value));
 }
 
 void bx_usb_xhci_c::usb_set_connect_status(Bit8u port, int type, bx_bool connected)


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic