Changeset 81428 in vbox for trunk

Timestamp:

Oct 21, 2019 6:38:38 PM (5 years ago)

Author:

vboxsync

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

134145

Message:

Main/Console: more forgotten build fixes for r134142

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• VBoxDriversRegister.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -65 +65 @@
 # include "DrvAudioRec.h"
 #endif
-#include "Nvram.h"
 #ifdef VBOX_WITH_USB_CARDREADER
 # include "UsbCardReader.h"
@@ -405 +404 @@
     , m_pVMMDev(NULL)
     , mAudioVRDE(NULL)
-    , mNvram(NULL)
 #ifdef VBOX_WITH_USB_CARDREADER
     , mUsbCardReader(NULL)
@@ -593 +591 @@
         AssertReturn(Recording.mAudioRec, E_FAIL);
 #endif
-        FirmwareType_T enmFirmwareType;
-        mMachine->COMGETTER(FirmwareType)(&enmFirmwareType);
-        if (   enmFirmwareType == FirmwareType_EFI
-            || enmFirmwareType == FirmwareType_EFI32
-            || enmFirmwareType == FirmwareType_EFI64
-            || enmFirmwareType == FirmwareType_EFIDUAL)
-        {
-            unconst(mNvram) = new Nvram(this);
-            AssertReturn(mNvram, E_FAIL);
-        }
 
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -713 +701 @@
         RTMemFree((void *)mpIfSecKeyHlp);
         mpIfSecKeyHlp = NULL;
-    }
-
-    if (mNvram)
-    {
-        delete mNvram;
-        unconst(mNvram) = NULL;
     }
 

trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp

@@ -34 +34 @@
 # include "DrvAudioRec.h"
 #endif
-#include "Nvram.h"
 #include "UsbWebcamInterface.h"
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -85 +84 @@
         return rc;
 #endif
-    rc = pCallbacks->pfnRegister(pCallbacks, &Nvram::DrvReg);
-    if (RT_FAILURE(rc))
-        return rc;
 
     rc = pCallbacks->pfnRegister(pCallbacks, &EmWebcam::DrvReg);