Changeset 33201 in vbox

Timestamp:

Oct 18, 2010 2:37:33 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66740

Message:

reverted r66739

Location:

trunk/src/VBox

Files:

• Devices/Network/DevE1000.cpp (modified) (6 diffs)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -43 +43 @@
 //#define E1K_REL_STATS
 //#define E1K_USE_SUPLIB_SEMEVENT
+//#define E1K_WITH_MSI
 
 #include <iprt/crc.h>
@@ -134 +135 @@
 #define E1K_CHIP_82543GC 1
 #define E1K_CHIP_82545EM 2
-#define E1K_CHIP_82566MC 3
-#define E1K_CHIP_LAST    E1K_CHIP_82566MC
-
-/* Flags for chip descripton */
-#define E1K_MSI_CHIP (1 << 0)
 
 struct E1kChips
@@ -147 +143 @@
     uint16_t uPCISubsystemId;
     const char *pcszName;
-    uint32_t uFlags;
 } g_Chips[] =
 {
     /* Vendor Device SSVendor SubSys  Name */
-    { 0x8086, 0x100E, 0x8086, 0x001E, "82540EM", 0 }, /* Intel 82540EM-A in Intel PRO/1000 MT Desktop */
-    { 0x8086, 0x1004, 0x8086, 0x1004, "82543GC", 0 }, /* Intel 82543GC   in Intel PRO/1000 T  Server */
-    { 0x8086, 0x100F, 0x15AD, 0x0750, "82545EM", 0 }, /* Intel 82545EM-A in VMWare Network Adapter */
-    { 0x8086, 0x104D, 0x8086, 0x001E, "82566MC", E1K_MSI_CHIP } /* Intel 82566MC Gigabit Ethernet Controller */
+    { 0x8086,
+      /* Temporary code, as MSI-aware driver dislike 0x100E. How to do that right? */
+#ifdef E1K_WITH_MSI
+      0x105E,
+#else
+      0x100E,
+#endif
+                      0x8086, 0x001E, "82540EM" }, /* Intel 82540EM-A in Intel PRO/1000 MT Desktop */
+    { 0x8086, 0x1004, 0x8086, 0x1004, "82543GC" }, /* Intel 82543GC   in Intel PRO/1000 T  Server */
+    { 0x8086, 0x100F, 0x15AD, 0x0750, "82545EM" }  /* Intel 82545EM-A in VMWare Network Adapter */
 };
 
@@ -5596 +5597 @@
     /* Capability ID: PCI-X Configuration Registers */
     e1kPCICfgSetU8( pci, 0xE4,                           VBOX_PCI_CAP_ID_PCIX);
-    /* Next Item Pointer: Message Signalled Interrupts */
-#ifdef  VBOX_WITH_MSI_DEVICES
-    if (g_Chips[eChip].uFlags & E1K_MSI_CHIP)
-        e1kPCICfgSetU8( pci, 0xE4 + 1,                      0x80);
-    else
+#ifdef E1K_WITH_MSI
+    e1kPCICfgSetU8( pci, 0xE4 + 1,                      0x80);
+#else
+    /* Next Item Pointer: None (Message Signalled Interrupts are disabled) */
+    e1kPCICfgSetU8( pci, 0xE4 + 1,                      0x00);
 #endif
-        /* Next Item Pointer: None (Message Signalled Interrupts are disabled) */
-        e1kPCICfgSetU8( pci, 0xE4 + 1,                      0x00);
     /* PCI-X Command: Enable Relaxed Ordering */
     e1kPCICfgSetU16(pci, 0xE4 + 2,                    VBOX_PCI_X_CMD_ERO);
@@ -5648 +5647 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the value of 'AdapterType'"));
-    Assert(pState->eChip <= E1K_CHIP_LAST);
+    Assert(pState->eChip <= E1K_CHIP_82545EM);
 
     E1kLog(("%s Chip=%s\n", INSTANCE(pState), g_Chips[pState->eChip].pcszName));
@@ -5744 +5743 @@
         return rc;
 
-#ifdef VBOX_WITH_MSI_DEVICES
-    if (g_Chips[pState->eChip].uFlags & E1K_MSI_CHIP)
-    {
-        PDMMSIREG aMsiReg;
-        aMsiReg.cVectors = 1;
-        aMsiReg.iCapOffset = 0x80;
-        aMsiReg.iNextOffset = 0x0;
-        aMsiReg.iMsiFlags = 0;
-        rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
-        AssertRC(rc);
-        if (RT_FAILURE (rc))
-        {
-            PCIDevSetByte( &pState->pciDevice, 0xE4 + 1, 0x0);
-            // continue
-        }
-    }
+#ifdef E1K_WITH_MSI
+    PDMMSIREG aMsiReg;
+    aMsiReg.cVectors = 1;
+    aMsiReg.iCapOffset = 0x80;
+    aMsiReg.iNextOffset = 0x0;
+    aMsiReg.iMsiFlags = 0;
+    rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
+    AssertRC(rc);
+    if (RT_FAILURE (rc))
+        return rc;
 #endif
+
 
     /* Map our registers to memory space (region 0, see e1kConfigurePCI)*/

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -213 +213 @@
                      "                            [--nictype<1-N> Am79C970A|Am79C973"
 #ifdef VBOX_WITH_E1000
-                  "|\n                                            82540EM|82543GC|82545EM|82566MC"
+                  "|\n                                            82540EM|82543GC|82545EM"
 #endif
 #ifdef VBOX_WITH_VIRTIO
@@ -807 +807 @@
     va_list args;
     va_start(args, pszFormat);
-    RTMsgErrorV(pszFormat, args);
+    RTMsgError(pszFormat, args);
     va_end(args);
     return 1;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1060 +1060 @@
                     CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82545EM));
                 }
-                 else if (!strcmp(ValueUnion.psz, "82566MC"))
-                {
-                    CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82566MC));
-                }
 #endif
 #ifdef VBOX_WITH_VIRTIO

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1537 +1537 @@
                 case NetworkAdapterType_I82543GC:
                 case NetworkAdapterType_I82545EM:
-                case NetworkAdapterType_I82566MC:
                     pDev = pDevE1000;
                     pszAdapterName = "e1000";
@@ -1624 +1623 @@
                 case NetworkAdapterType_I82545EM:
                     InsertConfigInteger(pCfg, "AdapterType", 2);
-                    break;
-                case NetworkAdapterType_I82566MC:
-                    InsertConfigInteger(pCfg, "AdapterType", 3);
                     break;
             }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -11232 +11232 @@
   <enum
     name="NetworkAdapterType"
-    uuid="bea69445-df7d-449f-b224-3b6526d8ac81"
+    uuid="3c2281e4-d952-4e87-8c7d-24379cb6a81c"
   >
     <desc>
@@ -11258 +11258 @@
     <const name="Virtio"                value="6">
         <desc>Virtio network device.</desc>
-    </const>
-    <const name="I82566MC"              value="7">
-        <desc>Intel 82566MC Gigabit Ethernet Controller (82566MC).</desc>
     </const>
   </enum>

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1880 +1880 @@
             else if (strTemp == "82545EM")
                 nic.type = NetworkAdapterType_I82545EM;
-            else if (strTemp == "82566MC")
-                nic.type = NetworkAdapterType_I82566MC;
             else if (strTemp == "virtio")
                 nic.type = NetworkAdapterType_Virtio;
@@ -3504 +3502 @@
             case NetworkAdapterType_I82543GC:   pcszType = "82543GC"; break;
             case NetworkAdapterType_I82545EM:   pcszType = "82545EM"; break;
-            case NetworkAdapterType_I82566MC:   pcszType = "82566MC"; break;
             case NetworkAdapterType_Virtio:     pcszType = "virtio"; break;
             default: /*case NetworkAdapterType_Am79C970A:*/  pcszType = "Am79C970A"; break;