vbox的更動 44876 路徑 trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

時間撮記:

2013-2-28 下午08:56:09 (12 年 以前)

作者:

vboxsync

訊息:

DevVGA: Drop the default crit sect in favour of our own (now called CritSect instead of lock). s -> pThis (didn't mean to combine these changes, but I started doing things in the wrong order and suddenly had no choice).

檔案:

• trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (修改) (7 筆差異)

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
  * VirtualBox Video Acceleration (VBVA).
@@ -4 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +16 @@
  */
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DEV_VGA
 #include <VBox/vmm/pdmifs.h>
@@ -37 +41 @@
 #define LOGVBVABUFFER(a) LogFlow(a)
 #else
-#define LOGVBVABUFFER(a) do {} while(0)
+#define LOGVBVABUFFER(a) do {} while (0)
 #endif
 
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
 typedef struct VBVAPARTIALRECORD
 {
@@ -69 +76 @@
 } VBVAMOUSESHAPEINFO;
 
-/* @todo saved state: save and restore VBVACONTEXT */
+/** @todo saved state: save and restore VBVACONTEXT */
 typedef struct VBVACONTEXT
 {
@@ -77 +84 @@
 } VBVACONTEXT;
 
-/* Copies 'cb' bytes from the VBVA ring buffer to the 'pu8Dst'.
+
+
+/** Copies @a cb bytes from the VBVA ring buffer to the @a pu8Dst.
  * Used for partial records or for records which cross the ring boundary.
  */
 static void vbvaFetchBytes (VBVABUFFER *pVBVA, uint8_t *pu8Dst, uint32_t cb)
 {
-    /* @todo replace the 'if' with an assert. The caller must ensure this condition. */
+    /** @todo replace the 'if' with an assert. The caller must ensure this condition. */
     if (cb >= pVBVA->cbData)
     {
@@ -1633 +1642 @@
 {
     PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
-    PDMCritSectEnter(&pVGAState->lock, VERR_SEM_BUSY);
+    PDMCritSectEnter(&pVGAState->CritSect, VERR_SEM_BUSY);
+
     HGSMISetHostGuestFlags(pVGAState->pHGSMI, HGSMIHOSTFLAGS_IRQ | fFlags);
     PDMDevHlpPCISetIrq(pDevIns, 0, PDM_IRQ_LEVEL_HIGH);
-    PDMCritSectLeave(&pVGAState->lock);
+
+    PDMCritSectLeave(&pVGAState->CritSect);
 }