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>
diff --git a/kernel/common/ethosu_device.c b/kernel/common/ethosu_device.c
index f1e00ab..c14709e 100644
--- a/kernel/common/ethosu_device.c
+++ b/kernel/common/ethosu_device.c
@@ -69,12 +69,12 @@
{
struct ethosu_device *edev = dev_get_drvdata(&rpdev->dev);
struct device *dev = &edev->dev;
- struct ethosu_mailbox *mbox = &edev->mailbox;
- struct ethosu_core_rpmsg *rpmsg = data;
+ struct ethosu_rpmsg_mailbox *mbox = &edev->mailbox;
+ struct ethosu_rpmsg *rpmsg = data;
int length = len - sizeof(rpmsg->header);
int ret = 0;
- if (unlikely(rpmsg->header.magic != ETHOSU_CORE_MSG_MAGIC)) {
+ if (unlikely(rpmsg->header.magic != ETHOSU_RPMSG_MAGIC)) {
dev_warn(dev, "Msg: Error invalid message magic. magic=0x%08x",
rpmsg->header.magic);
@@ -88,7 +88,7 @@
rpmsg->header.magic, rpmsg->header.type, rpmsg->header.msg_id);
switch (rpmsg->header.type) {
- case ETHOSU_CORE_MSG_ERR:
+ case ETHOSU_RPMSG_ERR:
if (length != sizeof(rpmsg->error)) {
dev_warn(dev,
"Msg: Error message of incorrect size. size=%u, expected=%zu", length,
@@ -103,14 +103,14 @@
rproc_report_crash(rproc_get_by_child(dev), RPROC_FATAL_ERROR);
break;
- case ETHOSU_CORE_MSG_PING:
+ case ETHOSU_RPMSG_PING:
dev_dbg(dev, "Msg: Ping");
- ret = ethosu_mailbox_pong(mbox);
+ ret = ethosu_rpmsg_mailbox_pong(mbox);
break;
- case ETHOSU_CORE_MSG_PONG:
+ case ETHOSU_RPMSG_PONG:
dev_dbg(dev, "Msg: Pong");
break;
- case ETHOSU_CORE_MSG_INFERENCE_RSP:
+ case ETHOSU_RPMSG_INFERENCE_RSP:
if (length != sizeof(rpmsg->inf_rsp)) {
dev_warn(dev,
"Msg: Inference response of incorrect size. size=%u, expected=%zu", length,
@@ -123,10 +123,10 @@
"Msg: Inference response. ofm_count=%u, status=%u",
rpmsg->inf_rsp.ofm_count, rpmsg->inf_rsp.status);
- ethosu_inference_rsp(mbox, rpmsg->header.msg_id,
- &rpmsg->inf_rsp);
+ ethosu_rpmsg_inference_rsp(mbox, rpmsg->header.msg_id,
+ &rpmsg->inf_rsp);
break;
- case ETHOSU_CORE_MSG_CANCEL_INFERENCE_RSP:
+ case ETHOSU_RPMSG_CANCEL_INFERENCE_RSP:
if (length != sizeof(rpmsg->cancel_rsp)) {
dev_warn(dev,
"Msg: Cancel Inference response of incorrect size. size=%u, expected=%zu", length,
@@ -138,11 +138,11 @@
dev_dbg(dev,
"Msg: Cancel Inference response. status=%u",
rpmsg->cancel_rsp.status);
- ethosu_cancel_inference_rsp(mbox,
- rpmsg->header.msg_id,
- &rpmsg->cancel_rsp);
+ ethosu_rpmsg_cancel_inference_rsp(mbox,
+ rpmsg->header.msg_id,
+ &rpmsg->cancel_rsp);
break;
- case ETHOSU_CORE_MSG_VERSION_RSP:
+ case ETHOSU_RPMSG_VERSION_RSP:
if (length != sizeof(rpmsg->version_rsp)) {
dev_warn(dev,
"Msg: Protocol version response of incorrect size. size=%u, expected=%zu", length,
@@ -155,10 +155,10 @@
rpmsg->version_rsp.major, rpmsg->version_rsp.minor,
rpmsg->version_rsp.patch);
- ethosu_version_rsp(mbox, rpmsg->header.msg_id,
- &rpmsg->version_rsp);
+ ethosu_rpmsg_version_rsp(mbox, rpmsg->header.msg_id,
+ &rpmsg->version_rsp);
break;
- case ETHOSU_CORE_MSG_CAPABILITIES_RSP:
+ case ETHOSU_RPMSG_CAPABILITIES_RSP:
if (length != sizeof(rpmsg->cap_rsp)) {
dev_warn(dev,
"Msg: Capabilities response of incorrect size. size=%u, expected=%zu", length,
@@ -186,7 +186,7 @@
ethosu_capability_rsp(mbox, rpmsg->header.msg_id,
&rpmsg->cap_rsp);
break;
- case ETHOSU_CORE_MSG_NETWORK_INFO_RSP:
+ case ETHOSU_RPMSG_NETWORK_INFO_RSP:
if (length != sizeof(rpmsg->net_info_rsp)) {
dev_warn(dev,
"Msg: Network info response of incorrect size. size=%u, expected=%zu", length,
@@ -199,9 +199,9 @@
"Msg: Network info response. status=%u",
rpmsg->net_info_rsp.status);
- ethosu_network_info_rsp(mbox,
- rpmsg->header.msg_id,
- &rpmsg->net_info_rsp);
+ ethosu_rpmsg_network_info_rsp(mbox,
+ rpmsg->header.msg_id,
+ &rpmsg->net_info_rsp);
break;
default:
@@ -271,7 +271,7 @@
dev_dbg(dev, "Device ioctl: Send ping");
- ret = ethosu_mailbox_ping(&edev->mailbox);
+ ret = ethosu_rpmsg_mailbox_ping(&edev->mailbox);
device_unlock(dev);
@@ -314,7 +314,7 @@
dev_dbg(dev,
"Device ioctl: Network create. type=%u\n", uapi.type);
- ret = ethosu_network_create(dev, &edev->mailbox, &uapi);
+ ret = ethosu_rpmsg_network_create(dev, &edev->mailbox, &uapi);
device_unlock(dev);
@@ -370,7 +370,7 @@
clear_bit(MINOR(edev->cdev.dev), minors);
- ethosu_mailbox_deinit(&edev->mailbox);
+ ethosu_rpmsg_mailbox_deinit(&edev->mailbox);
device_destroy(edev->class, edev->cdev.dev);
kfree(edev);
}
@@ -481,12 +481,12 @@
goto device_unregister;
}
- ret = ethosu_mailbox_init(&edev->mailbox, dev, edev->ept);
+ ret = ethosu_rpmsg_mailbox_init(&edev->mailbox, dev, edev->ept);
if (ret)
goto free_rpmsg_ept;
device_lock(dev);
- ret = ethosu_version_check_request(dev, &edev->mailbox);
+ ret = ethosu_rpmsg_version_check_request(dev, &edev->mailbox);
device_unlock(dev);
if (ret) {
dev_err(dev, "Protocol version check failed: %d", ret);
@@ -494,8 +494,8 @@
}
device_lock(dev);
- ret = ethosu_capabilities_request(dev, &edev->mailbox,
- &edev->capabilities);
+ ret = ethosu_rpmsg_capabilities_request(dev, &edev->mailbox,
+ &edev->capabilities);
device_unlock(dev);
if (ret) {
dev_err(dev, "Failed to get device capabilities: %d", ret);
@@ -534,7 +534,7 @@
cdev_del(&edev->cdev);
deinit_mailbox:
- ethosu_mailbox_deinit(&edev->mailbox);
+ ethosu_rpmsg_mailbox_deinit(&edev->mailbox);
free_rpmsg_ept:
rpmsg_destroy_ept(edev->ept);
@@ -551,7 +551,7 @@
struct ethosu_device *edev = dev_get_drvdata(dev);
device_lock(&edev->dev);
- ethosu_mailbox_fail(&edev->mailbox);
+ ethosu_rpmsg_mailbox_fail(&edev->mailbox);
device_unlock(&edev->dev);
rpmsg_destroy_ept(edev->ept);