hexagonrpcd: interfaces: switch adsp_default_listener to interp4

Author: flamingradian

hexagonrpcd/interfaces.c renamed to hexagonrpcd/interface/adsp_default_listener.c

@@ -1,11 +1,11 @@
 /*
- * FastRPC interface list for building method definitions
+ * FastRPC reverse tunnel registration interface - method definitions
  *
- * Copyright (C) 2023 The Sensor Shell Contributors
+ * Copyright (C) 2025 HexagonRPC Contributors
  *
- * This file is part of sensh.
+ * This file is part of HexagonRPC.
  *
- * Sensh is free software: you can redistribute it and/or modify
+ * 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.
@@ -19,6 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#define HEXAGONRPC_BUILD_METHOD_DEFINITIONS 1
+#include <stdint.h>
+#include <libhexagonrpc/hexagonrpc.h>
 
-#include "interfaces/adsp_default_listener.def"
+__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/interface/adsp_default_listener.h

@@ -0,0 +1,51 @@
+/*
+ * 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/handle.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);
+}
+
+static inline void hrpc_close_adsp_default_listener(void)
+{
+	hexagonrpc_close(adsp_default_listener);
+}
+
+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_default_listener.def

@@ -1,7 +1,7 @@
 executable('hexagonrpcd',
   'apps_mem.c',
   'apps_std.c',
-  'interfaces.c',
+  'interface/adsp_default_listener.c',
   'interface/adsp_listener.c',
   'interface/apps_mem.c',
   'interface/apps_std.c',

hexagonrpcd/meson.build

@@ -22,8 +22,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <libhexagonrpc/error.h>
-#include <libhexagonrpc/fastrpc.h>
-#include <libhexagonrpc/handle.h>
 #include <libhexagonrpc/interface/remotectl.h>
 #include <libhexagonrpc/session.h>
 #include <misc/fastrpc.h>
@@ -40,36 +38,30 @@
 #include "apps_mem.h"
 #include "apps_std.h"
 #include "hexagonfs.h"
-#include "interfaces/adsp_default_listener.def"
+#include "interface/adsp_default_listener.h"
 #include "listener.h"
 #include "localctl.h"
 #include "rpcd_builder.h"
 
-static int adsp_default_listener_register(int fd, uint32_t handle)
-{
-	return fastrpc2(&adsp_default_listener_register_def, fd, handle);
-}
-
 static int register_fastrpc_listener(int fd)
 {
-	uint32_t handle;
 	char err[256];
 	int ret;
 
-	ret = hexagonrpc_open("adsp_default_listener", &handle, 256, err);
+	ret = hrpc_open_adsp_default_listener(256, err);
 	if (ret) {
 		fprintf(stderr, "Could not open remote interface: %s\n", err);
 		return 1;
 	}
 
-	ret = adsp_default_listener_register(fd, handle);
+	ret = adsp_default_listener_register();
 	if (ret) {
 		fprintf(stderr, "Could not register ADSP default listener\n");
 		goto err;
 	}
 
 err:
-	hexagonrpc_close(handle);
+	hrpc_close_adsp_default_listener();
 	return ret;
 }