make API changes to libhexagonrpc

Add a new version of the remote method definition to support more
methods, with sequences of sequences, mixed input and output arguments,
and fixed-length data structures greater than 32 bits.

Use thread-local variables to replace the leading fd and handle
arguments in the inline functions.

Author: flamingradian

chrecd/interfaces/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/interfaces/chre_slpi.h

@@ -0,0 +1,52 @@
+/*
+ * 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/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);
+}
+
+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/main.c

@@ -20,105 +20,39 @@
  */
 
 #include <errno.h>
-#include <libhexagonrpc/fastrpc.h>
-#include <libhexagonrpc/interfaces/remotectl.def>
+#include <libhexagonrpc/hexagonrpc.h>
+#include <libhexagonrpc/interfaces/remotectl.h>
 #include <libhexagonrpc/session.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "interfaces/chre_slpi.def"
+#include "interfaces/chre_slpi.h"
 
-/* TODO move these to libhexagonrpc since most clients use them */
-static int remotectl_open(int fd, char *name, struct fastrpc_context **ctx, void (*err_cb)(const char *err))
+int main(void)
 {
-	uint32_t handle;
-	int32_t dlret;
 	char err[256];
-	int ret;
-
-	ret = fastrpc2(&remotectl_open_def, fd, REMOTECTL_HANDLE,
-		       strlen(name) + 1, name,
-		       &handle,
-		       &dlret,
-		       256, err);
-
-	if (ret == -1) {
-		err_cb(strerror(errno));
-		return ret;
-	}
-
-	if (dlret == -5) {
-		err_cb(err);
-		return dlret;
-	}
-
-	*ctx = fastrpc_create_context(fd, handle);
-
-	return ret;
-}
-
-static int remotectl_close(struct fastrpc_context *ctx, void (*err_cb)(const char *err))
-{
-	uint32_t dlret;
-	char err[256];
-	int ret;
-
-	ret = fastrpc2(&remotectl_close_def, ctx->fd, REMOTECTL_HANDLE,
-		       ctx->handle,
-		       &dlret,
-		       256, err);
-
-	if (ret == -1) {
-		err_cb(strerror(errno));
-		return ret;
-	}
-
-	fastrpc_destroy_context(ctx);
-
-	return ret;
-}
-
-static void remotectl_err(const char *err)
-{
-	fprintf(stderr, "Could not remotectl: %s\n", err);
-}
-
-static int chre_slpi_start_thread(struct fastrpc_context *ctx)
-{
-	return fastrpc(&chre_slpi_start_thread_def, ctx);
-}
-
-static int chre_slpi_wait_on_thread_exit(struct fastrpc_context *ctx)
-{
-	return fastrpc(&chre_slpi_wait_on_thread_exit_def, ctx);
-}
-
-int main()
-{
-	struct fastrpc_context *ctx;
 	int fd, ret;
 
 	fd = hexagonrpc_fd_from_env();
 	if (fd == -1)
 		return 1;
 
-	ret = remotectl_open(fd, "chre_slpi", &ctx, remotectl_err);
-	if (ret)
+	ret = hrpc_open_chre_slpi(256, err);
+	if (ret) {
+		fprintf(stderr, "Could not open CHRE: %s\n", err);
 		return 1;
+	}
 
-	ret = chre_slpi_start_thread(ctx);
+	ret = chre_slpi_start_thread();
 	if (ret) {
 		fprintf(stderr, "Could not start CHRE\n");
-		goto err;
+		return 1;
 	}
 
-	ret = chre_slpi_wait_on_thread_exit(ctx);
+	ret = chre_slpi_wait_on_thread_exit();
 	if (ret) {
 		fprintf(stderr, "Could not wait for CHRE thread\n");
-		goto err;
+		return 1;
 	}
-
-err:
-	remotectl_close(ctx, remotectl_err);
 }

chrecd/meson.build

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

hexagonrpcd/apps_mem.c

@@ -23,12 +23,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libhexagonrpc/error.h>
 #include <misc/fastrpc.h>
 #include <sys/ioctl.h>
 
-#include "aee_error.h"
 #include "apps_mem.h"
-#include "interfaces/apps_mem.def"
+#include "interfaces/apps_mem.h"
 #include "listener.h"
 
 // See fastrpc.git/src/apps_mem_imp.c
@@ -71,11 +71,9 @@ static uint32_t apps_mem_request_map64(void *data,
 	mmap.size = first_in->len;
 
 	ret = ioctl(ctx->fd, FASTRPC_IOCTL_MMAP, &mmap);
-	if (ret == -1) {
-		perror("Memory map failed");
-		return AEE_EFAILED;
-	} else if (ret) {
-		fprintf(stderr, "Memory map failed: %s\n", aee_strerror[ret]);
+	if (ret) {
+		fprintf(stderr, "Memory map failed: %s\n",
+			hexagonrpc_strerror(ret));
 		return ret;
 	}
 

hexagonrpcd/apps_std.c

@@ -27,8 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "interfaces/apps_std.def"
 #include "hexagonfs.h"
+#include "interfaces/apps_std.h"
 #include "iobuffer.h"
 #include "listener.h"
 

hexagonrpcd/interfaces/adsp_default_listener.c

@@ -0,0 +1,33 @@
+/*
+ * FastRPC reverse tunnel registration 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 adsp_default_listener;
+
+struct hrpc_method_def_interp4 adsp_default_listener_register_def = {
+	.msg_id = 0,
+	.n_args = 0,
+	.args = NULL,
+	.n_inner_types = 0,
+	.inner_types = NULL,
+};

hexagonrpcd/interfaces/adsp_default_listener.h

@@ -0,0 +1,45 @@
+/*
+ * FastRPC reverse tunnel registration 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_ADSP_DEFAULT_LISTENER_H
+#define INTERFACE_ADSP_DEFAULT_LISTENER_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <libhexagonrpc/hexagonrpc.h>
+#include <libhexagonrpc/session.h>
+
+extern __thread uint32_t adsp_default_listener;
+static inline int hrpc_open_adsp_default_listener(size_t n_err, char *err)
+{
+	return hexagonrpc_open("adsp_default_listener",
+			       &adsp_default_listener,
+			       n_err, err);
+}
+
+extern struct hrpc_method_def_interp4 adsp_default_listener_register_def;
+static inline int adsp_default_listener_register(void)
+{
+	return hexagonrpc(&adsp_default_listener_register_def,
+			  hexagonrpc_fd, adsp_default_listener);
+}
+
+#endif /* INTERFACE_ADSP_DEFAULT_LISTENER_H */

hexagonrpcd/interfaces/adsp_listener.c

@@ -0,0 +1,50 @@
+/*
+ * FastRPC reverse tunnel main 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 Lesser 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>
+
+struct hrpc_method_def_interp4 adsp_listener_init2_def = {
+	.msg_id = 3,
+	.n_args = 0,
+	.args = NULL,
+	.n_inner_types = 0,
+	.inner_types = NULL,
+};
+
+struct hrpc_arg_def_interp4 adsp_listener_next2_args[] = {
+	{ HRPC_ARG_WORD, sizeof(uint32_t) },
+	{ HRPC_ARG_WORD, sizeof(uint32_t) },
+	{ HRPC_ARG_BLOB_SEQ, sizeof(char) },
+	{ HRPC_ARG_OUT_BLOB, sizeof(uint32_t) },
+	{ HRPC_ARG_OUT_BLOB, sizeof(uint32_t) },
+	{ HRPC_ARG_OUT_BLOB, sizeof(uint32_t) },
+	{ HRPC_ARG_OUT_BLOB, sizeof(uint32_t) },
+	{ HRPC_ARG_OUT_BLOB_SEQ, sizeof(char) },
+};
+
+struct hrpc_method_def_interp4 adsp_listener_next2_def = {
+	.msg_id = 4,
+	.n_args = HRPC_ARRAY_SIZE(adsp_listener_next2_args),
+	.args = adsp_listener_next2_args,
+	.n_inner_types = 0,
+	.inner_types = NULL,
+};