hexagonrpcd: interfaces: switch adsp_listener to interp4

Author: flamingradian

hexagonrpcd/interface/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 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,
+};

hexagonrpcd/interface/adsp_listener.h

@@ -0,0 +1,52 @@
+/*
+ * FastRPC reverse tunnel main 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_LISTENER_H
+#define INTERFACE_ADSP_LISTENER_H
+
+#include <stdint.h>
+#include <libhexagonrpc/hexagonrpc.h>
+#include <libhexagonrpc/session.h>
+
+#define ADSP_LISTENER 3
+
+extern struct hrpc_method_def_interp4 adsp_listener_init2_def;
+static inline int adsp_listener_init2(void)
+{
+	return hexagonrpc(&adsp_listener_init2_def, hexagonrpc_fd, ADSP_LISTENER);
+}
+
+extern struct hrpc_method_def_interp4 adsp_listener_next2_def;
+static inline int adsp_listener_next2(uint32_t ret_rctx,
+				      uint32_t ret_res,
+				      uint32_t ret_outbufs_len, const void *ret_outbufs,
+				      uint32_t *rctx,
+				      uint32_t *handle,
+				      uint32_t *sc,
+				      uint32_t *inbufs_len,
+				      uint32_t inbufs_size, void *inbufs)
+{
+	return hexagonrpc(&adsp_listener_next2_def, hexagonrpc_fd, ADSP_LISTENER,
+			  ret_rctx, ret_res, ret_outbufs_len, ret_outbufs,
+			  rctx, handle, sc, inbufs_len, inbufs_size, inbufs);
+}
+
+#endif /* INTERFACE_ADSP_LISTENER_H */

hexagonrpcd/interfaces.c

@@ -22,4 +22,3 @@
 #define HEXAGONRPC_BUILD_METHOD_DEFINITIONS 1
 
 #include "interfaces/adsp_default_listener.def"
-#include "interfaces/adsp_listener.def"

hexagonrpcd/interfaces/adsp_listener.def

@@ -27,36 +27,10 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "interfaces/adsp_listener.def"
+#include "interface/adsp_listener.h"
 #include "iobuffer.h"
 #include "listener.h"
 
-static int adsp_listener_init2(int fd)
-{
-	return fastrpc2(&adsp_listener_init2_def, fd, ADSP_LISTENER_HANDLE);
-}
-
-static int adsp_listener_next2(int fd,
-			       uint32_t ret_rctx,
-			       uint32_t ret_res,
-			       uint32_t ret_outbuf_len, void *ret_outbuf,
-			       uint32_t *rctx,
-			       uint32_t *handle,
-			       uint32_t *sc,
-			       uint32_t *inbufs_len,
-			       uint32_t inbufs_size, void *inbufs)
-{
-	return fastrpc2(&adsp_listener_next2_def, fd, ADSP_LISTENER_HANDLE,
-			ret_rctx,
-			ret_res,
-			ret_outbuf_len, ret_outbuf,
-			rctx,
-			handle,
-			sc,
-			inbufs_len,
-			inbufs_size, inbufs);
-}
-
 static int count_sizes_in_type4(const struct hrpc_inner_type_def_interp4 *type,
 				const struct fastrpc_io_buffer **curr_inbuf,
 				const struct fastrpc_io_buffer *inbufs_end,
@@ -555,8 +529,7 @@ static int return_for_next_invoke(int fd,
 		outbufs_encode(REMOTE_SCALARS_OUTBUFS(*sc), returned, outbufs);
 	}
 
-	ret = adsp_listener_next2(fd,
-				  *rctx, result,
+	ret = adsp_listener_next2(*rctx, result,
 				  outbufs_len, outbufs,
 				  rctx, handle, sc,
 				  &inbufs_len, 256, inbufs);
@@ -710,7 +683,7 @@ int run_fastrpc_listener(int fd,
 	uint32_t n_outbufs = 0;
 	int ret;
 
-	ret = adsp_listener_init2(fd);
+	ret = adsp_listener_init2();
 	if (ret) {
 		fprintf(stderr, "Could not initialize the listener: %u\n", ret);
 		return ret;

hexagonrpcd/listener.c

@@ -2,6 +2,7 @@ executable('hexagonrpcd',
   'apps_mem.c',
   'apps_std.c',
   'interfaces.c',
+  'interface/adsp_listener.c',
   'interface/apps_mem.c',
   'interface/apps_std.c',
   'hexagonfs.c',