From 1fad37082f170ae217e6474f5413b6751b3a72d2 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Tue, 12 May 2020 00:46:13 +0800 Subject: [PATCH] apps: replace all zero address to RPMSG_ADDR_ANY the example should demo the best practice for the endpoint creation Signed-off-by: Xiang Xiao --- apps/examples/echo/rpmsg-echo.c | 3 ++- apps/examples/echo/rpmsg-ping.c | 7 +++---- apps/examples/matrix_multiply/matrix_multiply.c | 7 +++---- apps/examples/matrix_multiply/matrix_multiplyd.c | 3 ++- apps/examples/rpc_demo/rpc_demod.c | 3 ++- apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c | 3 ++- apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c | 7 +++---- apps/tests/msg/rpmsg-flood-ping.c | 2 +- apps/tests/msg/rpmsg-ping.c | 7 +++---- apps/tests/msg/rpmsg-update.c | 3 ++- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/apps/examples/echo/rpmsg-echo.c b/apps/examples/echo/rpmsg-echo.c index 0c75203bd..91c7ee47b 100644 --- a/apps/examples/echo/rpmsg-echo.c +++ b/apps/examples/echo/rpmsg-echo.c @@ -58,7 +58,8 @@ int app(struct rpmsg_device *rdev, void *priv) LPRINTF("Try to create rpmsg endpoint.\r\n"); ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, - 0, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, + rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { LPERROR("Failed to create endpoint.\r\n"); diff --git a/apps/examples/echo/rpmsg-ping.c b/apps/examples/echo/rpmsg-ping.c index 3b716b004..854e03c2a 100644 --- a/apps/examples/echo/rpmsg-ping.c +++ b/apps/examples/echo/rpmsg-ping.c @@ -11,7 +11,6 @@ This application echoes back data that was sent to it by the master core. */ #include "platform_info.h" #include "rpmsg-echo.h" -#define APP_EPT_ADDR 0 #define LPRINTF(format, ...) printf(format, ##__VA_ARGS__) #define LPERROR(format, ...) LPRINTF("ERROR: " format, ##__VA_ARGS__) @@ -80,7 +79,7 @@ static void rpmsg_name_service_bind_cb(struct rpmsg_device *rdev, LPERROR("Unexpected name service %s.\r\n", name); else (void)rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, - APP_EPT_ADDR, dest, + RPMSG_ADDR_ANY, dest, rpmsg_endpoint_cb, rpmsg_service_unbind); @@ -116,8 +115,8 @@ int app (struct rpmsg_device *rdev, void *priv) } /* Create RPMsg endpoint */ - ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, APP_EPT_ADDR, - RPMSG_ADDR_ANY, + ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { diff --git a/apps/examples/matrix_multiply/matrix_multiply.c b/apps/examples/matrix_multiply/matrix_multiply.c index b9da29ba3..1fbaf6b63 100644 --- a/apps/examples/matrix_multiply/matrix_multiply.c +++ b/apps/examples/matrix_multiply/matrix_multiply.c @@ -14,7 +14,6 @@ multiplies them and returns the result to the master core. */ #define MAX_SIZE 6 #define NUM_MATRIX 2 -#define APP_EPT_ADDR 0 #define raw_printf(format, ...) printf(format, ##__VA_ARGS__) #define LPRINTF(format, ...) raw_printf("CLIENT> " format, ##__VA_ARGS__) @@ -158,7 +157,7 @@ static void rpmsg_name_service_bind_cb(struct rpmsg_device *rdev, LPERROR("Unexpected name service %s.\r\n", name); else (void)rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, - APP_EPT_ADDR, dest, + RPMSG_ADDR_ANY, dest, rpmsg_endpoint_cb, rpmsg_service_unbind); @@ -178,8 +177,8 @@ int app (struct rpmsg_device *rdev, void *priv) LPRINTF("It will then check if the result is expected.\r\n"); /* Create RPMsg endpoint */ - ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, APP_EPT_ADDR, - RPMSG_ADDR_ANY, + ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { LPERROR("Failed to create RPMsg endpoint.\r\n"); diff --git a/apps/examples/matrix_multiply/matrix_multiplyd.c b/apps/examples/matrix_multiply/matrix_multiplyd.c index 6b4a11801..fb2716e85 100644 --- a/apps/examples/matrix_multiply/matrix_multiplyd.c +++ b/apps/examples/matrix_multiply/matrix_multiplyd.c @@ -92,7 +92,8 @@ int app(struct rpmsg_device *rdev, void *priv) int ret; ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, - 0, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, + rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { LPERROR("Failed to create endpoint.\r\n"); diff --git a/apps/examples/rpc_demo/rpc_demod.c b/apps/examples/rpc_demo/rpc_demod.c index 44c92a21b..004b53324 100644 --- a/apps/examples/rpc_demo/rpc_demod.c +++ b/apps/examples/rpc_demo/rpc_demod.c @@ -312,7 +312,8 @@ int app(struct rpmsg_device *rdev, void *priv) LPRINTF("Try to create rpmsg endpoint.\r\n"); ret = rpmsg_create_ept(&app_ept, rdev, RPMSG_SERVICE_NAME, - 0, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, + rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { LPERROR("Failed to create endpoint.\r\n"); diff --git a/apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c b/apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c index 1dbb3bb67..75586197d 100644 --- a/apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c +++ b/apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c @@ -71,7 +71,8 @@ int app(struct rpmsg_device *rdev, void *priv) /* Initialize RPMSG framework */ LPRINTF("Try to create rpmsg endpoint.\r\n"); - ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERV_NAME, 0, RPMSG_ADDR_ANY, + ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERV_NAME, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { LPERROR("Failed to create endpoint.\r\n"); diff --git a/apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c b/apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c index ee866b446..03f1893bf 100644 --- a/apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c +++ b/apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c @@ -20,7 +20,6 @@ #define BYE_MSG "goodbye!" #define MSG_LIMIT 100 -#define APP_EPT_ADDR 0 #define LPRINTF(format, ...) printf(format, ##__VA_ARGS__) #define LPERROR(format, ...) LPRINTF("ERROR: " format, ##__VA_ARGS__) @@ -85,7 +84,7 @@ static void rpmsg_name_service_bind_cb(struct rpmsg_device *rdev, LPERROR("Unexpected name service %s.\r\n", name); else (void)rpmsg_create_ept(&lept, rdev, RPMSG_SERV_NAME, - APP_EPT_ADDR, dest, + RPMSG_ADDR_ANY, dest, rpmsg_endpoint_cb, rpmsg_service_unbind); @@ -103,8 +102,8 @@ int app(struct rpmsg_device *rdev, void *priv) LPRINTF(" and validate its integrity ..\r\n"); /* Create RPMsg endpoint */ - ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERV_NAME, APP_EPT_ADDR, - RPMSG_ADDR_ANY, + ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERV_NAME, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { diff --git a/apps/tests/msg/rpmsg-flood-ping.c b/apps/tests/msg/rpmsg-flood-ping.c index 66489f8f9..28edc66d9 100644 --- a/apps/tests/msg/rpmsg-flood-ping.c +++ b/apps/tests/msg/rpmsg-flood-ping.c @@ -12,7 +12,7 @@ #include "platform_info.h" #include "rpmsg-ping.h" -#define APP_EPT_ADDR 0 +#define APP_EPT_ADDR 1024 #define LPRINTF(format, ...) printf(format, ##__VA_ARGS__) #define LPERROR(format, ...) LPRINTF("ERROR: " format, ##__VA_ARGS__) diff --git a/apps/tests/msg/rpmsg-ping.c b/apps/tests/msg/rpmsg-ping.c index 0220a279f..ec9a9d594 100644 --- a/apps/tests/msg/rpmsg-ping.c +++ b/apps/tests/msg/rpmsg-ping.c @@ -11,7 +11,6 @@ This application echoes back data that was sent to it by the master core. */ #include "platform_info.h" #include "rpmsg-ping.h" -#define APP_EPT_ADDR 0 #define LPRINTF(format, ...) printf(format, ##__VA_ARGS__) #define LPERROR(format, ...) LPRINTF("ERROR: " format, ##__VA_ARGS__) @@ -84,7 +83,7 @@ static void rpmsg_name_service_bind_cb(struct rpmsg_device *rdev, LPERROR("Unexpected name service %s.\r\n", name); else (void)rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, - APP_EPT_ADDR, dest, + RPMSG_ADDR_ANY, dest, rpmsg_endpoint_cb, rpmsg_service_unbind); @@ -120,8 +119,8 @@ int app (struct rpmsg_device *rdev, void *priv) } /* Create RPMsg endpoint */ - ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, APP_EPT_ADDR, - RPMSG_ADDR_ANY, + ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { diff --git a/apps/tests/msg/rpmsg-update.c b/apps/tests/msg/rpmsg-update.c index 9b26cace6..2d448a173 100644 --- a/apps/tests/msg/rpmsg-update.c +++ b/apps/tests/msg/rpmsg-update.c @@ -73,7 +73,8 @@ int app(struct rpmsg_device *rdev, void *priv) LPRINTF("Try to create rpmsg endpoint.\r\n"); ret = rpmsg_create_ept(&lept, rdev, RPMSG_SERVICE_NAME, - 0, RPMSG_ADDR_ANY, rpmsg_endpoint_cb, + RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, + rpmsg_endpoint_cb, rpmsg_service_unbind); if (ret) { LPERROR("Failed to create endpoint.\r\n");