X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4ba76501152d51ccb5647018f3192c6096367d48..f427ee49d309d8fc33ebf3042c3a775f2f530ded:/EXTERNAL_HEADERS/img4/api.h?ds=sidebyside

diff --git a/EXTERNAL_HEADERS/img4/api.h b/EXTERNAL_HEADERS/img4/api.h
index 861f4e38e..8e3bac797 100644
--- a/EXTERNAL_HEADERS/img4/api.h
+++ b/EXTERNAL_HEADERS/img4/api.h
@@ -6,15 +6,16 @@
 #define __IMG4_API_H
 
 #ifndef __IMG4_INDIRECT
-#error "Please #include <img4/img4.h> instead of this file directly"
+#error "Please #include <img4/firmware.h> instead of this file directly"
 #endif // __IMG4_INDIRECT
 
-#if IMG4_TAPI
 #include <stdint.h>
-#endif
+#include <stdbool.h>
+#include <os/base.h>
 
 #ifndef KERNEL
 #include <os/availability.h>
+#include <unistd.h>
 #endif
 
 #if !XNU_KERNEL_PRIVATE
@@ -40,38 +41,116 @@
  * individual preprocessor macros in this header that declare new behavior as
  * required.
  */
-#define IMG4_API_VERSION (20191001u)
+#define IMG4_API_VERSION (20200724u)
 
-#if !defined(KERNEL) && !IMG4_PROJECT_BUILD
+#if IMG4_TAPI || (!defined(KERNEL) && !IMG4_PROJECT_BUILD)
 #define IMG4_API_AVAILABLE_20180112 \
-		__API_UNAVAILABLE(macos) \
-		API_AVAILABLE(ios(12.0), tvos(12.0), watchos(5.0))
+		API_AVAILABLE( \
+			macos(10.15), \
+			ios(12.0), \
+			tvos(12.0), \
+			watchos(5.0))
+
+#define IMG4_API_AVAILABLE_20180112_DEPRECATED \
+		API_DEPRECATED_WITH_REPLACEMENT( \
+			"img4_firmware_t", \
+			macos(10.15, 11.0), \
+			ios(12.0, 14.0), \
+			tvos(12.0, 14.0), \
+			watchos(5.0, 7.0))
 #define IMG4_API_AVAILABLE_20181004 \
-		__API_UNAVAILABLE(macos) \
-		API_AVAILABLE(ios(12.2), tvos(12.2), watchos(5.2))
+		API_DEPRECATED_WITH_REPLACEMENT( \
+			"img4_firmware_t", \
+			macos(10.15, 11.0), \
+			ios(12.2, 14.0), \
+			tvos(12.2, 14.0), \
+			watchos(5.2, 7.0))
+
+// This API version introduced the nonce manager which was not deprecated when
+// the new API was introduced.
 #define IMG4_API_AVAILABLE_20181106 \
-		__API_UNAVAILABLE(macos) \
-		API_AVAILABLE(ios(12.2), tvos(12.2), watchos(5.2))
+		API_AVAILABLE( \
+			macos(10.15), \
+			ios(12.2), \
+			tvos(12.2), \
+			watchos(5.2))
+#define IMG4_API_AVAILABLE_20181106_DEPRECATED \
+		API_DEPRECATED_WITH_REPLACEMENT( \
+			"img4_firmware_t", \
+			macos(10.15, 11.0), \
+			ios(12.2, 14.0), \
+			tvos(12.2, 14.0), \
+			watchos(5.2, 7.0))
 #define IMG4_API_AVAILABLE_20190125 \
-		API_AVAILABLE(macos(10.15), ios(13.0), tvos(13.0), watchos(6.0))
+		API_DEPRECATED_WITH_REPLACEMENT( \
+			"img4_firmware_t", \
+			macos(10.15, 11.0), \
+			ios(13.0, 14.0), \
+			tvos(13.0, 14.0), \
+			watchos(6.0, 7.0))
 #define IMG4_API_AVAILABLE_20191001 \
-		API_AVAILABLE(macos(10.15.2), ios(13.3), tvos(13.3), watchos(6.1.1))
+		API_DEPRECATED_WITH_REPLACEMENT( \
+			"img4_firmware_t", \
+			macos(10.15.2, 11.0), \
+			ios(13.3, 14.0), \
+			tvos(13.3, 14.0), \
+			watchos(6.1.1, 7.0))
+#define IMG4_API_AVAILABLE_20191108 \
+		API_DEPRECATED_WITH_REPLACEMENT( \
+			"img4_firmware_t", \
+			macos(11.0, 11.0), \
+			ios(14.0, 14.0), \
+			tvos(14.0, 14.0), \
+			watchos(7.0, 7.0))
+#define IMG4_API_AVAILABLE_20200221 \
+		API_DEPRECATED_WITH_REPLACEMENT( \
+			"img4_firmware_t", \
+			macos(11.0, 11.0), \
+			ios(14.0, 14.0), \
+			tvos(14.0, 14.0), \
+			watchos(7.0, 7.0))
+#define IMG4_API_AVAILABLE_20200310 \
+		API_DEPRECATED_WITH_REPLACEMENT( \
+			"img4_firmware_t", \
+			macos(11.0, 11.0), \
+			ios(14.0, 14.0), \
+			tvos(14.0, 14.0), \
+			watchos(7.0, 7.0))
+#define IMG4_API_AVAILABLE_20200508 \
+		API_AVAILABLE( \
+			macos(11.0), \
+			ios(14.0), \
+			tvos(14.0), \
+			watchos(7.0), \
+			bridgeos(5.0))
+#define IMG4_API_AVAILABLE_20200608 \
+		API_AVAILABLE( \
+			macos(11.0), \
+			ios(14.0), \
+			tvos(14.0), \
+			watchos(7.0), \
+			bridgeos(5.0))
+#define IMG4_API_AVAILABLE_20200724 \
+		API_AVAILABLE( \
+			macos(11.0), \
+			ios(14.0), \
+			tvos(14.0), \
+			watchos(7.0), \
+			bridgeos(5.0))
 #else
 #define IMG4_API_AVAILABLE_20180112
+#define IMG4_API_AVAILABLE_20180112_DEPRECATED
 #define IMG4_API_AVAILABLE_20181004
 #define IMG4_API_AVAILABLE_20181106
+#define IMG4_API_AVAILABLE_20181106_DEPRECATED
 #define IMG4_API_AVAILABLE_20190125
 #define IMG4_API_AVAILABLE_20191001
-#endif // !defined(KERNEL) && !IMG4_PROJECT_BUILD
-
-#if !defined(OS_CLOSED_ENUM)
-#define OS_CLOSED_ENUM(_name, _type, ...) \
-		OS_ENUM(_name, _type, ## __VA_ARGS__)
-#endif
-
-#if !defined(OS_CLOSED_OPTIONS)
-#define OS_CLOSED_OPTIONS(_name, _type, ...) \
-		OS_ENUM(_name, _type, ## __VA_ARGS__)
+#define IMG4_API_AVAILABLE_20191108
+#define IMG4_API_AVAILABLE_20200221
+#define IMG4_API_AVAILABLE_20200310
+#define IMG4_API_AVAILABLE_20200508
+#define IMG4_API_AVAILABLE_20200608
+#define IMG4_API_AVAILABLE_20200724
 #endif
 
 /*!