Changeset 101222 in vbox for trunk

Timestamp:

Sep 21, 2023 2:41:09 PM (19 months ago)

Author:

vboxsync

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

159200

Message:

iprt/cdefs.h,DevSmc.cpp: Added RT_MAKE_U32_FROM_MSB_U8 to deal with the 'OSK0'/'OSK1' compiler warnings. Also added RT_MAKE_U64_FROM_MSB_U8 and RT_MAKE_U64_FROM_MSW_U16 completeness.

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (5 diffs)
• src/VBox/Devices/EFI/DevSmc.cpp (modified) (1 diff)

trunk/include/iprt/cdefs.h

@@ -3234 +3234 @@
 
 /** @def RT_MAKE_U64_FROM_U16
- * Constructs a uint64_t value from four uint16_t values.
+ * Constructs a uint64_t value from four uint16_t values, with parameters in
+ * least significant word first order.
+ * @see RT_MAKE_U64_FROM_MSW_U16
  */
 #define RT_MAKE_U64_FROM_U16(w0, w1, w2, w3) \
@@ -3242 +3244 @@
                 |            (uint16_t)(w0) ))
 
+/** @def RT_MAKE_U64_FROM_U16
+ * Constructs a uint64_t value from four uint16_t values, with parameters in
+ * most significant word first order.
+ * @see RT_MAKE_U64_FROM_U16
+ */
+#define RT_MAKE_U64_FROM_MSW_U16(w3, w2, w1, w0) RT_MAKE_U64_FROM_U16(w0, w1, w2, w3)
+
 /** @def RT_MAKE_U64_FROM_U8
- * Constructs a uint64_t value from eight uint8_t values.
+ * Constructs a uint64_t value from eight uint8_t values, with parameters in
+ * least significant byte first order.
+ * @see RT_MAKE_U64_FROM_MSB_U8
  */
 #define RT_MAKE_U64_FROM_U8(b0, b1, b2, b3, b4, b5, b6, b7) \
@@ -3255 +3266 @@
                 | (uint64_t) (uint8_t)(b0) ))
 
+/** @def RT_MAKE_U64_FROM_MSB_U8
+ * Constructs a uint64_t value from eight uint8_t values, with parameters in
+ * most significant byte first order.
+ * @see RT_MAKE_U64_FROM_U8
+ */
+#define RT_MAKE_U64_FROM_MSB_U8(b7, b6, b5, b4, b3, b2, b1, b0) RT_MAKE_U64_FROM_U8(b0, b1, b2, b3, b4, b5, b6, b7)
+
 /** @def RT_MAKE_U32
  * Constructs a uint32_t value from two uint16_t values.
@@ -3263 +3281 @@
 
 /** @def RT_MAKE_U32_FROM_U8
- * Constructs a uint32_t value from four uint8_t values.
+ * Constructs a uint32_t value from four uint8_t values, with parameters in
+ * least significant byte first order.
+ * @see RT_MAKE_U32_FROM_MSB_U8
  */
 #define RT_MAKE_U32_FROM_U8(b0, b1, b2, b3) \
@@ -3270 +3290 @@
                 | (uint32_t)((uint8_t)(b1)) << 8 \
                 |            (uint8_t)(b0) ))
+
+/** @def RT_MAKE_U32_FROM_MSB_U8
+ * Constructs a uint32_t value from four uint8_t values, with parameters in most
+ * significant byte first order.
+ * @see RT_MAKE_U32_FROM_8
+ */
+#define RT_MAKE_U32_FROM_MSB_U8(b3, b2, b1, b0) RT_MAKE_U32_FROM_U8(b0, b1, b2, b3)
 
 /** @def RT_MAKE_U16

trunk/src/VBox/Devices/EFI/DevSmc.cpp

@@ -563 +563 @@
     for (int i = 0; i < 2; i++)
     {
-        inputStruct.key = (uint32_t)(i == 0 ? 'OSK0' : 'OSK1');
+        inputStruct.key = i == 0 ? RT_MAKE_U32_FROM_MSB_U8('O','S','K','0') : RT_MAKE_U32_FROM_MSB_U8('O','S','K','1');
         kr = IOConnectCallStructMethod((mach_port_t)port,
                                        (uint32_t)2,