chrecd: interface: switch chre_slpi interface to interp4

Author: flamingradian

chrecd/interface/chre_slpi.c

@@ -0,0 +1,41 @@
+/*
+ * Context Hub Runtime Environment interface - method definitions
+ *
+ * Copyright (C) 2025 HexagonRPC Contributors
+ *
+ * This file is part of HexagonRPC.
+ *
+ * HexagonRPC is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <libhexagonrpc/hexagonrpc.h>
+
+__thread uint32_t chre_slpi;
+
+struct hrpc_method_def_interp4 chre_slpi_start_thread_def = {
+	.msg_id = 0,
+	.n_args = 0,
+	.args = NULL,
+	.n_inner_types = 0,
+	.inner_types = NULL,
+};
+
+struct hrpc_method_def_interp4 chre_slpi_wait_on_thread_exit_def = {
+	.msg_id = 1,
+	.n_args = 0,
+	.args = NULL,
+	.n_inner_types = 0,
+	.inner_types = NULL,
+};

chrecd/interface/chre_slpi.h

@@ -0,0 +1,58 @@
+/*
+ * Context Hub Runtime Environment interface - API
+ *
+ * Copyright (C) 2025 HexagonRPC Contributors
+ *
+ * This file is part of HexagonRPC.
+ *
+ * HexagonRPC is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef INTERFACE_CHRE_SLPI_H
+#define INTERFACE_CHRE_SLPI_H
+
+#include <stdint.h>
+#include <libhexagonrpc/handle.h>
+#include <libhexagonrpc/hexagonrpc.h>
+#include <libhexagonrpc/session.h>
+
+extern __thread uint32_t chre_slpi;
+static inline int hrpc_open_chre_slpi(size_t n_err, char *err)
+{
+	return hexagonrpc_open("chre_slpi",
+			       &chre_slpi,
+			       n_err, err);
+}
+
+static inline void hrpc_close_chre_slpi(void)
+{
+	hexagonrpc_close(chre_slpi);
+}
+
+extern struct hrpc_method_def_interp4 chre_slpi_start_thread_def;
+static inline int chre_slpi_start_thread()
+{
+	return hexagonrpc(&chre_slpi_start_thread_def,
+			  hexagonrpc_fd, chre_slpi);
+}
+
+extern struct hrpc_method_def_interp4 chre_slpi_wait_on_thread_exit_def;
+static inline int chre_slpi_wait_on_thread_exit()
+{
+	return hexagonrpc(&chre_slpi_wait_on_thread_exit_def,
+			  hexagonrpc_fd, chre_slpi);
+}
+
+
+#endif /* INTERFACE_CHRE_SLPI_H */

chrecd/interfaces.c

@@ -20,53 +20,41 @@
  */
 
 #include <errno.h>
-#include <libhexagonrpc/fastrpc.h>
-#include <libhexagonrpc/handle.h>
+#include <libhexagonrpc/hexagonrpc.h>
 #include <libhexagonrpc/session.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "interfaces/chre_slpi.def"
-
-static int chre_slpi_start_thread(int fd, uint32_t handle)
-{
-	return fastrpc2(&chre_slpi_start_thread_def, fd, handle);
-}
-
-static int chre_slpi_wait_on_thread_exit(int fd, uint32_t handle)
-{
-	return fastrpc2(&chre_slpi_wait_on_thread_exit_def, fd, handle);
-}
+#include "interface/chre_slpi.h"
 
 int main()
 {
-	uint32_t handle;
 	char err[256];
 	int fd, ret;
 
 	fd = hexagonrpc_fd_from_env();
 	if (fd == -1)
 		return 1;
 
-	ret = hexagonrpc_open("chre_slpi", &handle, 256, err);
+	ret = hrpc_open_chre_slpi(256, err);
 	if (ret) {
 		fprintf(stderr, "Could not open CHRE remote interface: %s\n", err);
 		return 1;
 	}
 
-	ret = chre_slpi_start_thread(fd, handle);
+	ret = chre_slpi_start_thread();
 	if (ret) {
 		fprintf(stderr, "Could not start CHRE\n");
 		goto err;
 	}
 
-	ret = chre_slpi_wait_on_thread_exit(fd, handle);
+	ret = chre_slpi_wait_on_thread_exit();
 	if (ret) {
 		fprintf(stderr, "Could not wait for CHRE thread\n");
 		goto err;
 	}
 
 err:
-	hexagonrpc_close(handle);
+	hrpc_close_chre_slpi();
 }

chrecd/interfaces/chre_slpi.def

@@ -1,5 +1,5 @@
 executable('chrecd',
-  'interfaces.c',
+  'interface/chre_slpi.c',
   'main.c',
   c_args : cflags,
   include_directories : include,