quic · quickotemuth · Oct 22, 2024 · quic-bkumar · Oct 29, 2024 · quic-bkumar
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,65 +1,67 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 lib_LTLIBRARIES =
 
 LIBDSPRPC_CFLAGS = -fno-short-enums -U_DEBUG -DARM_ARCH_7A -DLE_ENABLE -DNO_HAL -DENABLE_UPSTREAM_DRIVER_INTERFACE -DUSE_SYSLOG -I$(top_srcdir)/inc
 
 LIBDSPRPC_SOURCES = \
-		fastrpc_apps_user.c \
-		fastrpc_perf.c \
-		fastrpc_pm.c \
-		fastrpc_config.c \
-		fastrpc_async.c \
-		fastrpc_mem.c \
-		fastrpc_notif.c \
-		fastrpc_latency.c \
-		fastrpc_ioctl.c \
-		fastrpc_log.c \
-		fastrpc_procbuf.c \
-		fastrpc_cap.c \
-		log_config.c \
-		dspsignal.c \
+		fastrpc_apps_core.c \
+		profile/fastrpc_perf.c \
+		control/fastrpc_pm.c \
+		control/fastrpc_config.c \
+		control/fastrpc_async.c \
+		memory/fastrpc_mem.c \
+		control/fastrpc_notif.c \
+		profile/fastrpc_latency.c \
+		control/fastrpc_ioctl.c \
+		debug/fastrpc_log.c \
+		control/fastrpc_procbuf.c \
+		control/fastrpc_cap.c \
+		debug/log_config.c \
+		daemon/dspsignal.c \
 		dspqueue/dspqueue_cpu.c \
 		dspqueue/dspqueue_rpc_stub.c \
-		listener_android.c \
-		apps_std_imp.c \
-		apps_mem_imp.c \
-		apps_mem_skel.c \
-		rpcmem_linux.c \
-		adspmsgd.c \
-		adspmsgd_printf.c \
-		std.c \
-		std_path.c \
-		std_mem.c \
-		std_dtoa.c \
-		std_strlprintf.c \
-		BufBound.c \
-		std_SwapBytes.c \
-		smath.c \
-		atomic.c \
-		cae.c \
-		platform_libs.c \
-		pl_list.c \
-		gpls.c \
-		remotectl_stub.c \
-		remotectl1_stub.c \
-		adspmsgd_apps_skel.c \
-		adspmsgd_adsp_stub.c \
-		adspmsgd_adsp1_stub.c \
-		apps_remotectl_skel.c \
-		adsp_current_process_stub.c \
-		adsp_current_process1_stub.c \
-		adsp_listener_stub.c \
-		adsp_listener1_stub.c \
-		apps_std_skel.c \
-		adsp_perf_stub.c \
-		adsp_perf1_stub.c \
-		mod_table.c
+		listener/listener_android.c \
+		listener/apps_std_imp.c \
+		memory/apps_mem_imp.c \
+		dspInterface/apps_mem_skel.c \
+		memory/rpcmem_linux.c \
+		debug/adspmsgd.c \
+		debug/adspmsgd_printf.c \
+		common/std.c \
+		common/std_path.c \
+		common/std_mem.c \
+		common/std_dtoa.c \
+		common/std_strlprintf.c \
+		common/BufBound.c \
+		common/std_SwapBytes.c \
+		common/smath.c \
+		common/atomic.c \
+		common/cae.c \
+		common/platform_libs.c \
+		common/pl_list.c \
+		common/gpls.c \
+		dspInterface/remotectl_stub.c \
+		dspInterface/remotectl1_stub.c \
+		dspInterface/adspmsgd_apps_skel.c \
+		dspInterface/adspmsgd_adsp_stub.c \
+		dspInterface/adspmsgd_adsp1_stub.c \
+		dspInterface/apps_remotectl_skel.c \
+		dspInterface/adsp_current_process_stub.c \
+		dspInterface/adsp_current_process1_stub.c \
+		dspInterface/adsp_listener_stub.c \
+		dspInterface/adsp_listener1_stub.c \
+		dspInterface/apps_std_skel.c \
+		dspInterface/adsp_perf_stub.c \
+		dspInterface/adsp_perf1_stub.c \
+		common/mod_table.c
 
 LIBDEFAULT_LISTENER_SOURCES = \
-				adsp_default_listener.c \
-				adsp_default_listener_stub.c \
-				adsp_default_listener1_stub.c \
-				std.c \
-				std_mem.c
+				listener/adsp_default_listener.c \
+				dspInterface/adsp_default_listener_stub.c \
+				dspInterface/adsp_default_listener1_stub.c \
+				common/std.c \
+				common/std_mem.c
 
 if ANDROID_CC
 USE_LOG = -llog
@@ -108,21 +110,21 @@ libsdsp_default_listener_la_CFLAGS = $(SDSP_CFLAGS) -DUSE_SYSLOG
 bin_PROGRAMS = adsprpcd cdsprpcd sdsprpcd
 
 adsprpcddir = $(libdir)
-adsprpcd_SOURCES = adsprpcd.c
+adsprpcd_SOURCES = daemon/adsprpcd.c
 adsprpcd_DEPENDENCIES = libadsp_default_listener.la
 adsprpcd_CFLAGS = -I$(top_srcdir)/inc -DDEFAULT_DOMAIN_ID=0 -DUSE_SYSLOG -DNO_HAL
 adsprpcd_LDADD = -ldl $(USE_LOG)
 
 
 cdsprpcddir = $(libdir)
-cdsprpcd_SOURCES = cdsprpcd.c
+cdsprpcd_SOURCES = daemon/cdsprpcd.c
 cdsprpcd_DEPENDENCIES = libcdsp_default_listener.la
 cdsprpcd_CFLAGS = -I$(top_srcdir)/inc -DDEFAULT_DOMAIN_ID=3 -DUSE_SYSLOG -DNO_HAL
 cdsprpcd_LDADD =  -ldl $(USE_LOG)
 
 
 sdsprpcddir = $(libdir)
-sdsprpcd_SOURCES = cdsprpcd.c
+sdsprpcd_SOURCES = daemon/cdsprpcd.c
 sdsprpcd_DEPENDENCIES = libsdsp_default_listener.la
 sdsprpcd_CFLAGS = -I$(top_srcdir)/inc -DDEFAULT_DOMAIN_ID=2 -DUSE_SYSLOG -DNO_HAL
 sdsprpcd_LDADD =  -ldl $(USE_LOG)

diff --git a/src/adsprpc_blacklist.txt b/src/adsprpc_blacklist.txt
@@ -1,4 +1,4 @@
-src:*/adspmsgd_apps_skel.c
-src:*/apps_mem_skel.c
-src:*/apps_remotectl_skel.c
-src:*/apps_std_skel.c
+src:*/dspInterface/adspmsgd_apps_skel.c
+src:*/dspInterface/apps_mem_skel.c
+src:*/dspInterface/apps_remotectl_skel.c
+src:*/dspInterface/apps_std_skel.c
diff --git a/src/BufBound.c → src/common/BufBound.c b/src/BufBound.c → src/common/BufBound.c
diff --git a/src/atomic.c → src/common/atomic.c b/src/atomic.c → src/common/atomic.c
diff --git a/src/cae.c → src/common/cae.c b/src/cae.c → src/common/cae.c
diff --git a/src/gpls.c → src/common/gpls.c b/src/gpls.c → src/common/gpls.c
diff --git a/src/mod_table.c → src/common/mod_table.c b/src/mod_table.c → src/common/mod_table.c
diff --git a/src/pl_list.c → src/common/pl_list.c b/src/pl_list.c → src/common/pl_list.c
diff --git a/src/platform_libs.c → src/common/platform_libs.c b/src/platform_libs.c → src/common/platform_libs.c
diff --git a/src/smath.c → src/common/smath.c b/src/smath.c → src/common/smath.c
diff --git a/src/std.c → src/common/std.c b/src/std.c → src/common/std.c
diff --git a/src/std_SwapBytes.c → src/common/std_SwapBytes.c b/src/std_SwapBytes.c → src/common/std_SwapBytes.c
diff --git a/src/std_dtoa.c → src/common/std_dtoa.c b/src/std_dtoa.c → src/common/std_dtoa.c
diff --git a/src/std_mem.c → src/common/std_mem.c b/src/std_mem.c → src/common/std_mem.c
diff --git a/src/std_path.c → src/common/std_path.c b/src/std_path.c → src/common/std_path.c
diff --git a/src/std_strlprintf.c → src/common/std_strlprintf.c b/src/std_strlprintf.c → src/common/std_strlprintf.c
diff --git a/src/fastrpc_async.c → src/control/fastrpc_async.c b/src/fastrpc_async.c → src/control/fastrpc_async.c
diff --git a/src/fastrpc_cap.c → src/control/fastrpc_cap.c b/src/fastrpc_cap.c → src/control/fastrpc_cap.c
diff --git a/src/fastrpc_config.c → src/control/fastrpc_config.c b/src/fastrpc_config.c → src/control/fastrpc_config.c
diff --git a/src/fastrpc_ioctl.c → src/control/fastrpc_ioctl.c b/src/fastrpc_ioctl.c → src/control/fastrpc_ioctl.c
diff --git a/src/fastrpc_notif.c → src/control/fastrpc_notif.c b/src/fastrpc_notif.c → src/control/fastrpc_notif.c
diff --git a/src/fastrpc_pm.c → src/control/fastrpc_pm.c b/src/fastrpc_pm.c → src/control/fastrpc_pm.c
diff --git a/src/fastrpc_procbuf.c → src/control/fastrpc_procbuf.c b/src/fastrpc_procbuf.c → src/control/fastrpc_procbuf.c
diff --git a/src/adsprpcd.c → src/daemon/adsprpcd.c b/src/adsprpcd.c → src/daemon/adsprpcd.c
diff --git a/src/cdsprpcd.c → src/daemon/cdsprpcd.c b/src/cdsprpcd.c → src/daemon/cdsprpcd.c
diff --git a/src/dspsignal.c → src/daemon/dspsignal.c b/src/dspsignal.c → src/daemon/dspsignal.c
diff --git a/src/adspmsgd.c → src/debug/adspmsgd.c b/src/adspmsgd.c → src/debug/adspmsgd.c
diff --git a/src/adspmsgd_printf.c → src/debug/adspmsgd_printf.c b/src/adspmsgd_printf.c → src/debug/adspmsgd_printf.c
diff --git a/src/fastrpc_log.c → src/debug/fastrpc_log.c b/src/fastrpc_log.c → src/debug/fastrpc_log.c
diff --git a/src/log_config.c → src/debug/log_config.c b/src/log_config.c → src/debug/log_config.c
diff --git a/src/adsp_current_process1_stub.c → ...dspInterface/adsp_current_process1_stub.c b/src/adsp_current_process1_stub.c → ...dspInterface/adsp_current_process1_stub.c
diff --git a/src/adsp_current_process_stub.c → src/dspInterface/adsp_current_process_stub.c b/src/adsp_current_process_stub.c → src/dspInterface/adsp_current_process_stub.c
diff --git a/src/adsp_default_listener1_stub.c → ...spInterface/adsp_default_listener1_stub.c b/src/adsp_default_listener1_stub.c → ...spInterface/adsp_default_listener1_stub.c
diff --git a/src/adsp_default_listener_stub.c → ...dspInterface/adsp_default_listener_stub.c b/src/adsp_default_listener_stub.c → ...dspInterface/adsp_default_listener_stub.c
diff --git a/src/adsp_listener1_stub.c → src/dspInterface/adsp_listener1_stub.c b/src/adsp_listener1_stub.c → src/dspInterface/adsp_listener1_stub.c
diff --git a/src/adsp_listener_stub.c → src/dspInterface/adsp_listener_stub.c b/src/adsp_listener_stub.c → src/dspInterface/adsp_listener_stub.c
diff --git a/src/adsp_perf1_stub.c → src/dspInterface/adsp_perf1_stub.c b/src/adsp_perf1_stub.c → src/dspInterface/adsp_perf1_stub.c
diff --git a/src/adsp_perf_stub.c → src/dspInterface/adsp_perf_stub.c b/src/adsp_perf_stub.c → src/dspInterface/adsp_perf_stub.c
diff --git a/src/adspmsgd_adsp1_stub.c → src/dspInterface/adspmsgd_adsp1_stub.c b/src/adspmsgd_adsp1_stub.c → src/dspInterface/adspmsgd_adsp1_stub.c
diff --git a/src/adspmsgd_adsp_stub.c → src/dspInterface/adspmsgd_adsp_stub.c b/src/adspmsgd_adsp_stub.c → src/dspInterface/adspmsgd_adsp_stub.c
diff --git a/src/adspmsgd_apps_skel.c → src/dspInterface/adspmsgd_apps_skel.c b/src/adspmsgd_apps_skel.c → src/dspInterface/adspmsgd_apps_skel.c
diff --git a/src/apps_mem_skel.c → src/dspInterface/apps_mem_skel.c b/src/apps_mem_skel.c → src/dspInterface/apps_mem_skel.c
diff --git a/src/apps_remotectl_skel.c → src/dspInterface/apps_remotectl_skel.c b/src/apps_remotectl_skel.c → src/dspInterface/apps_remotectl_skel.c
diff --git a/src/apps_std_skel.c → src/dspInterface/apps_std_skel.c b/src/apps_std_skel.c → src/dspInterface/apps_std_skel.c
diff --git a/src/remotectl1_stub.c → src/dspInterface/remotectl1_stub.c b/src/remotectl1_stub.c → src/dspInterface/remotectl1_stub.c
diff --git a/src/remotectl_stub.c → src/dspInterface/remotectl_stub.c b/src/remotectl_stub.c → src/dspInterface/remotectl_stub.c
diff --git a/src/fastrpc_apps_user.c → src/fastrpc_apps_core.c b/src/fastrpc_apps_user.c → src/fastrpc_apps_core.c
diff --git a/src/adsp_default_listener.c → src/listener/adsp_default_listener.c b/src/adsp_default_listener.c → src/listener/adsp_default_listener.c
diff --git a/src/apps_std_imp.c → src/listener/apps_std_imp.c b/src/apps_std_imp.c → src/listener/apps_std_imp.c
diff --git a/src/listener_android.c → src/listener/listener_android.c b/src/listener_android.c → src/listener/listener_android.c
diff --git a/src/apps_mem_imp.c → src/memory/apps_mem_imp.c b/src/apps_mem_imp.c → src/memory/apps_mem_imp.c
diff --git a/src/fastrpc_mem.c → src/memory/fastrpc_mem.c b/src/fastrpc_mem.c → src/memory/fastrpc_mem.c
diff --git a/src/rpcmem_linux.c → src/memory/rpcmem_linux.c b/src/rpcmem_linux.c → src/memory/rpcmem_linux.c
diff --git a/src/fastrpc_latency.c → src/profile/fastrpc_latency.c b/src/fastrpc_latency.c → src/profile/fastrpc_latency.c
diff --git a/src/fastrpc_perf.c → src/profile/fastrpc_perf.c b/src/fastrpc_perf.c → src/profile/fastrpc_perf.c