Changeset 58767 in vbox

Timestamp:

Nov 19, 2015 1:30:30 PM (9 years ago)

Author:

vboxsync

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

104211

Message:

revered r104210, got unfinished asm.h changes mixed into it.

Location:

trunk

Files:

• include/iprt/asm.h (modified) (3 diffs)
• include/iprt/file.h (modified) (2 diffs)
• src/VBox/Runtime/r3/win/fileio-win.cpp (modified) (1 diff)

trunk/include/iprt/asm.h

@@ -4797 +4797 @@
  * @returns 0 if all bits are cleared.
  * @param   u32     Integer to search for set bits.
- * @remarks Similar to ffs() in BSD.
+ * @remark  Similar to ffs() in BSD.
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
@@ -4856 +4856 @@
 
 /**
- * Finds the first bit which is set in the given 16-bit integer.
- *
- * Bits are numbered from 1 (least significant) to 16.
- *
- * @returns index [1..16] of the first set bit.
- * @returns 0 if all bits are cleared.
- * @param   u16     Integer to search for set bits.
- * @remarks For 16-bit bs3kit code.
- */
-#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-DECLASM(unsigned) ASMBitFirstSetU16(uint32_t u16);
-#else
-DECLINLINE(unsigned) ASMBitFirstSetU16(uint32_t u16)
-{
-    return ASMBitFirstSetU32((uint32_t)u16);
-}
-#endif
-
-
-/**
  * Finds the last bit which is set in the given 32-bit integer.
  * Bits are numbered from 1 (least significant) to 32.
@@ -4938 +4918 @@
     return ASMBitLastSetU32((uint32_t)i32);
 }
-
-
-/**
- * Finds the last bit which is set in the given 16-bit integer.
- *
- * Bits are numbered from 1 (least significant) to 16.
- *
- * @returns index [1..16] of the last set bit.
- * @returns 0 if all bits are cleared.
- * @param   u16     Integer to search for set bits.
- * @remarks For 16-bit bs3kit code.
- */
-#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-DECLASM(unsigned) ASMBitLastSetU16(uint32_t u16);
-#else
-DECLINLINE(unsigned) ASMBitLastSetU16(uint32_t u16)
-{
-    return ASMBitLastSetU32((uint32_t)u16);
-}
-#endif
-
 
 /**

trunk/include/iprt/file.h

@@ -98 +98 @@
 /** @name Open flags
  * @{ */
-/** Attribute access only.
- * @remarks Only accepted on windows, requires RTFILE_O_ACCESS_ATTR_MASK
- *          to yield a non-zero result.  Otherwise, this is invalid. */
-#define RTFILE_O_ATTR_ONLY              UINT32_C(0x00000000)
 /** Open the file with read access. */
 #define RTFILE_O_READ                   UINT32_C(0x00000001)
@@ -109 +105 @@
 #define RTFILE_O_READWRITE              UINT32_C(0x00000003)
 /** The file access mask.
- * @remarks The value 0 is invalid, except for windows special case. */
+ * @remarks The value 0 is invalid. */
 #define RTFILE_O_ACCESS_MASK            UINT32_C(0x00000003)
 

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -213 +213 @@
                             : FILE_GENERIC_READ | FILE_GENERIC_WRITE;
             break;
-        case RTFILE_O_ATTR_ONLY:
-            if (fOpen & RTFILE_O_ACCESS_ATTR_MASK)
-            {
-                dwDesiredAccess = 0;
-                break;
-            }
-            /* fall thru */
         default:
             AssertMsgFailed(("Impossible fOpen=%#llx\n", fOpen));