sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtc/rpmsg: Replace session to client

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-01-14 21:48:31 +08:00 committed by Petro Karashchenko
parent 41b9cf3cd8
commit 3d3c4767a9
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/timers/rpmsg_rtc.c
View File

@ -123,7 +123,7 @@ struct rpmsg_rtc_server_s
sem_t exclsem; sem_t exclsem;
}; };
struct rpmsg_rtc_session_s struct rpmsg_rtc_client_s
{ {
struct list_node node; struct list_node node;
struct rpmsg_endpoint ept; struct rpmsg_endpoint ept;
@ -464,7 +464,7 @@ static int rpmsg_rtc_server_settime(FAR struct rtc_lowerhalf_s *lower,
{ {
FAR struct rpmsg_rtc_server_s *server = FAR struct rpmsg_rtc_server_s *server =
(FAR struct rpmsg_rtc_server_s *)lower; (FAR struct rpmsg_rtc_server_s *)lower;
FAR struct rpmsg_rtc_session_s *session; FAR struct rpmsg_rtc_client_s *client;
FAR struct list_node *node; FAR struct list_node *node;
struct rpmsg_rtc_header_s header; struct rpmsg_rtc_header_s header;
int ret; int ret;
@ -476,8 +476,8 @@ static int rpmsg_rtc_server_settime(FAR struct rtc_lowerhalf_s *lower,
header.command = RPMSG_RTC_SYNC; header.command = RPMSG_RTC_SYNC;
list_for_every(&server->list, node) list_for_every(&server->list, node)
{ {
session = (FAR struct rpmsg_rtc_session_s *)node; client = (FAR struct rpmsg_rtc_client_s *)node;
rpmsg_send(&session->ept, &header, sizeof(header)); rpmsg_send(&client->ept, &header, sizeof(header));
} }
nxsem_post(&server->exclsem); nxsem_post(&server->exclsem);
@ -554,28 +554,28 @@ static int rpmsg_rtc_server_cancelperiodic
static void rpmsg_rtc_server_ns_unbind(FAR struct rpmsg_endpoint *ept) static void rpmsg_rtc_server_ns_unbind(FAR struct rpmsg_endpoint *ept)
{ {
FAR struct rpmsg_rtc_session_s *session = container_of(ept, FAR struct rpmsg_rtc_client_s *client = container_of(ept,
struct rpmsg_rtc_session_s, ept); struct rpmsg_rtc_client_s, ept);
FAR struct rpmsg_rtc_server_s *server = ept->priv; FAR struct rpmsg_rtc_server_s *server = ept->priv;
nxsem_wait_uninterruptible(&server->exclsem); nxsem_wait_uninterruptible(&server->exclsem);
list_delete(&session->node); list_delete(&client->node);
nxsem_post(&server->exclsem); nxsem_post(&server->exclsem);
rpmsg_destroy_ept(&session->ept); rpmsg_destroy_ept(&client->ept);
kmm_free(session); kmm_free(client);
} }
#ifdef CONFIG_RTC_ALARM #ifdef CONFIG_RTC_ALARM
static void rpmsg_rtc_server_alarm_cb(FAR void *priv, int alarmid) static void rpmsg_rtc_server_alarm_cb(FAR void *priv, int alarmid)
{ {
FAR struct rpmsg_rtc_session_s *session = priv; FAR struct rpmsg_rtc_client_s *client = priv;
struct rpmsg_rtc_alarm_fire_s msg = struct rpmsg_rtc_alarm_fire_s msg =
{ {
.header.command = RPMSG_RTC_ALARM_FIRE, .header.command = RPMSG_RTC_ALARM_FIRE,
.id = alarmid, .id = alarmid,
}; };
rpmsg_send(&session->ept, &msg, sizeof(msg)); rpmsg_send(&client->ept, &msg, sizeof(msg));
} }
#endif #endif
@ -612,8 +612,8 @@ static int rpmsg_rtc_server_ept_cb(FAR struct rpmsg_endpoint *ept,
#ifdef CONFIG_RTC_ALARM #ifdef CONFIG_RTC_ALARM
case RPMSG_RTC_ALARM_SET: case RPMSG_RTC_ALARM_SET:
{ {
FAR struct rpmsg_rtc_session_s *session = container_of(ept, FAR struct rpmsg_rtc_client_s *client = container_of(ept,
struct rpmsg_rtc_session_s, ept); struct rpmsg_rtc_client_s, ept);
FAR struct rpmsg_rtc_alarm_set_s *msg = data; FAR struct rpmsg_rtc_alarm_set_s *msg = data;
FAR struct rpmsg_rtc_server_s *server = priv; FAR struct rpmsg_rtc_server_s *server = priv;
time_t time = msg->sec; time_t time = msg->sec;
@ -621,7 +621,7 @@ static int rpmsg_rtc_server_ept_cb(FAR struct rpmsg_endpoint *ept,
{ {
.id = msg->id, .id = msg->id,
.cb = rpmsg_rtc_server_alarm_cb, .cb = rpmsg_rtc_server_alarm_cb,
.priv = session .priv = client
}; };
gmtime_r(&time, (FAR struct tm *)&alarminfo.time); gmtime_r(&time, (FAR struct tm *)&alarminfo.time);
@ -653,31 +653,31 @@ static void rpmsg_rtc_server_ns_bind(FAR struct rpmsg_device *rdev,
uint32_t dest) uint32_t dest)
{ {
FAR struct rpmsg_rtc_server_s *server = priv; FAR struct rpmsg_rtc_server_s *server = priv;
FAR struct rpmsg_rtc_session_s *session; FAR struct rpmsg_rtc_client_s *client;
if (strcmp(name, RPMSG_RTC_EPT_NAME)) if (strcmp(name, RPMSG_RTC_EPT_NAME))
{ {
return; return;
} }
session = kmm_zalloc(sizeof(*session)); client = kmm_zalloc(sizeof(*client));
if (!session) if (client == NULL)
{ {
return; return;
} }
session->ept.priv = server; client->ept.priv = server;
if (rpmsg_create_ept(&session->ept, rdev, RPMSG_RTC_EPT_NAME, if (rpmsg_create_ept(&client->ept, rdev, RPMSG_RTC_EPT_NAME,
RPMSG_ADDR_ANY, dest, RPMSG_ADDR_ANY, dest,
rpmsg_rtc_server_ept_cb, rpmsg_rtc_server_ept_cb,
rpmsg_rtc_server_ns_unbind) < 0) rpmsg_rtc_server_ns_unbind) < 0)
{ {
kmm_free(session); kmm_free(client);
return; return;
} }
nxsem_wait_uninterruptible(&server->exclsem); nxsem_wait_uninterruptible(&server->exclsem);
list_add_tail(&server->list, &session->node); list_add_tail(&server->list, &client->node);
nxsem_post(&server->exclsem); nxsem_post(&server->exclsem);
} }
#endif #endif