Changeset 41371 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 21, 2012 3:23:40 PM (13 years ago)

Author:

vboxsync

Message:

Main,include,VBoxManage: smartcard support: IMachine::EmulatedUSBCardReaderEnabled.

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -202 +202 @@
     mPointingHidType = PointingHidType_PS2Mouse;
     mChipsetType = ChipsetType_PIIX3;
+    mEmulatedUSBCardReaderEnabled = FALSE;
 
     for (size_t i = 0; i < RT_ELEMENTS(mCPUAttached); i++)
@@ -1526 +1527 @@
 STDMETHODIMP Machine::COMGETTER(EmulatedUSBCardReaderEnabled)(BOOL *enabled)
 {
+#ifdef VBOX_WITH_USB_CARDREADER
+    CheckComArgOutPointerValid(enabled);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *enabled = mHWData->mEmulatedUSBCardReaderEnabled;
+
+    return S_OK;
+#else
     NOREF(enabled);
     return E_NOTIMPL;
+#endif
 }
 
 STDMETHODIMP Machine::COMSETTER(EmulatedUSBCardReaderEnabled)(BOOL enabled)
 {
+#ifdef VBOX_WITH_USB_CARDREADER
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    int rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
+
+    setModified(IsModified_MachineData);
+    mHWData.backup();
+    mHWData->mEmulatedUSBCardReaderEnabled = enabled;
+
+    return S_OK;
+#else
     NOREF(enabled);
     return E_NOTIMPL;
+#endif
 }
 
@@ -8077 +8106 @@
         mHWData->mKeyboardHidType = data.keyboardHidType;
         mHWData->mChipsetType = data.chipsetType;
+        mHWData->mEmulatedUSBCardReaderEnabled = data.fEmulatedUSBCardReader;
         mHWData->mHpetEnabled = data.fHpetEnabled;
 
@@ -9211 +9241 @@
         // chipset
         data.chipsetType = mHWData->mChipsetType;
+
+        data.fEmulatedUSBCardReader = !!mHWData->mEmulatedUSBCardReaderEnabled;
 
         // HPET