rtms-tld: Refactor the code to match a better configuration format.

1 files changed, 22 insertions, 12 deletions

diff --git a/test-trace.ini b/test-trace.ini
index ae0a2de..a6205d2 100644
--- a/test-trace.ini
+++ b/test-trace.ini
@@ -11,15 +11,20 @@ name = RTEMS Trace Linker Test
 ;
 ; The BSP.
 ;
-bsp = sis
+bsp = sparc/sis
+;
+; Options can be defined here or on the command line.
+;
+options = all-funcs, verbose
 ;
 ; Functions to trace.
 ;
-trace = test-trace, test-trace-funcs, rtems-api-task
+traces = test-trace, test-trace-funcs, rtems-api-task
 ;
-; Define the wrapper.
+; Define the function sets. These are the function's that can be
+; added to the trace lists.
 ;
-wrapper = test-trace, rtems-api
+functions = test-trace-funcs, rtems-api
 ;
 ; Include RTEMS Trace support.
 ;
@@ -28,21 +33,26 @@ include = rtems.ini, rtld-base.ini
 ;
 ; User application trace example.
 ;
-[test-trace-funcs]
-trace = test_trace_1, test_trace_2
-
 [test-trace]
+generator = printf-generator
+; Just here for testing.
 trace = test_trace_3
-header = '#include "test-trace.h"'
-define = "#define TEST_TRACE 1"
+
+[test-trace-funcs]
+; Parsed via the 'function-set', not parse as a 'trace'.
+headers = test-headers
+header = '#include "test-trace-2.h"'
+defines = test-defines
+define = "#define TEST_TRACE_2 2"
 signatures = test-signatures
-generator = printf-generator
+; Parsed via the 'trace', not parsed as a function-set
+trace = test_trace_1, test_trace_2
 
 [test-headers]
-header = '#include "test-trace.h"'
+header = '#include "test-trace-1.h"'
 
 [test-defines]
-define = "#define TEST_TRACE 1"
+define = "#define TEST_TRACE_1 1"
 
 [test-signatures]
 test_trace_1 = void, int