Clean headers

.gitignore

@@ -25,6 +25,7 @@ stamp-h1
 
 .deps/
 .libs/
+.dirstamp
 
 # Compiled objects
 *.o

configure.ac

@@ -47,6 +47,7 @@ AC_CONFIG_FILES([
 Makefile
 inc/Makefile
 src/Makefile
+src/generated/Makefile
 test/Makefile
 ])
 AC_OUTPUT

inc/Makefile.am

@@ -5,6 +5,7 @@ fastrpc_include_HEADERS += $(top_srcdir)/inc/remote.h
 fastrpc_include_HEADERS += $(top_srcdir)/inc/rpcmem.h
 
 noinst_HEADERS = \
+	misc/fastrpc.h \
 	AEEBufBound.h \
 	AEEQList.h \
 	AEEStdDef.h \
@@ -13,27 +14,11 @@ noinst_HEADERS = \
 	HAP_farf.h \
 	HAP_farf_internal.h \
 	HAP_pls.h \
-	adsp_current_process.h \
-	adsp_current_process1.h \
-	adsp_default_listener.h \
-	adsp_default_listener1.h \
-	adsp_listener.h \
-	adsp_listener1.h \
-	adsp_perf.h \
-	adsp_perf1.h \
 	adsp_pls.h \
-	adspmsgd_adsp.h \
-	adspmsgd_adsp1.h \
-	adspmsgd_apps.h \
 	adspmsgd_internal.h \
-	apps_mem.h \
 	apps_mem_internal.h \
-	apps_remotectl.h \
-	apps_std.h \
 	apps_std_internal.h \
 	dspqueue.h \
-	dspqueue_rpc.h \
-	dspqueue_shared.h \
 	dspsignal.h \
 	fastrpc_apps_user.h \
 	fastrpc_async.h \
@@ -57,17 +42,11 @@ noinst_HEADERS = \
 	listener_buf.h \
 	log_config.h \
 	mod_table.h \
-	mutex.h \
 	platform_libs.h \
 	pls.h \
-	remote64.h \
-	remotectl.h \
-	remotectl1.h \
+	pthread_rw_mutex.h \
 	rpcmem_internal.h \
 	sbuf.h \
 	sbuf_parser.h \
-	shared.h \
-	std_dtoa.h \
 	uthash.h \
-	verify.h \
-	version.h
+	verify.h

inc/fastrpc_async.h

@@ -4,7 +4,7 @@
 #ifndef FASTRPC_ASYNC_H
 #define FASTRPC_ASYNC_H
 
-#include "remote64.h"
+#include "remote.h"
 #include "fastrpc_internal.h"
 
 #define POS_TO_MASK(pos)             ((1UL << pos) - 1)

inc/fastrpc_internal.h

@@ -10,7 +10,7 @@
 
 #include "HAP_farf.h"
 #include "AEEStdErr.h"
-#include "remote64.h"
+#include "remote.h"
 #include "verify.h"
 #include "AEEstd.h"
 #include "AEEQList.h"
@@ -52,9 +52,6 @@
 /* Max value of remote_mem_map_flags, used to validate the input flag */
 #define REMOTE_MAP_MAX_FLAG REMOTE_MAP_MEM_STATIC + 1
 
-/* Max value of fastrpc_map_flags, used to validate range of supported flags */
-#define FASTRPC_MAP_MAX FASTRPC_MAP_FD_NOMAP + 1
-
 #if !(defined __qdsp6__) && !(defined __hexagon__)
 static __inline uint32_t Q6_R_cl0_R(uint32_t num) {
    int ii;
@@ -231,29 +228,6 @@ enum fastrpc_map_type {
 	MUNMAP_FD,
 };
 
-/**
-  * @brief memory mapping and unmapping data structures used in 
-  * mmap/munmap ioctls. internal datastructures.
-  *  fastrpc_mem_map - used for storing memory map information
-  *  fastrpc_mem_unmap - used while unmapping the memory from the
-  *                      local data structures.
-  **/
-struct fastrpc_mem_map {
-	int fd;			/* ion fd */
-	int offset;		/* buffer offset */
-	uint32_t flags;		/* flags defined in enum fastrpc_map_flags */
-	int attrs;		/* buffer attributes used for SMMU mapping */
-	uintptr_t vaddrin;	/* buffer virtual address */
-	size_t length;		/* buffer length */
-	uint64_t vaddrout;	/* [out] remote virtual address */
-};
-
-struct fastrpc_mem_unmap {
-	int fd;			/* ion fd */
-	uint64_t vaddr;		/* remote process (dsp) virtual address */
-	size_t length;		/* buffer size */
-};
-
 struct fastrpc_map {
 	int version;
 	struct fastrpc_mem_map m;