Changeset 66507 in vbox for trunk/include/VBox/Graphics

Timestamp:

Apr 11, 2017 10:15:57 AM (8 years ago)

Author:

vboxsync

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

114507

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Rename VBoxVideoCmnPort* macros to VBVO_PORT_* to fit in with our naming conventions and improve aesthetics.

Location:

trunk/include/VBox/Graphics

Files:

• VBoxVideoGuest.h (modified) (1 diff)
• VBoxVideoIPRT.h (modified) (3 diffs)

trunk/include/VBox/Graphics/VBoxVideoGuest.h

@@ -114 +114 @@
 DECLINLINE(void) VBoxHGSMIClearIrq(PHGSMIHOSTCOMMANDCONTEXT pCtx)
 {
-    VBoxVideoCmnPortWriteUlong(pCtx->port, HGSMIOFFSET_VOID);
+    VBVO_PORT_WRITE_U32(pCtx->port, HGSMIOFFSET_VOID);
 }
 

trunk/include/VBox/Graphics/VBoxVideoIPRT.h

@@ -47 +47 @@
 
 /** Write an 8-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUchar(Port, Value) \
+# define VBVO_PORT_WRITE_U8(Port, Value) \
     VideoPortWritePortUchar((PUCHAR)Port, Value)
 /** Write a 16-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUshort(Port, Value) \
+# define VBVO_PORT_WRITE_U16(Port, Value) \
     VideoPortWritePortUshort((PUSHORT)Port, Value)
 /** Write a 32-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUlong(Port, Value) \
+# define VBVO_PORT_WRITE_U32(Port, Value) \
     VideoPortWritePortUlong((PULONG)Port, Value)
 /** Read an 8-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUchar(Port) \
+# define VBVO_PORT_READ_U8(Port) \
     VideoPortReadPortUchar((PUCHAR)Port)
 /** Read a 16-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUshort(Port) \
+# define VBVO_PORT_READ_U16(Port) \
     VideoPortReadPortUshort((PUSHORT)Port)
 /** Read a 32-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUlong(Port) \
+# define VBVO_PORT_READ_U32(Port) \
     VideoPortReadPortUlong((PULONG)Port)
     
@@ -68 +68 @@
 
 /** Write an 8-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUchar(Port, Value) \
+# define VBVO_PORT_WRITE_U8(Port, Value) \
     outb(Port, Value)
 /** Write a 16-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUshort(Port, Value) \
+# define VBVO_PORT_WRITE_U16(Port, Value) \
     outw(Port, Value)
 /** Write a 32-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUlong(Port, Value) \
+# define VBVO_PORT_WRITE_U32(Port, Value) \
     outl(Port, Value)
 /** Read an 8-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUchar(Port) \
+# define VBVO_PORT_READ_U8(Port) \
     inb(Port)
 /** Read a 16-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUshort(Port) \
+# define VBVO_PORT_READ_U16(Port) \
     inw(Port)
 /** Read a 32-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUlong(Port) \
+# define VBVO_PORT_READ_U32(Port) \
     inl(Port)
 
@@ -89 +89 @@
 
 /** Write an 8-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUchar(Port, Value) \
+# define VBVO_PORT_WRITE_U8(Port, Value) \
     ASMOutU8(Port, Value)
 /** Write a 16-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUshort(Port, Value) \
+# define VBVO_PORT_WRITE_U16(Port, Value) \
     ASMOutU16(Port, Value)
 /** Write a 32-bit value to an I/O port. */
-# define VBoxVideoCmnPortWriteUlong(Port, Value) \
+# define VBVO_PORT_WRITE_U32(Port, Value) \
     ASMOutU32(Port, Value)
 /** Read an 8-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUchar(Port) \
+# define VBVO_PORT_READ_U8(Port) \
     ASMInU8(Port)
 /** Read a 16-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUshort(Port) \
+# define VBVO_PORT_READ_U16(Port) \
     ASMInU16(Port)
 /** Read a 32-bit value from an I/O port. */
-# define VBoxVideoCmnPortReadUlong(Port) \
+# define VBVO_PORT_READ_U32(Port) \
     ASMInU32(Port)
 #endif