fw_info: Remove EXT_API_FUNCTION()

To make docs work. Also to remove a level of indirection that could be
confusing.

Signed-off-by: Øyvind Rønningstad <[email protected]>

Author: oyvindronningstad

include/bl_crypto.h

@@ -70,11 +70,20 @@ int bl_crypto_init(void);
  *
  * @remark No parameter can be NULL.
  */
-EXT_API_FUNCTION(int, bl_root_of_trust_verify, const u8_t *public_key,
-					       const u8_t *public_key_hash,
-					       const u8_t *signature,
-					       const u8_t *firmware,
-					       const u32_t firmware_len);
+int bl_root_of_trust_verify(const u8_t *public_key,
+			    const u8_t *public_key_hash,
+			    const u8_t *signature,
+			    const u8_t *firmware,
+			    const u32_t firmware_len);
+
+/* Typedef for use in EXT_API declaration */
+typedef int (*bl_root_of_trust_verify_t)(
+			    const u8_t *public_key,
+			    const u8_t *public_key_hash,
+			    const u8_t *signature,
+			    const u8_t *firmware,
+			    const u32_t firmware_len);
+
 
 /**
  * @brief Implementation of rot_verify that is safe to be called from EXT_API.
@@ -87,6 +96,7 @@ int bl_root_of_trust_verify_external(const u8_t *public_key,
 				     const u8_t *firmware,
 				     const u32_t firmware_len);
 
+
 /**
  * @brief Initialize a sha256 operation context variable.
  *
@@ -95,7 +105,11 @@ int bl_root_of_trust_verify_external(const u8_t *public_key,
  * @retval 0         On success.
  * @retval -EINVAL   If @p ctx was NULL.
  */
-EXT_API_FUNCTION(int, bl_sha256_init, bl_sha256_ctx_t *ctx);
+int bl_sha256_init(bl_sha256_ctx_t *ctx);
+
+/* Typedef for use in EXT_API declaration */
+typedef int (*bl_sha256_init_t)(bl_sha256_ctx_t *ctx);
+
 
 /**
  * @brief Hash a portion of data.
@@ -113,9 +127,12 @@ EXT_API_FUNCTION(int, bl_sha256_init, bl_sha256_ctx_t *ctx);
  * @retval -EINVAL   If @p ctx was NULL, uninitialized, or corrupted.
  * @retval -ENOSYS   If the context has already been finalized.
  */
-EXT_API_FUNCTION(int, bl_sha256_update, bl_sha256_ctx_t *ctx,
-					const u8_t *data,
-					u32_t data_len);
+int bl_sha256_update(bl_sha256_ctx_t *ctx, const u8_t *data, u32_t data_len);
+
+/* Typedef for use in EXT_API declaration */
+typedef int (*bl_sha256_update_t)(bl_sha256_ctx_t *ctx, const u8_t *data,
+				u32_t data_len);
+
 
 /**
  * @brief Finalize a hash result.
@@ -127,8 +144,11 @@ EXT_API_FUNCTION(int, bl_sha256_update, bl_sha256_ctx_t *ctx,
  * @retval 0         On success.
  * @retval -EINVAL   If @p ctx was NULL or corrupted, or @p output was NULL.
  */
-EXT_API_FUNCTION(int, bl_sha256_finalize, bl_sha256_ctx_t *ctx,
-					  u8_t *output);
+int bl_sha256_finalize(bl_sha256_ctx_t *ctx, u8_t *output);
+
+/* Typedef for use in EXT_API declaration */
+typedef int (*bl_sha256_finalize_t)(bl_sha256_ctx_t *ctx, u8_t *output);
+
 
 /**
  * @brief Calculate a digest and verify it directly.
@@ -143,9 +163,12 @@ EXT_API_FUNCTION(int, bl_sha256_finalize, bl_sha256_ctx_t *ctx,
  * @return Any error code from @ref bl_sha256_init, @ref bl_sha256_update, or
  *         @ref bl_sha256_finalize if something else went wrong.
  */
-EXT_API_FUNCTION(int, bl_sha256_verify, const u8_t *data,
-					u32_t data_len,
-					const u8_t *expected);
+int bl_sha256_verify(const u8_t *data, u32_t data_len, const u8_t *expected);
+
+/* Typedef for use in EXT_API declaration */
+typedef int (*bl_sha256_verify_t)(const u8_t *data, u32_t data_len,
+				const u8_t *expected);
+
 
 /**
  * @brief Validate a secp256r1 signature.
@@ -160,10 +183,18 @@ EXT_API_FUNCTION(int, bl_sha256_verify, const u8_t *data,
  * @retval -EINVAL   A parameter was NULL, or the @hash_len was not 32 bytes.
  * @retval -ESIGINV  The signature validation failed.
  */
-EXT_API_FUNCTION(int, bl_secp256r1_validate, const u8_t *hash,
-					     u32_t hash_len,
-					     const u8_t *signature,
-					     const u8_t *public_key);
+int bl_secp256r1_validate(const u8_t *hash,
+			  u32_t hash_len,
+			  const u8_t *signature,
+			  const u8_t *public_key);
+
+/* Typedef for use in EXT_API declaration */
+typedef int (*bl_secp256r1_validate_t)(
+			  const u8_t *hash,
+			  u32_t hash_len,
+			  const u8_t *signature,
+			  const u8_t *public_key);
+
 
 struct bl_rot_verify_ext_api {
 	struct fw_info_ext_api header;

include/bl_validation.h

@@ -47,6 +47,13 @@ struct bl_validate_fw_ext_api {
  * @retval  true   if the image is valid
  * @retval  false  if the image is invalid
  */
+bool bl_validate_firmware(u32_t fw_dst_address, u32_t fw_src_address);
+
+/* Typedef for use in EXT_API declaration */
+typedef
+bool (*bl_validate_firmware_t)(u32_t fw_dst_address, u32_t fw_src_address);
+
+
 bool bl_validate_firmware_local(u32_t fw_address,
 				const struct fw_info *fwinfo);
 

include/fw_info.h

@@ -120,14 +120,6 @@ static inline const struct fw_info_ext_api *fw_info_ext_api_check(
 }
 
 
-/* Shorthand for declaring function that will be exposed through an EXT_API.
- * This will define a function pointer type as well as declare the function.
- */
-#define EXT_API_FUNCTION(retval, name, ...) \
-	typedef retval(*name ## _t)(__VA_ARGS__); \
-	retval name(__VA_ARGS__)
-
-
 /**
  * A struct that is used to request an EXT_API.
  *

include/fw_info.rst

@@ -126,6 +126,8 @@ To create an EXT_API, complete the following steps:
 
    .. code-block:: c
 
+      typedef int (*my_ext_api_foo_t)(bool arg1, int *arg2);
+
       struct my_ext_api {
       	struct fw_info_ext_api header;
       	struct {
@@ -152,12 +154,6 @@ To create an EXT_API, complete the following steps:
       };
       #endif
 
-#. To include function pointers in your EXT_API, call the :c:macro:`EXT_API_FUNCTION` macro to forward-declare the function and create a typedef for the function pointer:
-
-   .. code-block:: c
-
-      EXT_API_FUNCTION(int, my_ext_api_foo, bool arg1, int *arg2);
-
 #. Enable the EXT_API in Kconfig:
 
    .. code-block:: none