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

Timestamp:

Oct 1, 2015 8:25:21 AM (9 years ago)

Author:

vboxsync

Message:

Parallel ports: Several fixes for multiple parallel ports. Make the second parallel port visible to the guest through ACPI if enabled (and don't expose the first port if it is not enabled), increase the maximum instanbce count to 2 and make it possible to enable a parallel port without having it connected to a host device to make it behave like it is not connected to anything.

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• ParallelPortImpl.cpp (modified) (3 diffs)

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

@@ -353 +353 @@
             for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); ++slot)
                 mSerialPorts[slot]->i_applyDefaults(aOsType);
+
+            /* Apply parallel port defaults */
+            for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); ++slot)
+                mParallelPorts[slot]->i_applyDefaults();
 
             /* Let the OS type select 64-bit ness. */

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

@@ -215 +215 @@
     if (m->bd->fEnabled != !!aEnabled)
     {
-        if (aEnabled &&
-            m->bd->strPath.isEmpty())
-            return setError(E_INVALIDARG,
-                            tr("Cannot enable the parallel port %d because the port path is empty or null"),
-                            m->bd->ulSlot);
-
         m->bd.backup();
         m->bd->fEnabled = !!aEnabled;
@@ -352 +346 @@
     if (aPath != m->bd->strPath)
     {
-        HRESULT rc = i_checkSetPath(aPath);
-        if (FAILED(rc)) return rc;
-
         m->bd.backup();
         m->bd->strPath = aPath;
@@ -498 +489 @@
 
 /**
- *  Validates COMSETTER(Path) arguments.
- */
-HRESULT ParallelPort::i_checkSetPath(const Utf8Str &str)
-{
-    AssertReturn(isWriteLockOnCurrentThread(), E_FAIL);
-
-    if (    m->bd->fEnabled
-         && str.isEmpty()
-       )
-        return setError(E_INVALIDARG,
-                        tr("Path of the parallel port %d may not be empty or null "
-                           "when the port is enabled"),
-                        m->bd->ulSlot);
-
-    return S_OK;
-}
-
+ * Applies the defaults for the given parallel port.
+ */
+void ParallelPort::i_applyDefaults()
+{
+    /* sanity */
+    AutoCaller autoCaller(this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* Set some more defaults based on the slot. */
+    switch (m->bd->ulSlot)
+    {
+        case 0:
+        {
+            m->bd->ulIOBase = 0x378;
+            m->bd->ulIRQ = 7;
+            break;
+        }
+        case 1:
+        {
+            m->bd->ulIOBase = 0x278;
+            m->bd->ulIRQ = 5;
+            break;
+        }
+        default: break;
+    }
+}
 
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */