Index: /trunk/src/VBox/Devices/Graphics/BIOS/vbe.c
===================================================================
--- /trunk/src/VBox/Devices/Graphics/BIOS/vbe.c	(revision 33040)
+++ /trunk/src/VBox/Devices/Graphics/BIOS/vbe.c	(revision 33041)
@@ -44,6 +44,15 @@
 //#define VBE2_NO_VESA_CHECK
 
-// use bytewise i/o by default (Longhorn beta issue, not in released Vista)
-#define VBE_BYTEWISE_IO
+// use bytewise i/o (Longhorn beta issue, not in released Vista)
+//#define VBE_BYTEWISE_IO
+
+#ifdef VBE_BYTEWISE_IO
+    #define in_ax_dx    call do_in_ax_dx
+    #define out_dx_ax   call do_out_dx_ax
+#else
+    #define in_ax_dx    in  ax, dx
+    #define out_dx_ax   out dx, ax
+#endif
+
 
 // Use VBE new dynamic mode list.  Note that without this option, no
@@ -240,5 +249,5 @@
 ;; Bytewise in/out
 #ifdef VBE_BYTEWISE_IO
-out_dx_ax:
+do_out_dx_ax:
   xchg ah, al
   out  dx, al
@@ -247,5 +256,5 @@
   ret
 
-in_ax_dx:
+do_in_ax_dx:
   in   al, dx
   xchg ah, al
@@ -260,15 +269,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_ID
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   pop  dx
   ret
@@ -279,16 +280,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_ID
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  pop  ax
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
+  pop  ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  out_dx_ax
   pop  dx
   ret
@@ -306,16 +299,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_XRES
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
   mov  dx, # VBE_DISPI_IOPORT_DATA
   mov  ax, 4[bp] ; xres
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
   pop  dx
   pop  ax
@@ -336,16 +321,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_YRES
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
   mov  dx, # VBE_DISPI_IOPORT_DATA
   mov  ax, 4[bp] ; yres
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
   pop  dx
   pop  ax
@@ -370,16 +347,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_BPP
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
   mov  dx, # VBE_DISPI_IOPORT_DATA
   mov  ax, 4[bp] ; bpp
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
   pop  dx
   pop  ax
@@ -398,15 +367,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_BPP
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   cmp  al, #4
   jbe  get_bpp_noinc
@@ -431,15 +392,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_XRES
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   push ax
   mov  ax, bx
@@ -459,15 +412,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_BPP
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   push ax
   mov  ax, bx
@@ -483,16 +428,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_ENABLE
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  pop  ax
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
+  pop  ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  out_dx_ax
   pop  dx
   ret
@@ -502,15 +439,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_ENABLE
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   pop  dx
   ret
@@ -521,16 +450,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_BANK
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  pop  ax
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
+  pop  ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  out_dx_ax
   pop  dx
   ret
@@ -540,15 +461,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_BANK
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   pop  dx
   ret
@@ -567,21 +480,9 @@
   mov ax,# VBE_DISPI_INDEX_BANK
   mov dx,# VBE_DISPI_IOPORT_INDEX
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out dx,ax
-#endif
+  out_dx_ax
   pop ax
   mov dx,# VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out dx,ax
-#endif
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in  ax,dx
-#endif
+  out_dx_ax
+  in_ax_dx
   pop dx
   cmp dx,ax
@@ -592,15 +493,7 @@
   mov ax,# VBE_DISPI_INDEX_BANK
   mov dx,# VBE_DISPI_IOPORT_INDEX
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out dx,ax
-#endif
+  out_dx_ax
   mov dx,# VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in ax,dx
-#endif
+  in_ax_dx
   mov dx,ax
   retf
@@ -617,16 +510,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_X_OFFSET
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  pop  ax
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
+  pop  ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  out_dx_ax
   pop  dx
   ret
@@ -636,15 +521,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_X_OFFSET
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   pop  dx
   ret
@@ -655,16 +532,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_Y_OFFSET
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  pop  ax
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
+  pop  ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  out_dx_ax
   pop  dx
   ret
@@ -674,15 +543,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_Y_OFFSET
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   pop  dx
   ret
@@ -702,9 +563,5 @@
   mov  ah, bl
   mov  al, #0x13
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
   out  dx, ax
-#endif
   pop  dx
   pop  bx
@@ -718,16 +575,8 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_VIRT_WIDTH
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  pop  ax
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
+  out_dx_ax
+  pop  ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  out_dx_ax
   pop  dx
   ret
@@ -737,15 +586,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_VIRT_WIDTH
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   pop  dx
   ret
@@ -755,15 +596,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_VIRT_HEIGHT
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   pop  dx
   ret
@@ -776,23 +609,11 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_XRES
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   push ax
   mov  dx, # VGAREG_VGA_CRTC_ADDRESS
   mov  ax, #0x0011
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
   out  dx, ax
-#endif
   pop  ax
   push ax
@@ -801,9 +622,5 @@
   mov  ah, al
   mov  al, #0x01
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
   out  dx, ax
-#endif
   pop  ax
   call vga_set_virt_width
@@ -812,15 +629,7 @@
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_YRES
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   dec  ax
   push ax
@@ -828,9 +637,5 @@
   mov  ah, al
   mov  al, #0x12
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
   out  dx, ax
-#endif
   pop  ax
   mov  al, #0x07
@@ -852,9 +657,5 @@
   mov  dx, # VGAREG_VGA_CRTC_ADDRESS
   mov  ax, #0x0009
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
   out  dx, ax
-#endif
   mov  al, #0x17
   out  dx, al
@@ -877,31 +678,15 @@
   mov  dx, # VGAREG_GRDC_ADDRESS
   mov  ax, #0x0506
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
   out  dx, ax
-#endif
   mov  dx, # VGAREG_SEQU_ADDRESS
   mov  ax, #0x0f02
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
   out  dx, ax
-#endif
 
   ; settings for >= 8bpp
   mov  dx, # VBE_DISPI_IOPORT_INDEX
   mov  ax, # VBE_DISPI_INDEX_BPP
-#ifdef VBE_BYTEWISE_IO
-  call out_dx_ax
-#else
-  out  dx, ax
-#endif
-  mov  dx, # VBE_DISPI_IOPORT_DATA
-#ifdef VBE_BYTEWISE_IO
-  call in_ax_dx
-#else
-  in   ax, dx
-#endif
+  out_dx_ax
+  mov  dx, # VBE_DISPI_IOPORT_DATA
+  in_ax_dx
   cmp  al, #0x08
   jb   vga_compat_end
Index: /trunk/src/VBox/Devices/Graphics/DevVGA.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA.cpp	(revision 33040)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA.cpp	(revision 33041)
@@ -71,5 +71,5 @@
 #define VGASTATE2DEVINS(pVgaState)    ((pVgaState)->CTX_SUFF(pDevIns))
 
-/** Use VBE bytewise I/O. Only needed for Windows Longhorn/Vista betas. */
+/** Use VBE bytewise I/O. Only needed for Windows Longhorn/Vista betas and backwards compatibility. */
 #define VBE_BYTEWISE_IO