Changeset 10202 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 4, 2008 7:25:27 AM (17 years ago)

Author:

vboxsync

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

32774

Message:

removed VBOX_WITH_PDM_LOCK

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevPCI.cpp (modified) (2 diffs)
• PC/DevAPIC.cpp (modified) (6 diffs)
• PC/DevPIC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -66 +66 @@
 /** @def PCI_UNLOCK
  * Releases the PDM lock. This is a NOP if locking is disabled. */
-#ifdef VBOX_WITH_PDM_LOCK
-# define PCI_LOCK(pDevIns, rc) \
+#define PCI_LOCK(pDevIns, rc) \
     do { \
         int rc2 = PDMINS2DATA(pDevIns, PCIBus *)->CTXALLSUFF(pPciHlp)->pfnLock((pDevIns), rc); \
@@ -73 +72 @@
             return rc2; \
     } while (0)
-# define PCI_UNLOCK(pDevIns) \
+#define PCI_UNLOCK(pDevIns) \
     PDMINS2DATA(pDevIns, PCIBus *)->CTXALLSUFF(pPciHlp)->pfnUnlock(pDevIns)
-#else /* !VBOX_WITH_PDM_LOCK */
-# define PCI_LOCK(pThis, rc)   do { } while (0)
-# define PCI_UNLOCK(pThis)     do { } while (0)
-#endif /* !VBOX_WITH_PDM_LOCK */
 
 

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -62 +62 @@
 /** @def IOAPIC_UNLOCK
  * Releases the PDM lock. This is a NOP if locking is disabled. */
-#ifdef VBOX_WITH_PDM_LOCK
-# define APIC_LOCK(pThis, rc) \
+#define APIC_LOCK(pThis, rc) \
     do { \
         int rc2 = (pThis)->CTXALLSUFF(pApicHlp)->pfnLock((pThis)->CTXSUFF(pDevIns), rc); \
@@ -69 +68 @@
             return rc2; \
     } while (0)
-# define APIC_UNLOCK(pThis) \
+#define APIC_UNLOCK(pThis) \
     (pThis)->CTXALLSUFF(pApicHlp)->pfnUnlock((pThis)->CTXSUFF(pDevIns))
-# define IOAPIC_LOCK(pThis, rc) \
+#define IOAPIC_LOCK(pThis, rc) \
     do { \
         int rc2 = (pThis)->CTXALLSUFF(pIoApicHlp)->pfnLock((pThis)->CTXSUFF(pDevIns), rc); \
@@ -77 +76 @@
             return rc2; \
     } while (0)
-# define IOAPIC_UNLOCK(pThis) (pThis)->CTXALLSUFF(pIoApicHlp)->pfnUnlock((pThis)->CTXSUFF(pDevIns))
-#else /* !VBOX_WITH_PDM_LOCK */
-# define APIC_LOCK(pThis, rc)   do { } while (0)
-# define APIC_UNLOCK(pThis)     do { } while (0)
-# define IOAPIC_LOCK(pThis, rc) do { } while (0)
-# define IOAPIC_UNLOCK(pThis)   do { } while (0)
-#endif /* !VBOX_WITH_PDM_LOCK */
+#define IOAPIC_UNLOCK(pThis) (pThis)->CTXALLSUFF(pIoApicHlp)->pfnUnlock((pThis)->CTXSUFF(pDevIns))
 
 
@@ -828 +821 @@
 {
     APICState *s = PDMINS2DATA(pDevIns, APICState *);
-# ifdef VBOX_WITH_PDM_LOCK
     s->pApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
-# endif
 #endif /* VBOX */
 
@@ -1610 +1601 @@
 {
     APICState *s = PDMINS2DATA(pDevIns, APICState *);
-#ifdef VBOX_WITH_PDM_LOCK
     s->pApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
-#endif
     apic_reset(s);
     /* Clear any pending APIC interrupt action flag. */
@@ -1956 +1945 @@
 {
     IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
-#ifdef VBOX_WITH_PDM_LOCK
     s->pIoApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
-#endif
     ioapic_reset(s);
     IOAPIC_UNLOCK(s);

trunk/src/VBox/Devices/PC/DevPIC.cpp

@@ -38 +38 @@
 /** @def PIC_UNLOCK
  * Releases the PDM lock. This is a NOP if locking is disabled. */
-#ifdef VBOX_WITH_PDM_LOCK
-# define PIC_LOCK(pThis, rc) \
+#define PIC_LOCK(pThis, rc) \
     do { \
         int rc2 = (pThis)->CTXALLSUFF(pPicHlp)->pfnLock((pThis)->CTXSUFF(pDevIns), rc); \
@@ -45 +44 @@
             return rc2; \
     } while (0)
-# define PIC_UNLOCK(pThis) \
+#define PIC_UNLOCK(pThis) \
     (pThis)->CTXALLSUFF(pPicHlp)->pfnUnlock((pThis)->CTXSUFF(pDevIns))
-#else /* !VBOX_WITH_PDM_LOCK */
-# define PIC_LOCK(pThis, rc)   do { } while (0)
-# define PIC_UNLOCK(pThis)     do { } while (0)
-#endif /* !VBOX_WITH_PDM_LOCK */
 
 
@@ -890 +885 @@
     unsigned    i;
     LogFlow(("picReset:\n"));
-#ifdef VBOX_WITH_PDM_LOCK
     pData->pPicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
-#endif
 
     for (i = 0; i < ELEMENTS(pData->aPics); i++)