Changeset 42551 in vbox for trunk/include
- Timestamp:
- Aug 2, 2012 4:44:39 PM (13 years ago)
- svn:sync-xref-src-repo-rev:
- 79727
- Location:
- trunk/include/VBox
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/pci.h
r41854 r42551 4 4 5 5 /* 6 * Copyright (C) 2006-20 07Oracle Corporation6 * Copyright (C) 2006-2012 Oracle Corporation 7 7 * 8 8 * This file is part of VirtualBox Open Source Edition (OSE), as … … 1050 1050 * which sets no precedent. 1051 1051 */ 1052 struct P ciBusAddress1052 struct PCIBusAddress 1053 1053 { 1054 1054 /** @todo: think if we'll need domain, which is higher … … 1058 1058 int miFn; 1059 1059 1060 P ciBusAddress()1060 PCIBusAddress() 1061 1061 { 1062 1062 clear(); 1063 1063 } 1064 1064 1065 P ciBusAddress(int iBus, int iDevice, int iFn)1065 PCIBusAddress(int iBus, int iDevice, int iFn) 1066 1066 { 1067 1067 init(iBus, iDevice, iFn); 1068 1068 } 1069 1069 1070 P ciBusAddress(int32_t iAddr)1070 PCIBusAddress(int32_t iAddr) 1071 1071 { 1072 1072 clear(); … … 1074 1074 } 1075 1075 1076 P ciBusAddress& clear()1076 PCIBusAddress& clear() 1077 1077 { 1078 1078 miBus = miDevice = miFn = -1; … … 1087 1087 } 1088 1088 1089 void init(const P ciBusAddress &a)1089 void init(const PCIBusAddress &a) 1090 1090 { 1091 1091 miBus = a.miBus; … … 1094 1094 } 1095 1095 1096 bool operator<(const P ciBusAddress &a) const1096 bool operator<(const PCIBusAddress &a) const 1097 1097 { 1098 1098 if (miBus < a.miBus) … … 1117 1117 } 1118 1118 1119 bool operator==(const P ciBusAddress &a) const1119 bool operator==(const PCIBusAddress &a) const 1120 1120 { 1121 1121 return (miBus == a.miBus) … … 1124 1124 } 1125 1125 1126 bool operator!=(const P ciBusAddress &a) const1126 bool operator!=(const PCIBusAddress &a) const 1127 1127 { 1128 1128 return (miBus != a.miBus) … … 1144 1144 } 1145 1145 1146 P ciBusAddress& fromLong(int32_t value)1146 PCIBusAddress& fromLong(int32_t value) 1147 1147 { 1148 1148 miBus = (value >> 8) & 0xff; -
trunk/include/VBox/settings.h
r42261 r42551 394 394 u32TcpRcv(0), 395 395 u32TcpSnd(0), 396 fD nsPassDomain(true), /* historically this value is true */397 fD nsProxy(false),398 fD nsUseHostResolver(false),396 fDNSPassDomain(true), /* historically this value is true */ 397 fDNSProxy(false), 398 fDNSUseHostResolver(false), 399 399 fAliasLog(false), 400 400 fAliasProxyOnly(false), … … 411 411 && u32TcpSnd == n.u32TcpSnd 412 412 && u32TcpRcv == n.u32TcpRcv 413 && strT ftpPrefix == n.strTftpPrefix414 && strT ftpBootFile == n.strTftpBootFile415 && strT ftpNextServer == n.strTftpNextServer416 && fD nsPassDomain == n.fDnsPassDomain417 && fD nsProxy == n.fDnsProxy418 && fD nsUseHostResolver == n.fDnsUseHostResolver413 && strTFTPPrefix == n.strTFTPPrefix 414 && strTFTPBootFile == n.strTFTPBootFile 415 && strTFTPNextServer == n.strTFTPNextServer 416 && fDNSPassDomain == n.fDNSPassDomain 417 && fDNSProxy == n.fDNSProxy 418 && fDNSUseHostResolver == n.fDNSUseHostResolver 419 419 && fAliasLog == n.fAliasLog 420 420 && fAliasProxyOnly == n.fAliasProxyOnly … … 430 430 uint32_t u32TcpRcv; 431 431 uint32_t u32TcpSnd; 432 com::Utf8Str strT ftpPrefix;433 com::Utf8Str strT ftpBootFile;434 com::Utf8Str strT ftpNextServer;435 bool fD nsPassDomain;436 bool fD nsProxy;437 bool fD nsUseHostResolver;432 com::Utf8Str strTFTPPrefix; 433 com::Utf8Str strTFTPBootFile; 434 com::Utf8Str strTFTPNextServer; 435 bool fDNSPassDomain; 436 bool fDNSProxy; 437 bool fDNSUseHostResolver; 438 438 bool fAliasLog; 439 439 bool fAliasProxyOnly; … … 694 694 * your settings might never get saved. 695 695 */ 696 struct I oSettings697 { 698 I oSettings();699 700 bool operator==(const I oSettings &i) const701 { 702 return ( (fI oCacheEnabled == i.fIoCacheEnabled)703 && (ulI oCacheSize == i.ulIoCacheSize)696 struct IOSettings 697 { 698 IOSettings(); 699 700 bool operator==(const IOSettings &i) const 701 { 702 return ( (fIOCacheEnabled == i.fIOCacheEnabled) 703 && (ulIOCacheSize == i.ulIOCacheSize) 704 704 && (llBandwidthGroups == i.llBandwidthGroups)); 705 705 } 706 706 707 bool fI oCacheEnabled;708 uint32_t ulI oCacheSize;707 bool fIOCacheEnabled; 708 uint32_t ulIOCacheSize; 709 709 BandwidthGroupList llBandwidthGroups; 710 710 }; … … 715 715 * your settings might never get saved. 716 716 */ 717 struct HostP ciDeviceAttachment718 { 719 HostP ciDeviceAttachment()717 struct HostPCIDeviceAttachment 718 { 719 HostPCIDeviceAttachment() 720 720 : uHostAddress(0), 721 721 uGuestAddress(0) 722 722 {} 723 723 724 bool operator==(const HostP ciDeviceAttachment &a) const724 bool operator==(const HostPCIDeviceAttachment &a) const 725 725 { 726 726 return ( (uHostAddress == a.uHostAddress) … … 734 734 uint32_t uGuestAddress; 735 735 }; 736 typedef std::list<HostP ciDeviceAttachment> HostPciDeviceAttachmentList;736 typedef std::list<HostPCIDeviceAttachment> HostPCIDeviceAttachmentList; 737 737 738 738 /** … … 764 764 bool fCpuHotPlug; // requires settings version 1.10 (VirtualBox 3.2) 765 765 CpuList llCpus; // requires settings version 1.10 (VirtualBox 3.2) 766 bool fH petEnabled; // requires settings version 1.10 (VirtualBox 3.2)766 bool fHPETEnabled; // requires settings version 1.10 (VirtualBox 3.2) 767 767 uint32_t ulCpuExecutionCap; // requires settings version 1.11 (VirtualBox 3.3) 768 768 … … 779 779 FirmwareType_T firmwareType; // requires settings version 1.9 (VirtualBox 3.1) 780 780 781 PointingH idType_T pointingHidType; // requires settings version 1.10 (VirtualBox 3.2)782 KeyboardH idType_T keyboardHidType; // requires settings version 1.10 (VirtualBox 3.2)781 PointingHIDType_T pointingHIDType; // requires settings version 1.10 (VirtualBox 3.2) 782 KeyboardHIDType_T keyboardHIDType; // requires settings version 1.10 (VirtualBox 3.2) 783 783 784 784 ChipsetType_T chipsetType; // requires settings version 1.11 (VirtualBox 4.0) … … 807 807 com::Utf8Str strNotificationPatterns; 808 808 809 I oSettings ioSettings; // requires settings version 1.10 (VirtualBox 3.2)810 HostP ciDeviceAttachmentList pciAttachments; // requires settings version 1.12 (VirtualBox 4.1)809 IOSettings ioSettings; // requires settings version 1.10 (VirtualBox 3.2) 810 HostPCIDeviceAttachmentList pciAttachments; // requires settings version 1.12 (VirtualBox 4.1) 811 811 }; 812 812
Note:
See TracChangeset
for help on using the changeset viewer.