Index: /trunk/src/VBox/Devices/PC/BIOS/inlines.h
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/inlines.h	(revision 58818)
+++ /trunk/src/VBox/Devices/PC/BIOS/inlines.h	(revision 58819)
@@ -118,8 +118,8 @@
 #pragma aux rep_outsd = ".386" "rep outs dx,dword ptr es:[si]" parm [es si] [cx] [dx] value [es si] modify exact [cx si];
 
-uint16_t __far swap_16(uint16_t val);
+uint16_t swap_16(uint16_t val);
 #pragma aux swap_16 = "xchg ah,al" parm [ax] value [ax] modify exact [ax] nomemory;
 
-uint32_t __far swap_32(uint32_t val);
+uint32_t swap_32(uint32_t val);
 #pragma aux swap_32 =   \
     "xchg   ah, al"     \
@@ -128,3 +128,13 @@
     parm [dx ax] value [dx ax] modify exact [dx ax] nomemory;
 
+uint64_t swap_64(uint64_t val);
+#pragma aux swap_64 =   \
+    "xchg   ah, al"     \
+    "xchg   bh, bl"     \
+    "xchg   ch, cl"     \
+    "xchg   dh, dl"     \
+    "xchg   ax, dx"     \
+    "xchg   bx, cx"     \
+    parm [ax bx cx dx] value [ax bx cx dx] modify exact [ax bx cx dx] nomemory;
+
 #endif
Index: /trunk/src/VBox/Devices/PC/BIOS/scsi.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/scsi.c	(revision 58818)
+++ /trunk/src/VBox/Devices/PC/BIOS/scsi.c	(revision 58819)
@@ -195,15 +195,4 @@
 
     return 0;
-}
-
-static uint64_t swap_64(uint64_t val)
-{
-    uint64_t rval;
-
-    rval = swap_32(val & 0xffffffff);
-    rval <<= 32;
-    rval |= swap_32(val >> 32);
-
-    return rval;
 }