Rename macros and types to namespace their usage

Macros and types have been renamed accordingly to namespace them by
their usage in the new kernel driver source tree structure.

This is done in a separate commit from the restructuring to avoid Git
from seeing some of the moved files as new ones because they have been
both moved and modified at the same time and thus losing the connection
in the history.

Change-Id: Icd4d8e8c76779479b5b46a55bf1d4f78a629c281
Signed-off-by: Mikael Olsson <mikael.olsson@arm.com>

1 files changed, 97 insertions, 96 deletions

diff --git a/kernel/include/rpmsg/ethosu_rpmsg.h b/kernel/include/rpmsg/ethosu_rpmsg.h
index c1923c2..0be323e 100644
--- a/kernel/include/rpmsg/ethosu_rpmsg.h
+++ b/kernel/include/rpmsg/ethosu_rpmsg.h
@@ -17,8 +17,8 @@
  * http://www.gnu.org/licenses/gpl-2.0.html.
  */
 
-#ifndef ETHOSU_CORE_RPMSG_H
-#define ETHOSU_CORE_RPMSG_H
+#ifndef ETHOSU_RPMSG_H
+#define ETHOSU_RPMSG_H
 
 #ifdef __KERNEL__
 #include <linux/types.h>
@@ -31,137 +31,138 @@ namespace EthosU {
 #endif
 
 /** Maximum number of IFM/OFM buffers per inference */
-#define ETHOSU_CORE_BUFFER_MAX 16
+#define ETHOSU_RPMSG_BUFFER_MAX 16
 
 /** Maximum number of PMU counters to be returned for inference */
-#define ETHOSU_CORE_PMU_MAX 8
+#define ETHOSU_RPMSG_PMU_MAX 8
 
-#define ETHOSU_CORE_MSG_MAGIC 0x41457631
-#define ETHOSU_CORE_MSG_VERSION_MAJOR 0
-#define ETHOSU_CORE_MSG_VERSION_MINOR 2
-#define ETHOSU_CORE_MSG_VERSION_PATCH 0
+#define ETHOSU_RPMSG_MAGIC 0x41457631
+#define ETHOSU_RPMSG_VERSION_MAJOR 0
+#define ETHOSU_RPMSG_VERSION_MINOR 2
+#define ETHOSU_RPMSG_VERSION_PATCH 0
 
 /**
- * enum ethosu_core_msg_type - Message types
+ * enum ethosu_rpmsg_type - Message types
  *
  * Types for the messages sent between the host and the core subsystem.
  */
-enum ethosu_core_msg_type {
-	ETHOSU_CORE_MSG_ERR = 1,
-	ETHOSU_CORE_MSG_PING,
-	ETHOSU_CORE_MSG_PONG,
-	ETHOSU_CORE_MSG_INFERENCE_REQ,
-	ETHOSU_CORE_MSG_INFERENCE_RSP,
-	ETHOSU_CORE_MSG_VERSION_REQ,
-	ETHOSU_CORE_MSG_VERSION_RSP,
-	ETHOSU_CORE_MSG_CAPABILITIES_REQ,
-	ETHOSU_CORE_MSG_CAPABILITIES_RSP,
-	ETHOSU_CORE_MSG_NETWORK_INFO_REQ,
-	ETHOSU_CORE_MSG_NETWORK_INFO_RSP,
-	ETHOSU_CORE_MSG_CANCEL_INFERENCE_REQ,
-	ETHOSU_CORE_MSG_CANCEL_INFERENCE_RSP,
-	ETHOSU_CORE_MSG_MAX
+enum ethosu_rpmsg_type {
+	ETHOSU_RPMSG_ERR = 1,
+	ETHOSU_RPMSG_PING,
+	ETHOSU_RPMSG_PONG,
+	ETHOSU_RPMSG_INFERENCE_REQ,
+	ETHOSU_RPMSG_INFERENCE_RSP,
+	ETHOSU_RPMSG_VERSION_REQ,
+	ETHOSU_RPMSG_VERSION_RSP,
+	ETHOSU_RPMSG_CAPABILITIES_REQ,
+	ETHOSU_RPMSG_CAPABILITIES_RSP,
+	ETHOSU_RPMSG_NETWORK_INFO_REQ,
+	ETHOSU_RPMSG_NETWORK_INFO_RSP,
+	ETHOSU_RPMSG_CANCEL_INFERENCE_REQ,
+	ETHOSU_RPMSG_CANCEL_INFERENCE_RSP,
+	ETHOSU_RPMSG_MAX
 };
 
 /**
- * struct ethosu_core_msg_header - Message header
+ * struct ethosu_rpmsg_header - Message header
  */
-struct ethosu_core_msg_header {
+struct ethosu_rpmsg_header {
 	uint32_t magic;
 	uint32_t type;
 	uint64_t msg_id;
 };
 
 /**
- * enum ethosu_core_status - Status
+ * enum ethosu_rpmsg_status - Status
  */
-enum ethosu_core_status {
-	ETHOSU_CORE_STATUS_OK,
-	ETHOSU_CORE_STATUS_ERROR,
-	ETHOSU_CORE_STATUS_RUNNING,
-	ETHOSU_CORE_STATUS_REJECTED,
-	ETHOSU_CORE_STATUS_ABORTED,
-	ETHOSU_CORE_STATUS_ABORTING,
+enum ethosu_rpmsg_status {
+	ETHOSU_RPMSG_STATUS_OK,
+	ETHOSU_RPMSG_STATUS_ERROR,
+	ETHOSU_RPMSG_STATUS_RUNNING,
+	ETHOSU_RPMSG_STATUS_REJECTED,
+	ETHOSU_RPMSG_STATUS_ABORTED,
+	ETHOSU_RPMSG_STATUS_ABORTING,
 };
 
 /**
- * struct ethosu_core_buffer - Buffer descriptor
+ * struct ethosu_rpmsg_buffer - Buffer descriptor
  *
  * Pointer and size to a buffer within the Ethos-U address space.
  */
-struct ethosu_core_buffer {
+struct ethosu_rpmsg_buffer {
 	uint32_t ptr;
 	uint32_t size;
 };
 
 /**
- * enum ethosu_core_network_type - Network buffer type
+ * enum ethosu_rpmsg_network_type - Network buffer type
  */
-enum ethosu_core_network_type {
-	ETHOSU_CORE_NETWORK_BUFFER = 1,
-	ETHOSU_CORE_NETWORK_INDEX
+enum ethosu_rpmsg_network_type {
+	ETHOSU_RPMSG_NETWORK_BUFFER = 1,
+	ETHOSU_RPMSG_NETWORK_INDEX
 };
 
 /**
- * struct ethosu_core_network_buffer - Network buffer
+ * struct ethosu_rpmsg_network_buffer - Network buffer
  */
-struct ethosu_core_network_buffer {
+struct ethosu_rpmsg_network_buffer {
 	uint32_t type;
 	union {
-		struct ethosu_core_buffer buffer;
-		uint32_t                  index;
+		struct ethosu_rpmsg_buffer buffer;
+		uint32_t                   index;
 	};
 };
 
 /**
- * struct ethosu_core_msg_inference_req - Inference request
+ * struct ethosu_rpmsg_inference_req - Inference request
  */
-struct ethosu_core_msg_inference_req {
-	uint32_t                          ifm_count;
-	struct ethosu_core_buffer         ifm[ETHOSU_CORE_BUFFER_MAX];
-	uint32_t                          ofm_count;
-	struct ethosu_core_buffer         ofm[ETHOSU_CORE_BUFFER_MAX];
-	struct ethosu_core_network_buffer network;
-	uint8_t                           pmu_event_config[ETHOSU_CORE_PMU_MAX];
-	uint32_t                          pmu_cycle_counter_enable;
+struct ethosu_rpmsg_inference_req {
+	uint32_t                           ifm_count;
+	struct ethosu_rpmsg_buffer         ifm[ETHOSU_RPMSG_BUFFER_MAX];
+	uint32_t                           ofm_count;
+	struct ethosu_rpmsg_buffer         ofm[ETHOSU_RPMSG_BUFFER_MAX];
+	struct ethosu_rpmsg_network_buffer network;
+	uint8_t                            pmu_event_config[ETHOSU_RPMSG_PMU_MAX
+	];
+	uint32_t                           pmu_cycle_counter_enable;
 };
 
 /**
- * struct ethosu_core_msg_inference_rsp - Inference response
+ * struct ethosu_rpmsg_inference_rsp - Inference response
  */
-struct ethosu_core_msg_inference_rsp {
+struct ethosu_rpmsg_inference_rsp {
 	uint32_t ofm_count;
-	uint32_t ofm_size[ETHOSU_CORE_BUFFER_MAX];
+	uint32_t ofm_size[ETHOSU_RPMSG_BUFFER_MAX];
 	uint32_t status;
-	uint8_t  pmu_event_config[ETHOSU_CORE_PMU_MAX];
-	uint64_t pmu_event_count[ETHOSU_CORE_PMU_MAX];
+	uint8_t  pmu_event_config[ETHOSU_RPMSG_PMU_MAX];
+	uint64_t pmu_event_count[ETHOSU_RPMSG_PMU_MAX];
 	uint32_t pmu_cycle_counter_enable;
 	uint64_t pmu_cycle_counter_count;
 };
 
 /**
- * struct ethosu_core_msg_network_info_req - Network information request
+ * struct ethosu_rpmsg_network_info_req - Network information request
  */
-struct ethosu_core_msg_network_info_req {
-	struct ethosu_core_network_buffer network;
+struct ethosu_rpmsg_network_info_req {
+	struct ethosu_rpmsg_network_buffer network;
 };
 
 /**
- * struct ethosu_core_msg_network_info_rsp - Network information response
+ * struct ethosu_rpmsg_network_info_rsp - Network information response
  */
-struct ethosu_core_msg_network_info_rsp {
+struct ethosu_rpmsg_network_info_rsp {
 	char     desc[32];
 	uint32_t ifm_count;
-	uint32_t ifm_size[ETHOSU_CORE_BUFFER_MAX];
+	uint32_t ifm_size[ETHOSU_RPMSG_BUFFER_MAX];
 	uint32_t ofm_count;
-	uint32_t ofm_size[ETHOSU_CORE_BUFFER_MAX];
+	uint32_t ofm_size[ETHOSU_RPMSG_BUFFER_MAX];
 	uint32_t status;
 };
 
 /**
- * struct ethosu_core_msg_version_rsp - Message protocol version
+ * struct ethosu_rpmsg_version_rsp - Message protocol version
  */
-struct ethosu_core_msg_version_rsp {
+struct ethosu_rpmsg_version_rsp {
 	uint8_t major;
 	uint8_t minor;
 	uint8_t patch;
@@ -169,9 +170,9 @@ struct ethosu_core_msg_version_rsp {
 };
 
 /**
- * struct ethosu_core_msg_capabilities_rsp - Message capabilities response
+ * struct ethosu_rpmsg_capabilities_rsp - Message capabilities response
  */
-struct ethosu_core_msg_capabilities_rsp {
+struct ethosu_rpmsg_capabilities_rsp {
 	uint32_t version_status;
 	uint32_t version_minor;
 	uint32_t version_major;
@@ -188,56 +189,56 @@ struct ethosu_core_msg_capabilities_rsp {
 };
 
 /**
- * struct ethosu_core_msg_cancel_inference_req - Message cancel inference
+ * struct ethosu_rpmsg_cancel_inference_req - Message cancel inference
  * request
  */
-struct ethosu_core_msg_cancel_inference_req {
+struct ethosu_rpmsg_cancel_inference_req {
 	uint64_t inference_handle;
 };
 
 /**
- * struct ethosu_core_msg_cancel_inference_rsp - Message cancel inference
+ * struct ethosu_rpmsg_cancel_inference_rsp - Message cancel inference
  * response
  */
-struct ethosu_core_msg_cancel_inference_rsp {
+struct ethosu_rpmsg_cancel_inference_rsp {
 	uint32_t status;
 };
 
 /**
- * enum ethosu_core_err_type - Error types
+ * enum ethosu_rpmsg_err_type - Error types
  */
-enum ethosu_core_err_type {
-	ETHOSU_CORE_MSG_ERR_GENERIC = 0,
-	ETHOSU_CORE_MSG_ERR_UNSUPPORTED_TYPE,
-	ETHOSU_CORE_MSG_ERR_INVALID_PAYLOAD,
-	ETHOSU_CORE_MSG_ERR_INVALID_SIZE,
-	ETHOSU_CORE_MSG_ERR_INVALID_MAGIC,
-	ETHOSU_CORE_MSG_ERR_MAX
+enum ethosu_rpmsg_err_type {
+	ETHOSU_RPMSG_ERR_GENERIC = 0,
+	ETHOSU_RPMSG_ERR_UNSUPPORTED_TYPE,
+	ETHOSU_RPMSG_ERR_INVALID_PAYLOAD,
+	ETHOSU_RPMSG_ERR_INVALID_SIZE,
+	ETHOSU_RPMSG_ERR_INVALID_MAGIC,
+	ETHOSU_RPMSG_ERR_MAX
 };
 
 /**
- * struct ethosu_core_msg_err - Error message struct
+ * struct ethosu_rpmsg_err - Error message struct
  */
-struct ethosu_core_msg_err {
+struct ethosu_rpmsg_err {
 	uint32_t type;     /* optional use of extra error code */
 	char     msg[128];
 };
 
 /**
- * struct ethosu_core_rpmsg - Rpmsg message
+ * struct ethosu_rpmsg - Rpmsg message
  */
-struct ethosu_core_rpmsg {
-	struct ethosu_core_msg_header header;
+struct ethosu_rpmsg {
+	struct ethosu_rpmsg_header header;
 	union {
-		struct ethosu_core_msg_inference_req        inf_req;
-		struct ethosu_core_msg_inference_rsp        inf_rsp;
-		struct ethosu_core_msg_network_info_req     net_info_req;
-		struct ethosu_core_msg_network_info_rsp     net_info_rsp;
-		struct ethosu_core_msg_capabilities_rsp     cap_rsp;
-		struct ethosu_core_msg_cancel_inference_req cancel_req;
-		struct ethosu_core_msg_cancel_inference_rsp cancel_rsp;
-		struct ethosu_core_msg_version_rsp          version_rsp;
-		struct ethosu_core_msg_err                  error;
+		struct ethosu_rpmsg_inference_req        inf_req;
+		struct ethosu_rpmsg_inference_rsp        inf_rsp;
+		struct ethosu_rpmsg_network_info_req     net_info_req;
+		struct ethosu_rpmsg_network_info_rsp     net_info_rsp;
+		struct ethosu_rpmsg_capabilities_rsp     cap_rsp;
+		struct ethosu_rpmsg_cancel_inference_req cancel_req;
+		struct ethosu_rpmsg_cancel_inference_rsp cancel_rsp;
+		struct ethosu_rpmsg_version_rsp          version_rsp;
+		struct ethosu_rpmsg_err                  error;
 	};
 };
 
@@ -245,4 +246,4 @@ struct ethosu_core_rpmsg {
 } /*namespace EthosU */
 #endif
 
-#endif /* ETHOSU_CORE_RPMSG_H */
+#endif /* ETHOSU_RPMSG_H */