Changeset 8439 in vbox for trunk/src/VBox
- Timestamp:
- Apr 28, 2008 7:35:29 PM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 30294
- Location:
- trunk/src/VBox
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp
r8423 r8439 358 358 " [-nictype<1-N> Am79C970A|Am79C973" 359 359 #ifdef VBOX_WITH_E1000 360 "|82540EM "360 "|82540EM|82543GC" 361 361 #endif 362 362 "]\n" … … 1343 1343 case NetworkAdapterType_I82540EM: 1344 1344 strNICType = "82540EM"; 1345 break; 1346 case NetworkAdapterType_I82543GC: 1347 strNICType = "82543GC"; 1345 1348 break; 1346 1349 #endif … … 4980 4983 CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82540EM), 1); 4981 4984 } 4985 else if (strcmp(nictype[n], "82543GC") == 0) 4986 { 4987 CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82543GC), 1); 4988 } 4982 4989 #endif 4983 4990 else -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
r8390 r8439 1986 1986 <comment>NetworkAdapterType</comment> 1987 1987 <translation>Intel PRO/1000 MT Desktop (82540EM) 1988 1989 XarxaAdaptadorTipus</translation> 1990 </message> 1991 <message> 1992 <source>Intel PRO/1000 T Server (82543GC)</source> 1993 <comment>NetworkAdapterType</comment> 1994 <translation>Intel PRO/1000 T Server (82543GC) 1988 1995 1989 1996 XarxaAdaptadorTipus</translation> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
r8390 r8439 2131 2131 <comment>NetworkAdapterType</comment> 2132 2132 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 2133 </message> 2134 <message> 2135 <source>Intel PRO/1000 T Server (82543GC)</source> 2136 <comment>NetworkAdapterType</comment> 2137 <translation>Intel PRO/1000 T Server (82543GC)</translation> 2133 2138 </message> 2134 2139 <message> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
r8390 r8439 2070 2070 <comment>NetworkAdapterType</comment> 2071 2071 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 2072 </message> 2073 <message> 2074 <source>Intel PRO/1000 T Server (82543GC)</source> 2075 <comment>NetworkAdapterType</comment> 2076 <translation>Intel PRO/1000 T Server (82543GC)</translation> 2072 2077 </message> 2073 2078 <message> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
r8390 r8439 1895 1895 <comment>NetworkAdapterType</comment> 1896 1896 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 1897 </message> 1898 <message> 1899 <source>Intel PRO/1000 T Server (82543GC)</source> 1900 <comment>NetworkAdapterType</comment> 1901 <translation>Intel PRO/1000 T Server (82543GC)</translation> 1897 1902 </message> 1898 1903 <message> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
r8390 r8439 2070 2070 <comment>NetworkAdapterType</comment> 2071 2071 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 2072 </message> 2073 <message> 2074 <source>Intel PRO/1000 T Server (82543GC)</source> 2075 <comment>NetworkAdapterType</comment> 2076 <translation>Intel PRO/1000 T Server (82543GC)</translation> 2072 2077 </message> 2073 2078 <message> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
r8390 r8439 2059 2059 <comment>NetworkAdapterType</comment> 2060 2060 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 2061 </message> 2062 <message> 2063 <source>Intel PRO/1000 T Server (82543GC)</source> 2064 <comment>NetworkAdapterType</comment> 2065 <translation>Intel PRO/1000 T Server (82543GC)</translation> 2061 2066 </message> 2062 2067 <message> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
r8390 r8439 2078 2078 <comment>NetworkAdapterType</comment> 2079 2079 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 2080 </message> 2081 <message> 2082 <source>Intel PRO/1000 T Server (82543GC)</source> 2083 <comment>NetworkAdapterType</comment> 2084 <translation>Intel PRO/1000 T Server (82543GC)</translation> 2080 2085 </message> 2081 2086 <message> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
r8390 r8439 2164 2164 <comment>NetworkAdapterType</comment> 2165 2165 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 2166 </message> 2167 <message> 2168 <source>Intel PRO/1000 T Server (82543GC)</source> 2169 <comment>NetworkAdapterType</comment> 2170 <translation>Intel PRO/1000 T Server (82543GC)</translation> 2166 2171 </message> 2167 2172 <message> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
r8390 r8439 1894 1894 <comment>NetworkAdapterType</comment> 1895 1895 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 1896 </message> 1897 <message> 1898 <source>Intel PRO/1000 T Server (82543GC)</source> 1899 <comment>NetworkAdapterType</comment> 1900 <translation>Intel PRO/1000 T Server (82543GC)</translation> 1896 1901 </message> 1897 1902 <message> -
trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
r8390 r8439 1894 1894 <comment>NetworkAdapterType</comment> 1895 1895 <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> 1896 </message> 1897 <message> 1898 <source>Intel PRO/1000 T Server (82543GC)</source> 1899 <comment>NetworkAdapterType</comment> 1900 <translation>Intel PRO/1000 T Server (82543GC)</translation> 1896 1901 </message> 1897 1902 <message> -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
r8192 r8439 2529 2529 networkAdapterTypes [KNetworkAdapterType_I82540EM] = 2530 2530 tr ("Intel PRO/1000 MT Desktop (82540EM)", "NetworkAdapterType"); 2531 networkAdapterTypes [KNetworkAdapterType_I82543GC] = 2532 tr ("Intel PRO/1000 T Server (82543GC)", "NetworkAdapterType"); 2531 2533 2532 2534 networkAttachmentTypes [KNetworkAttachmentType_Null] = -
trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h
r8155 r8439 35 35 cbAdapterType->insertItem (vboxGlobal().toString (KNetworkAdapterType_Am79C973)); 36 36 cbAdapterType->insertItem (vboxGlobal().toString (KNetworkAdapterType_I82540EM)); 37 cbAdapterType->insertItem (vboxGlobal().toString (KNetworkAdapterType_I82543GC)); 37 38 38 39 leMACAddress->setValidator (new QRegExpValidator -
trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp
r8204 r8439 2383 2383 networkAdapterTypes [KNetworkAdapterType_I82540EM] = 2384 2384 tr ("Intel PRO/1000 MT Desktop (82540EM)", "NetworkAdapterType"); 2385 networkAdapterTypes [KNetworkAdapterType_I82543GC] = 2386 tr ("Intel PRO/1000 T Server (82543GC)", "NetworkAdapterType"); 2385 2387 2386 2388 networkAttachmentTypes [KNetworkAttachmentType_Null] = -
trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMNetworkSettings.ui.h
r8155 r8439 35 35 cbAdapterType->insertItem (vboxGlobal().toString (KNetworkAdapterType_Am79C973)); 36 36 cbAdapterType->insertItem (vboxGlobal().toString (KNetworkAdapterType_I82540EM)); 37 cbAdapterType->insertItem (vboxGlobal().toString (KNetworkAdapterType_I82543GC)); 37 38 38 39 leMACAddress->setValidator (new QRegExpValidator -
trunk/src/VBox/Main/ConsoleImpl.cpp
r8155 r8439 3141 3141 rc = aNetworkAdapter->COMGETTER(AdapterType)(&adapterType); 3142 3142 AssertComRC(rc); 3143 if (adapterType == NetworkAdapterType_I82540EM) 3143 if (adapterType == NetworkAdapterType_I82540EM || 3144 adapterType == NetworkAdapterType_I82543GC) 3144 3145 cszAdapterName = "e1000"; 3145 3146 #endif -
trunk/src/VBox/Main/ConsoleImpl2.cpp
r8375 r8439 953 953 #ifdef VBOX_WITH_E1000 954 954 case NetworkAdapterType_I82540EM: 955 case NetworkAdapterType_I82543GC: 955 956 pDev = pDevE1000; 956 957 break; … … 984 985 case NetworkAdapterType_Am79C973: 985 986 rc = CFGMR3InsertInteger(pCfg, "Am79C973", 1); RC_CHECK(); 987 case NetworkAdapterType_I82540EM: 988 rc = CFGMR3InsertInteger(pCfg, "AdapterType", 0); RC_CHECK(); 989 case NetworkAdapterType_I82543GC: 990 rc = CFGMR3InsertInteger(pCfg, "AdapterType", 1); RC_CHECK(); 986 991 break; 987 992 } -
trunk/src/VBox/Main/NetworkAdapterImpl.cpp
r8367 r8439 207 207 #ifdef VBOX_WITH_E1000 208 208 case NetworkAdapterType_I82540EM: 209 case NetworkAdapterType_I82543GC: 209 210 #endif 210 211 break; … … 1018 1019 else if (strcmp (adapterType, "82540EM") == 0) 1019 1020 mData->mAdapterType = NetworkAdapterType_I82540EM; 1021 else if (strcmp (adapterType, "82543GC") == 0) 1022 mData->mAdapterType = NetworkAdapterType_I82543GC; 1020 1023 else 1021 1024 ComAssertMsgFailedRet (("Invalid adapter type '%s'", adapterType), … … 1134 1137 case NetworkAdapterType_I82540EM: 1135 1138 typeStr = "82540EM"; 1139 case NetworkAdapterType_I82543GC: 1140 typeStr = "82543GC"; 1136 1141 break; 1137 1142 default: -
trunk/src/VBox/Main/idl/VirtualBox.xidl
r8425 r8439 8196 8196 <const name="Am79C973" value="2"/> 8197 8197 <const name="I82540EM" value="3"/> 8198 <const name="I82543GC" value="4"/> 8198 8199 </enum> 8199 8200 -
trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd
r8203 r8439 188 188 <xsd:enumeration value="Am79C973"/> 189 189 <xsd:enumeration value="82540EM"/> 190 <xsd:enumeration value="82543GC"/> 190 191 </xsd:restriction> 191 192 </xsd:simpleType>
Note:
See TracChangeset
for help on using the changeset viewer.