diff --git a/firmware/smi_ctrl.v b/firmware/smi_ctrl.v index 0529f49..4e9bb0d 100644 --- a/firmware/smi_ctrl.v +++ b/firmware/smi_ctrl.v @@ -46,6 +46,18 @@ module smi_ctrl localparam module_version = 8'b00000001; + // SMI ADDRESS DEFS + // ---------------- + localparam + smi_address_idle = 3'b000, + smi_address_read_900 = 3'b001, + smi_address_read_2400 = 3'b010, + smi_address_read_res = 3'b011, + smi_address_read_res1 = 3'b100, + smi_address_write_900 = 3'b101, + smi_address_write_2400 = 3'b110, + smi_address_write_res2 = 3'b111; + always @(posedge i_sys_clk) begin if (i_reset) begin @@ -94,7 +106,7 @@ module smi_ctrl //========================== // 0.9 GHz Data Sender //========================== - if (i_smi_a == 3'b000) begin + if (i_smi_a == smi_address_read_900) begin if (r_last_soe != i_smi_soe_se) begin if (int_cnt_09 > 8) int_cnt_09 <= int_cnt_09 - 8; if (r_fifo_09_pull) begin @@ -115,7 +127,7 @@ module smi_ctrl //========================== // 2.4 GHz Data Sender //========================== - else if (i_smi_a == 3'b001) begin + else if (i_smi_a == smi_address_read_2400) begin if (r_last_soe != i_smi_soe_se) begin if (int_cnt_24 > 8) int_cnt_24 <= int_cnt_24 - 8; if (r_fifo_24_pull) begin diff --git a/software/libcariboulite/build/CMakeFiles/Makefile2 b/software/libcariboulite/build/CMakeFiles/Makefile2 index 93d5594..08b680d 100644 --- a/software/libcariboulite/build/CMakeFiles/Makefile2 +++ b/software/libcariboulite/build/CMakeFiles/Makefile2 @@ -288,12 +288,12 @@ CMakeFiles/cariboulite.dir/all: src/io_utils/CMakeFiles/io_utils.dir/all CMakeFiles/cariboulite.dir/all: src/zf_log/CMakeFiles/zf_log.dir/all $(MAKE) $(MAKESILENT) -f CMakeFiles/cariboulite.dir/build.make CMakeFiles/cariboulite.dir/depend $(MAKE) $(MAKESILENT) -f CMakeFiles/cariboulite.dir/build.make CMakeFiles/cariboulite.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=13,14,15 "Built target cariboulite" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=12,13,14 "Built target cariboulite" .PHONY : CMakeFiles/cariboulite.dir/all # Build rule for subdir invocation for target. CMakeFiles/cariboulite.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 24 + $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 23 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/cariboulite.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 0 .PHONY : CMakeFiles/cariboulite.dir/rule @@ -322,12 +322,12 @@ CMakeFiles/fpgacomm.dir/all: src/io_utils/CMakeFiles/io_utils.dir/all CMakeFiles/fpgacomm.dir/all: src/zf_log/CMakeFiles/zf_log.dir/all $(MAKE) $(MAKESILENT) -f CMakeFiles/fpgacomm.dir/build.make CMakeFiles/fpgacomm.dir/depend $(MAKE) $(MAKESILENT) -f CMakeFiles/fpgacomm.dir/build.make CMakeFiles/fpgacomm.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=18,19 "Built target fpgacomm" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=17,18 "Built target fpgacomm" .PHONY : CMakeFiles/fpgacomm.dir/all # Build rule for subdir invocation for target. CMakeFiles/fpgacomm.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 26 + $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 25 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/fpgacomm.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 0 .PHONY : CMakeFiles/fpgacomm.dir/rule @@ -356,12 +356,12 @@ CMakeFiles/ice40programmer.dir/all: src/io_utils/CMakeFiles/io_utils.dir/all CMakeFiles/ice40programmer.dir/all: src/zf_log/CMakeFiles/zf_log.dir/all $(MAKE) $(MAKESILENT) -f CMakeFiles/ice40programmer.dir/build.make CMakeFiles/ice40programmer.dir/depend $(MAKE) $(MAKESILENT) -f CMakeFiles/ice40programmer.dir/build.make CMakeFiles/ice40programmer.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=20,21 "Built target ice40programmer" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=19,20 "Built target ice40programmer" .PHONY : CMakeFiles/ice40programmer.dir/all # Build rule for subdir invocation for target. CMakeFiles/ice40programmer.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 26 + $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 25 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/ice40programmer.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 0 .PHONY : CMakeFiles/ice40programmer.dir/rule @@ -383,7 +383,7 @@ CMakeFiles/ice40programmer.dir/clean: src/datatypes/CMakeFiles/test_datatypes.dir/all: src/datatypes/CMakeFiles/datatypes.dir/all $(MAKE) $(MAKESILENT) -f src/datatypes/CMakeFiles/test_datatypes.dir/build.make src/datatypes/CMakeFiles/test_datatypes.dir/depend $(MAKE) $(MAKESILENT) -f src/datatypes/CMakeFiles/test_datatypes.dir/build.make src/datatypes/CMakeFiles/test_datatypes.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=47,48 "Built target test_datatypes" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=45,46 "Built target test_datatypes" .PHONY : src/datatypes/CMakeFiles/test_datatypes.dir/all # Build rule for subdir invocation for target. @@ -410,7 +410,7 @@ src/datatypes/CMakeFiles/test_datatypes.dir/clean: src/datatypes/CMakeFiles/datatypes.dir/all: $(MAKE) $(MAKESILENT) -f src/datatypes/CMakeFiles/datatypes.dir/build.make src/datatypes/CMakeFiles/datatypes.dir/depend $(MAKE) $(MAKESILENT) -f src/datatypes/CMakeFiles/datatypes.dir/build.make src/datatypes/CMakeFiles/datatypes.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=16,17 "Built target datatypes" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=15,16 "Built target datatypes" .PHONY : src/datatypes/CMakeFiles/datatypes.dir/all # Build rule for subdir invocation for target. @@ -437,7 +437,7 @@ src/datatypes/CMakeFiles/datatypes.dir/clean: src/ustimer/CMakeFiles/test_ustimer.dir/all: src/ustimer/CMakeFiles/ustimer.dir/all $(MAKE) $(MAKESILENT) -f src/ustimer/CMakeFiles/test_ustimer.dir/build.make src/ustimer/CMakeFiles/test_ustimer.dir/depend $(MAKE) $(MAKESILENT) -f src/ustimer/CMakeFiles/test_ustimer.dir/build.make src/ustimer/CMakeFiles/test_ustimer.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=54,55 "Built target test_ustimer" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=52,53 "Built target test_ustimer" .PHONY : src/ustimer/CMakeFiles/test_ustimer.dir/all # Build rule for subdir invocation for target. @@ -464,7 +464,7 @@ src/ustimer/CMakeFiles/test_ustimer.dir/clean: src/ustimer/CMakeFiles/ustimer.dir/all: $(MAKE) $(MAKESILENT) -f src/ustimer/CMakeFiles/ustimer.dir/build.make src/ustimer/CMakeFiles/ustimer.dir/depend $(MAKE) $(MAKESILENT) -f src/ustimer/CMakeFiles/ustimer.dir/build.make src/ustimer/CMakeFiles/ustimer.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=56,57 "Built target ustimer" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=54,55 "Built target ustimer" .PHONY : src/ustimer/CMakeFiles/ustimer.dir/all # Build rule for subdir invocation for target. @@ -491,7 +491,7 @@ src/ustimer/CMakeFiles/ustimer.dir/clean: src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/all: $(MAKE) $(MAKESILENT) -f src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/build.make src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/depend $(MAKE) $(MAKESILENT) -f src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/build.make src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=38,39,40 "Built target test_caribou_fpga" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=37,38,39 "Built target test_caribou_fpga" .PHONY : src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/all # Build rule for subdir invocation for target. @@ -545,7 +545,7 @@ src/caribou_fpga/CMakeFiles/caribou_fpga.dir/clean: src/at86rf215/CMakeFiles/test_at86rf215.dir/all: $(MAKE) $(MAKESILENT) -f src/at86rf215/CMakeFiles/test_at86rf215.dir/build.make src/at86rf215/CMakeFiles/test_at86rf215.dir/depend $(MAKE) $(MAKESILENT) -f src/at86rf215/CMakeFiles/test_at86rf215.dir/build.make src/at86rf215/CMakeFiles/test_at86rf215.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=32,33,34,35,36,37 "Built target test_at86rf215" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=31,32,33,34,35,36 "Built target test_at86rf215" .PHONY : src/at86rf215/CMakeFiles/test_at86rf215.dir/all # Build rule for subdir invocation for target. @@ -599,12 +599,12 @@ src/at86rf215/CMakeFiles/at86rf215.dir/clean: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/all: $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/depend $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=41,42,43,44,45,46 "Built target test_caribou_smi" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=40,41,42,43,44 "Built target test_caribou_smi" .PHONY : src/caribou_smi/CMakeFiles/test_caribou_smi.dir/all # Build rule for subdir invocation for target. src/caribou_smi/CMakeFiles/test_caribou_smi.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 6 + $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 5 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 src/caribou_smi/CMakeFiles/test_caribou_smi.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 0 .PHONY : src/caribou_smi/CMakeFiles/test_caribou_smi.dir/rule @@ -626,12 +626,12 @@ src/caribou_smi/CMakeFiles/test_caribou_smi.dir/clean: src/caribou_smi/CMakeFiles/caribou_smi.dir/all: $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/caribou_smi.dir/depend $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/caribou_smi.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=8,9,10,11,12 "Built target caribou_smi" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=8,9,10,11 "Built target caribou_smi" .PHONY : src/caribou_smi/CMakeFiles/caribou_smi.dir/all # Build rule for subdir invocation for target. src/caribou_smi/CMakeFiles/caribou_smi.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 5 + $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 4 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 src/caribou_smi/CMakeFiles/caribou_smi.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles 0 .PHONY : src/caribou_smi/CMakeFiles/caribou_smi.dir/rule @@ -653,7 +653,7 @@ src/caribou_smi/CMakeFiles/caribou_smi.dir/clean: src/latticeice40/CMakeFiles/latticeice40.dir/all: $(MAKE) $(MAKESILENT) -f src/latticeice40/CMakeFiles/latticeice40.dir/build.make src/latticeice40/CMakeFiles/latticeice40.dir/depend $(MAKE) $(MAKESILENT) -f src/latticeice40/CMakeFiles/latticeice40.dir/build.make src/latticeice40/CMakeFiles/latticeice40.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=28,29 "Built target latticeice40" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=27,28 "Built target latticeice40" .PHONY : src/latticeice40/CMakeFiles/latticeice40.dir/all # Build rule for subdir invocation for target. @@ -680,7 +680,7 @@ src/latticeice40/CMakeFiles/latticeice40.dir/clean: src/io_utils/CMakeFiles/test_io_utils.dir/all: src/io_utils/CMakeFiles/io_utils.dir/all $(MAKE) $(MAKESILENT) -f src/io_utils/CMakeFiles/test_io_utils.dir/build.make src/io_utils/CMakeFiles/test_io_utils.dir/depend $(MAKE) $(MAKESILENT) -f src/io_utils/CMakeFiles/test_io_utils.dir/build.make src/io_utils/CMakeFiles/test_io_utils.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=49,50 "Built target test_io_utils" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=47,48 "Built target test_io_utils" .PHONY : src/io_utils/CMakeFiles/test_io_utils.dir/all # Build rule for subdir invocation for target. @@ -707,7 +707,7 @@ src/io_utils/CMakeFiles/test_io_utils.dir/clean: src/io_utils/CMakeFiles/io_utils.dir/all: $(MAKE) $(MAKESILENT) -f src/io_utils/CMakeFiles/io_utils.dir/build.make src/io_utils/CMakeFiles/io_utils.dir/depend $(MAKE) $(MAKESILENT) -f src/io_utils/CMakeFiles/io_utils.dir/build.make src/io_utils/CMakeFiles/io_utils.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=22,23,24,25,26,27 "Built target io_utils" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=21,22,23,24,25,26 "Built target io_utils" .PHONY : src/io_utils/CMakeFiles/io_utils.dir/all # Build rule for subdir invocation for target. @@ -734,7 +734,7 @@ src/io_utils/CMakeFiles/io_utils.dir/clean: src/rffc507x/CMakeFiles/test_rffc507x.dir/all: $(MAKE) $(MAKESILENT) -f src/rffc507x/CMakeFiles/test_rffc507x.dir/build.make src/rffc507x/CMakeFiles/test_rffc507x.dir/depend $(MAKE) $(MAKESILENT) -f src/rffc507x/CMakeFiles/test_rffc507x.dir/build.make src/rffc507x/CMakeFiles/test_rffc507x.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=51,52,53 "Built target test_rffc507x" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=49,50,51 "Built target test_rffc507x" .PHONY : src/rffc507x/CMakeFiles/test_rffc507x.dir/all # Build rule for subdir invocation for target. @@ -761,7 +761,7 @@ src/rffc507x/CMakeFiles/test_rffc507x.dir/clean: src/rffc507x/CMakeFiles/rffc507x.dir/all: $(MAKE) $(MAKESILENT) -f src/rffc507x/CMakeFiles/rffc507x.dir/build.make src/rffc507x/CMakeFiles/rffc507x.dir/depend $(MAKE) $(MAKESILENT) -f src/rffc507x/CMakeFiles/rffc507x.dir/build.make src/rffc507x/CMakeFiles/rffc507x.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=30,31 "Built target rffc507x" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=29,30 "Built target rffc507x" .PHONY : src/rffc507x/CMakeFiles/rffc507x.dir/all # Build rule for subdir invocation for target. @@ -788,7 +788,7 @@ src/rffc507x/CMakeFiles/rffc507x.dir/clean: src/zf_log/CMakeFiles/zf_log.dir/all: $(MAKE) $(MAKESILENT) -f src/zf_log/CMakeFiles/zf_log.dir/build.make src/zf_log/CMakeFiles/zf_log.dir/depend $(MAKE) $(MAKESILENT) -f src/zf_log/CMakeFiles/zf_log.dir/build.make src/zf_log/CMakeFiles/zf_log.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=58,59 "Built target zf_log" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=56,57 "Built target zf_log" .PHONY : src/zf_log/CMakeFiles/zf_log.dir/all # Build rule for subdir invocation for target. diff --git a/software/libcariboulite/build/CMakeFiles/Progress/58 b/software/libcariboulite/build/CMakeFiles/Progress/10 similarity index 100% rename from software/libcariboulite/build/CMakeFiles/Progress/58 rename to software/libcariboulite/build/CMakeFiles/Progress/10 diff --git a/software/libcariboulite/build/CMakeFiles/Progress/59 b/software/libcariboulite/build/CMakeFiles/Progress/11 similarity index 100% rename from software/libcariboulite/build/CMakeFiles/Progress/59 rename to software/libcariboulite/build/CMakeFiles/Progress/11 diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/5 b/software/libcariboulite/build/CMakeFiles/Progress/12 similarity index 100% rename from software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/5 rename to software/libcariboulite/build/CMakeFiles/Progress/12 diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/8 b/software/libcariboulite/build/CMakeFiles/Progress/13 similarity index 100% rename from software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/8 rename to software/libcariboulite/build/CMakeFiles/Progress/13 diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/9 b/software/libcariboulite/build/CMakeFiles/Progress/14 similarity index 100% rename from software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/9 rename to software/libcariboulite/build/CMakeFiles/Progress/14 diff --git a/software/libcariboulite/build/CMakeFiles/Progress/15 b/software/libcariboulite/build/CMakeFiles/Progress/15 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/15 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/18 b/software/libcariboulite/build/CMakeFiles/Progress/18 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/18 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/21 b/software/libcariboulite/build/CMakeFiles/Progress/21 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/21 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/22 b/software/libcariboulite/build/CMakeFiles/Progress/22 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/22 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/23 b/software/libcariboulite/build/CMakeFiles/Progress/23 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/23 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/24 b/software/libcariboulite/build/CMakeFiles/Progress/24 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/24 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/25 b/software/libcariboulite/build/CMakeFiles/Progress/25 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/25 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/26 b/software/libcariboulite/build/CMakeFiles/Progress/26 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/26 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/27 b/software/libcariboulite/build/CMakeFiles/Progress/27 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/27 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/28 b/software/libcariboulite/build/CMakeFiles/Progress/28 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/28 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/54 b/software/libcariboulite/build/CMakeFiles/Progress/54 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/54 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/55 b/software/libcariboulite/build/CMakeFiles/Progress/55 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/55 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/7 b/software/libcariboulite/build/CMakeFiles/Progress/7 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/7 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/8 b/software/libcariboulite/build/CMakeFiles/Progress/8 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/8 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/9 b/software/libcariboulite/build/CMakeFiles/Progress/9 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/build/CMakeFiles/Progress/9 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/build/CMakeFiles/Progress/count.txt b/software/libcariboulite/build/CMakeFiles/Progress/count.txt index 9902f17..f64f5d8 100644 --- a/software/libcariboulite/build/CMakeFiles/Progress/count.txt +++ b/software/libcariboulite/build/CMakeFiles/Progress/count.txt @@ -1 +1 @@ -28 +27 diff --git a/software/libcariboulite/build/CMakeFiles/cariboulite.dir/C.includecache b/software/libcariboulite/build/CMakeFiles/cariboulite.dir/C.includecache index 6f29d3a..d595970 100644 --- a/software/libcariboulite/build/CMakeFiles/cariboulite.dir/C.includecache +++ b/software/libcariboulite/build/CMakeFiles/cariboulite.dir/C.includecache @@ -49,10 +49,28 @@ io_utils/io_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/io_utils/io_utils.h io_utils/io_utils_sys_info.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/io_utils/io_utils_sys_info.h +dma_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi_defs.h stdint.h - +register_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h +stdio.h +- +string.h +- +stdint.h +- +register_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h +../io_utils/io_utils_sys_info.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/cariboulite_setup.c stdio.h diff --git a/software/libcariboulite/build/CMakeFiles/cariboulite.dir/depend.internal b/software/libcariboulite/build/CMakeFiles/cariboulite.dir/depend.internal index 96ad118..6d77bdf 100644 --- a/software/libcariboulite/build/CMakeFiles/cariboulite.dir/depend.internal +++ b/software/libcariboulite/build/CMakeFiles/cariboulite.dir/depend.internal @@ -10,6 +10,8 @@ CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_fpga/caribou_fpga.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi_defs.h + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/cariboulite_setup.c /home/pi/projects/cariboulite/software/libcariboulite/src/cariboulite_setup.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.h diff --git a/software/libcariboulite/build/CMakeFiles/cariboulite.dir/depend.make b/software/libcariboulite/build/CMakeFiles/cariboulite.dir/depend.make index 54e0ef1..5164ede 100644 --- a/software/libcariboulite/build/CMakeFiles/cariboulite.dir/depend.make +++ b/software/libcariboulite/build/CMakeFiles/cariboulite.dir/depend.make @@ -9,6 +9,8 @@ CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/at86rf215/at86rf215 CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/caribou_fpga/caribou_fpga.h CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/caribou_smi/caribou_smi.h CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/caribou_smi/caribou_smi_defs.h +CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/caribou_smi/dma_utils.h +CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/caribou_smi/register_utils.h CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/cariboulite_setup.c CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/cariboulite_setup.h CMakeFiles/cariboulite.dir/src/cariboulite_setup.c.o: ../src/io_utils/io_utils.h diff --git a/software/libcariboulite/build/CMakeFiles/cariboulite.dir/progress.make b/software/libcariboulite/build/CMakeFiles/cariboulite.dir/progress.make index d47d864..cd34084 100644 --- a/software/libcariboulite/build/CMakeFiles/cariboulite.dir/progress.make +++ b/software/libcariboulite/build/CMakeFiles/cariboulite.dir/progress.make @@ -1,4 +1,4 @@ -CMAKE_PROGRESS_1 = 13 -CMAKE_PROGRESS_2 = 14 -CMAKE_PROGRESS_3 = 15 +CMAKE_PROGRESS_1 = 12 +CMAKE_PROGRESS_2 = 13 +CMAKE_PROGRESS_3 = 14 diff --git a/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/C.includecache b/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/C.includecache index e8c84b8..84606a0 100644 --- a/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/C.includecache +++ b/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/C.includecache @@ -51,10 +51,28 @@ io_utils/io_utils.h ../src/caribou_smi/io_utils/io_utils.h io_utils/io_utils_sys_info.h ../src/caribou_smi/io_utils/io_utils_sys_info.h +dma_utils.h +../src/caribou_smi/dma_utils.h ../src/caribou_smi/caribou_smi_defs.h stdint.h - +register_utils.h +../src/caribou_smi/register_utils.h + +../src/caribou_smi/dma_utils.h +stdio.h +- +string.h +- +stdint.h +- +register_utils.h +../src/caribou_smi/register_utils.h +../io_utils/io_utils_sys_info.h +../src/io_utils/io_utils_sys_info.h + +../src/caribou_smi/register_utils.h ../src/cariboulite_setup.h latticeice40/latticeice40.h diff --git a/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/depend.internal b/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/depend.internal index 588a181..b034800 100644 --- a/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/depend.internal +++ b/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/depend.internal @@ -9,6 +9,8 @@ CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o ../src/caribou_fpga/caribou_fpga.h ../src/caribou_smi/caribou_smi.h ../src/caribou_smi/caribou_smi_defs.h + ../src/caribou_smi/dma_utils.h + ../src/caribou_smi/register_utils.h ../src/cariboulite_setup.h ../src/io_utils/io_utils.h ../src/io_utils/io_utils_spi.h diff --git a/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/depend.make b/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/depend.make index 72bd0f5..c7f4542 100644 --- a/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/depend.make +++ b/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/depend.make @@ -8,6 +8,8 @@ CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/at86rf215/at86rf215_regs CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/caribou_fpga/caribou_fpga.h CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/caribou_smi/caribou_smi.h CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/caribou_smi/caribou_smi_defs.h +CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/caribou_smi/dma_utils.h +CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/caribou_smi/register_utils.h CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/cariboulite_setup.h CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/io_utils/io_utils.h CMakeFiles/fpgacomm.dir/test/fpga_comm_test.c.o: ../src/io_utils/io_utils_spi.h diff --git a/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/progress.make b/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/progress.make index 2b041ba..5a7451d 100644 --- a/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/progress.make +++ b/software/libcariboulite/build/CMakeFiles/fpgacomm.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 18 -CMAKE_PROGRESS_2 = 19 +CMAKE_PROGRESS_1 = 17 +CMAKE_PROGRESS_2 = 18 diff --git a/software/libcariboulite/build/CMakeFiles/ice40programmer.dir/progress.make b/software/libcariboulite/build/CMakeFiles/ice40programmer.dir/progress.make index bc8bba0..48b3d8a 100644 --- a/software/libcariboulite/build/CMakeFiles/ice40programmer.dir/progress.make +++ b/software/libcariboulite/build/CMakeFiles/ice40programmer.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 20 -CMAKE_PROGRESS_2 = 21 +CMAKE_PROGRESS_1 = 19 +CMAKE_PROGRESS_2 = 20 diff --git a/software/libcariboulite/build/CMakeFiles/progress.marks b/software/libcariboulite/build/CMakeFiles/progress.marks index 9902f17..f64f5d8 100644 --- a/software/libcariboulite/build/CMakeFiles/progress.marks +++ b/software/libcariboulite/build/CMakeFiles/progress.marks @@ -1 +1 @@ -28 +27 diff --git a/software/libcariboulite/build/src/at86rf215/CMakeFiles/test_at86rf215.dir/progress.make b/software/libcariboulite/build/src/at86rf215/CMakeFiles/test_at86rf215.dir/progress.make index ed9bcdb..925ba94 100644 --- a/software/libcariboulite/build/src/at86rf215/CMakeFiles/test_at86rf215.dir/progress.make +++ b/software/libcariboulite/build/src/at86rf215/CMakeFiles/test_at86rf215.dir/progress.make @@ -1,7 +1,7 @@ -CMAKE_PROGRESS_1 = 32 -CMAKE_PROGRESS_2 = 33 -CMAKE_PROGRESS_3 = 34 -CMAKE_PROGRESS_4 = 35 -CMAKE_PROGRESS_5 = 36 -CMAKE_PROGRESS_6 = 37 +CMAKE_PROGRESS_1 = 31 +CMAKE_PROGRESS_2 = 32 +CMAKE_PROGRESS_3 = 33 +CMAKE_PROGRESS_4 = 34 +CMAKE_PROGRESS_5 = 35 +CMAKE_PROGRESS_6 = 36 diff --git a/software/libcariboulite/build/src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/progress.make b/software/libcariboulite/build/src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/progress.make index 3baecbb..debc4f1 100644 --- a/software/libcariboulite/build/src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/progress.make +++ b/software/libcariboulite/build/src/caribou_fpga/CMakeFiles/test_caribou_fpga.dir/progress.make @@ -1,4 +1,4 @@ -CMAKE_PROGRESS_1 = 38 -CMAKE_PROGRESS_2 = 39 -CMAKE_PROGRESS_3 = 40 +CMAKE_PROGRESS_1 = 37 +CMAKE_PROGRESS_2 = 38 +CMAKE_PROGRESS_3 = 39 diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/C.includecache b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/C.includecache index 057200b..1e9ff56 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/C.includecache +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/C.includecache @@ -6,107 +6,11 @@ #IncludeRegexTransform: -../src/io_utils/io_utils.h -stdio.h -- -string.h -- -stdint.h -- -stdlib.h -- -pigpio/pigpio.h -../src/io_utils/pigpio/pigpio.h - -../src/io_utils/io_utils_sys_info.h -stdio.h -- -string.h -- -stdint.h -- -stdlib.h -- -unistd.h -- -fcntl.h -- -signal.h -- -string.h -- -sys/ioctl.h -- -sys/mman.h -- - -../src/io_utils/pigpio/pigpio.h -stddef.h -- -stdint.h -- -pthread.h -- -stdio.h -- -pigpio.h -- -stdio.h -- -pigpio.h -../src/io_utils/pigpio/pigpio.h -stdio.h -- -pigpio.h -- -stdio.h -- -pigpio.h -- -stdio.h -- -pigpio.h -- - -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c -stdio.h -- -fcntl.h -- -stdint.h -- -stdlib.h -- -string.h -- -unistd.h -- -math.h -- -caribou_smi.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.h -dma_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h -mbox_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.h -register_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h - -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.h -caribou_smi_defs.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi_defs.h -io_utils/io_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/io_utils/io_utils.h -io_utils/io_utils_sys_info.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/io_utils/io_utils_sys_info.h - -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi_defs.h -stdint.h -- -register_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h +../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/zf_log/zf_log.h dma_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h register_utils.h @@ -127,6 +31,8 @@ register_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/zf_log/zf_log.h stdio.h - fcntl.h @@ -157,6 +63,8 @@ stdint.h - /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/zf_log/zf_log.h stdio.h - fcntl.h diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/DependInfo.cmake b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/DependInfo.cmake index b37bd3f..84aacbb 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/DependInfo.cmake +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/DependInfo.cmake @@ -4,7 +4,6 @@ set(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: set(CMAKE_DEPENDS_CHECK_C - "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c" "/home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o" diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make index 98bfccd..d5d23cd 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make @@ -76,22 +76,9 @@ include src/caribou_smi/CMakeFiles/caribou_smi.dir/progress.make # Include the compile flags for this target's objects. include src/caribou_smi/CMakeFiles/caribou_smi.dir/flags.make -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: src/caribou_smi/CMakeFiles/caribou_smi.dir/flags.make -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/caribou_smi/caribou_smi.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o" - cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/caribou_smi.dir/caribou_smi.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c - -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/caribou_smi.dir/caribou_smi.c.i" - cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c > CMakeFiles/caribou_smi.dir/caribou_smi.c.i - -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/caribou_smi.dir/caribou_smi.c.s" - cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c -o CMakeFiles/caribou_smi.dir/caribou_smi.c.s - src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o: src/caribou_smi/CMakeFiles/caribou_smi.dir/flags.make src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o: ../src/caribou_smi/dma_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/caribou_smi.dir/dma_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.i: cmake_force @@ -104,7 +91,7 @@ src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.s: cmake_force src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o: src/caribou_smi/CMakeFiles/caribou_smi.dir/flags.make src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o: ../src/caribou_smi/mbox_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/caribou_smi.dir/mbox_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.i: cmake_force @@ -117,7 +104,7 @@ src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.s: cmake_force src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o: src/caribou_smi/CMakeFiles/caribou_smi.dir/flags.make src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o: ../src/caribou_smi/register_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building C object src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/caribou_smi.dir/register_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.i: cmake_force @@ -130,7 +117,6 @@ src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.s: cmake_force # Object files for target caribou_smi caribou_smi_OBJECTS = \ -"CMakeFiles/caribou_smi.dir/caribou_smi.c.o" \ "CMakeFiles/caribou_smi.dir/dma_utils.c.o" \ "CMakeFiles/caribou_smi.dir/mbox_utils.c.o" \ "CMakeFiles/caribou_smi.dir/register_utils.c.o" @@ -138,13 +124,12 @@ caribou_smi_OBJECTS = \ # External object files for target caribou_smi caribou_smi_EXTERNAL_OBJECTS = -src/caribou_smi/libcaribou_smi.a: src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o src/caribou_smi/libcaribou_smi.a: src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o src/caribou_smi/libcaribou_smi.a: src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o src/caribou_smi/libcaribou_smi.a: src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o src/caribou_smi/libcaribou_smi.a: src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make src/caribou_smi/libcaribou_smi.a: src/caribou_smi/CMakeFiles/caribou_smi.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Linking C static library libcaribou_smi.a" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Linking C static library libcaribou_smi.a" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && $(CMAKE_COMMAND) -P CMakeFiles/caribou_smi.dir/cmake_clean_target.cmake cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/caribou_smi.dir/link.txt --verbose=$(VERBOSE) diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/cmake_clean.cmake b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/cmake_clean.cmake index b3969a3..235c8ae 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/cmake_clean.cmake +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/cmake_clean.cmake @@ -1,5 +1,4 @@ file(REMOVE_RECURSE - "CMakeFiles/caribou_smi.dir/caribou_smi.c.o" "CMakeFiles/caribou_smi.dir/dma_utils.c.o" "CMakeFiles/caribou_smi.dir/mbox_utils.c.o" "CMakeFiles/caribou_smi.dir/register_utils.c.o" diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/depend.internal b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/depend.internal index 0641bb6..e17617e 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/depend.internal +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/depend.internal @@ -1,27 +1,19 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.18 -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o - ../src/io_utils/io_utils.h - ../src/io_utils/io_utils_sys_info.h - ../src/io_utils/pigpio/pigpio.h - /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c - /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.h - /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi_defs.h - /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h - /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.h - /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h - /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o + ../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o + ../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.h src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o + ../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/depend.make b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/depend.make index 7013337..7328664 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/depend.make +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/depend.make @@ -1,26 +1,18 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.18 -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/io_utils/io_utils.h -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/io_utils/io_utils_sys_info.h -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/io_utils/pigpio/pigpio.h -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/caribou_smi/caribou_smi.c -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/caribou_smi/caribou_smi.h -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/caribou_smi/caribou_smi_defs.h -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/caribou_smi/dma_utils.h -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/caribou_smi/mbox_utils.h -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/caribou_smi/register_utils.h -src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../src/io_utils/io_utils_sys_info.h - +src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o: ../src/zf_log/zf_log.h src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o: ../src/caribou_smi/dma_utils.c src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o: ../src/caribou_smi/dma_utils.h src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o: ../src/caribou_smi/mbox_utils.h src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o: ../src/caribou_smi/register_utils.h src/caribou_smi/CMakeFiles/caribou_smi.dir/dma_utils.c.o: ../src/io_utils/io_utils_sys_info.h +src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o: ../src/zf_log/zf_log.h src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o: ../src/caribou_smi/mbox_utils.c src/caribou_smi/CMakeFiles/caribou_smi.dir/mbox_utils.c.o: ../src/caribou_smi/mbox_utils.h +src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o: ../src/zf_log/zf_log.h src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o: ../src/caribou_smi/mbox_utils.h src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o: ../src/caribou_smi/register_utils.c src/caribou_smi/CMakeFiles/caribou_smi.dir/register_utils.c.o: ../src/caribou_smi/register_utils.h diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/link.txt b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/link.txt index 5b24f10..cd2e7e3 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/link.txt +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/link.txt @@ -1,2 +1,2 @@ -/usr/bin/ar qc libcaribou_smi.a CMakeFiles/caribou_smi.dir/caribou_smi.c.o CMakeFiles/caribou_smi.dir/dma_utils.c.o CMakeFiles/caribou_smi.dir/mbox_utils.c.o CMakeFiles/caribou_smi.dir/register_utils.c.o +/usr/bin/ar qc libcaribou_smi.a CMakeFiles/caribou_smi.dir/dma_utils.c.o CMakeFiles/caribou_smi.dir/mbox_utils.c.o CMakeFiles/caribou_smi.dir/register_utils.c.o /usr/bin/ranlib libcaribou_smi.a diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/progress.make b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/progress.make index d8690a7..fe9cea3 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/progress.make +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/caribou_smi.dir/progress.make @@ -2,5 +2,4 @@ CMAKE_PROGRESS_1 = 8 CMAKE_PROGRESS_2 = 9 CMAKE_PROGRESS_3 = 10 CMAKE_PROGRESS_4 = 11 -CMAKE_PROGRESS_5 = 12 diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/progress.marks b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/progress.marks index b4de394..ec63514 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/progress.marks +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/progress.marks @@ -1 +1 @@ -11 +9 diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/DependInfo.cmake b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/DependInfo.cmake index 1084763..0713b18 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/DependInfo.cmake +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/DependInfo.cmake @@ -4,7 +4,6 @@ set(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: set(CMAKE_DEPENDS_CHECK_C - "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c" "/home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/register_utils.c.o" diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make index 3210746..be230f5 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make @@ -76,22 +76,9 @@ include src/caribou_smi/CMakeFiles/test_caribou_smi.dir/progress.make # Include the compile flags for this target's objects. include src/caribou_smi/CMakeFiles/test_caribou_smi.dir/flags.make -src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/flags.make -src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../src/caribou_smi/caribou_smi.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o" - cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c - -src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/test_caribou_smi.dir/caribou_smi.c.i" - cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c > CMakeFiles/test_caribou_smi.dir/caribou_smi.c.i - -src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/test_caribou_smi.dir/caribou_smi.c.s" - cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c -o CMakeFiles/test_caribou_smi.dir/caribou_smi.c.s - src/caribou_smi/CMakeFiles/test_caribou_smi.dir/dma_utils.c.o: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/flags.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/dma_utils.c.o: ../src/caribou_smi/dma_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/dma_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c src/caribou_smi/CMakeFiles/test_caribou_smi.dir/dma_utils.c.i: cmake_force @@ -104,7 +91,7 @@ src/caribou_smi/CMakeFiles/test_caribou_smi.dir/dma_utils.c.s: cmake_force src/caribou_smi/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/flags.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o: ../src/caribou_smi/mbox_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c src/caribou_smi/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.i: cmake_force @@ -117,7 +104,7 @@ src/caribou_smi/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.s: cmake_force src/caribou_smi/CMakeFiles/test_caribou_smi.dir/register_utils.c.o: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/flags.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/register_utils.c.o: ../src/caribou_smi/register_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/register_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/register_utils.c.o" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/register_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c src/caribou_smi/CMakeFiles/test_caribou_smi.dir/register_utils.c.i: cmake_force @@ -130,7 +117,7 @@ src/caribou_smi/CMakeFiles/test_caribou_smi.dir/register_utils.c.s: cmake_force src/caribou_smi/CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/flags.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o: ../src/caribou_smi/test_caribou_smi.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building C object src/caribou_smi/CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/test_caribou_smi.c src/caribou_smi/CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.i: cmake_force @@ -143,7 +130,6 @@ src/caribou_smi/CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.s: cmake_forc # Object files for target test_caribou_smi test_caribou_smi_OBJECTS = \ -"CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o" \ "CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" \ "CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" \ "CMakeFiles/test_caribou_smi.dir/register_utils.c.o" \ @@ -152,15 +138,15 @@ test_caribou_smi_OBJECTS = \ # External object files for target test_caribou_smi test_caribou_smi_EXTERNAL_OBJECTS = -src/caribou_smi/test_caribou_smi: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o src/caribou_smi/test_caribou_smi: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/dma_utils.c.o src/caribou_smi/test_caribou_smi: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o src/caribou_smi/test_caribou_smi: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/register_utils.c.o src/caribou_smi/test_caribou_smi: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o src/caribou_smi/test_caribou_smi: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make src/caribou_smi/test_caribou_smi: ../src/caribou_smi/../io_utils/build/libio_utils.a +src/caribou_smi/test_caribou_smi: ../src/caribou_smi/../zf_log/build/libzf_log.a src/caribou_smi/test_caribou_smi: src/caribou_smi/CMakeFiles/test_caribou_smi.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Linking C executable test_caribou_smi" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Linking C executable test_caribou_smi" cd /home/pi/projects/cariboulite/software/libcariboulite/build/src/caribou_smi && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/test_caribou_smi.dir/link.txt --verbose=$(VERBOSE) # Rule to build all files generated by this target. diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/cmake_clean.cmake b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/cmake_clean.cmake index 679c4fe..e5110f8 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/cmake_clean.cmake +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/cmake_clean.cmake @@ -1,5 +1,4 @@ file(REMOVE_RECURSE - "CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o" "CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" "CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" "CMakeFiles/test_caribou_smi.dir/register_utils.c.o" diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/link.txt b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/link.txt index 93b4b3b..d6d327a 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/link.txt +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/link.txt @@ -1 +1 @@ -/usr/bin/cc -O3 -DNDEBUG CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o CMakeFiles/test_caribou_smi.dir/dma_utils.c.o CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o CMakeFiles/test_caribou_smi.dir/register_utils.c.o CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o -o test_caribou_smi ../../../src/caribou_smi/../io_utils/build/libio_utils.a -lm -lrt -lpthread +/usr/bin/cc -O3 -DNDEBUG CMakeFiles/test_caribou_smi.dir/dma_utils.c.o CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o CMakeFiles/test_caribou_smi.dir/register_utils.c.o CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o -o test_caribou_smi ../../../src/caribou_smi/../io_utils/build/libio_utils.a ../../../src/caribou_smi/../zf_log/build/libzf_log.a -lm -lrt -lpthread diff --git a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/progress.make b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/progress.make index 6471eb3..a59be34 100644 --- a/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/progress.make +++ b/software/libcariboulite/build/src/caribou_smi/CMakeFiles/test_caribou_smi.dir/progress.make @@ -1,7 +1,6 @@ -CMAKE_PROGRESS_1 = 41 -CMAKE_PROGRESS_2 = 42 -CMAKE_PROGRESS_3 = 43 -CMAKE_PROGRESS_4 = 44 -CMAKE_PROGRESS_5 = 45 -CMAKE_PROGRESS_6 = 46 +CMAKE_PROGRESS_1 = 40 +CMAKE_PROGRESS_2 = 41 +CMAKE_PROGRESS_3 = 42 +CMAKE_PROGRESS_4 = 43 +CMAKE_PROGRESS_5 = 44 diff --git a/software/libcariboulite/build/src/caribou_smi/Makefile b/software/libcariboulite/build/src/caribou_smi/Makefile index c776250..b66ba94 100644 --- a/software/libcariboulite/build/src/caribou_smi/Makefile +++ b/software/libcariboulite/build/src/caribou_smi/Makefile @@ -205,36 +205,6 @@ caribou_smi/fast: cd /home/pi/projects/cariboulite/software/libcariboulite/build && $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/caribou_smi.dir/build .PHONY : caribou_smi/fast -caribou_smi.o: caribou_smi.c.o - -.PHONY : caribou_smi.o - -# target to build an object file -caribou_smi.c.o: - cd /home/pi/projects/cariboulite/software/libcariboulite/build && $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o - cd /home/pi/projects/cariboulite/software/libcariboulite/build && $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.o -.PHONY : caribou_smi.c.o - -caribou_smi.i: caribou_smi.c.i - -.PHONY : caribou_smi.i - -# target to preprocess a source file -caribou_smi.c.i: - cd /home/pi/projects/cariboulite/software/libcariboulite/build && $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.i - cd /home/pi/projects/cariboulite/software/libcariboulite/build && $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.i -.PHONY : caribou_smi.c.i - -caribou_smi.s: caribou_smi.c.s - -.PHONY : caribou_smi.s - -# target to generate assembly for a file -caribou_smi.c.s: - cd /home/pi/projects/cariboulite/software/libcariboulite/build && $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/test_caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.s - cd /home/pi/projects/cariboulite/software/libcariboulite/build && $(MAKE) $(MAKESILENT) -f src/caribou_smi/CMakeFiles/caribou_smi.dir/build.make src/caribou_smi/CMakeFiles/caribou_smi.dir/caribou_smi.c.s -.PHONY : caribou_smi.c.s - dma_utils.o: dma_utils.c.o .PHONY : dma_utils.o @@ -366,9 +336,6 @@ help: @echo "... rebuild_cache" @echo "... caribou_smi" @echo "... test_caribou_smi" - @echo "... caribou_smi.o" - @echo "... caribou_smi.i" - @echo "... caribou_smi.s" @echo "... dma_utils.o" @echo "... dma_utils.i" @echo "... dma_utils.s" diff --git a/software/libcariboulite/build/src/datatypes/CMakeFiles/datatypes.dir/progress.make b/software/libcariboulite/build/src/datatypes/CMakeFiles/datatypes.dir/progress.make index d7d1be2..a35c33b 100644 --- a/software/libcariboulite/build/src/datatypes/CMakeFiles/datatypes.dir/progress.make +++ b/software/libcariboulite/build/src/datatypes/CMakeFiles/datatypes.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 16 -CMAKE_PROGRESS_2 = 17 +CMAKE_PROGRESS_1 = 15 +CMAKE_PROGRESS_2 = 16 diff --git a/software/libcariboulite/build/src/datatypes/CMakeFiles/test_datatypes.dir/progress.make b/software/libcariboulite/build/src/datatypes/CMakeFiles/test_datatypes.dir/progress.make index ab595e5..ddd8d40 100644 --- a/software/libcariboulite/build/src/datatypes/CMakeFiles/test_datatypes.dir/progress.make +++ b/software/libcariboulite/build/src/datatypes/CMakeFiles/test_datatypes.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 47 -CMAKE_PROGRESS_2 = 48 +CMAKE_PROGRESS_1 = 45 +CMAKE_PROGRESS_2 = 46 diff --git a/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/C.includecache b/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/C.includecache index 8e54ca9..8eb4683 100644 --- a/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/C.includecache +++ b/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/C.includecache @@ -6,3 +6,199 @@ #IncludeRegexTransform: +../src/zf_log/zf_log.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.c +time.h +- +pigpio/pigpio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/zf_log/zf_log.h +io_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.h +stdio.h +- +string.h +- +stdint.h +- +stdlib.h +- +pigpio/pigpio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_spi.c +pthread.h +- +time.h +- +errno.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/zf_log/zf_log.h +io_utils_spi.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_spi.h +io_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_spi.h +stdio.h +- +stdint.h +- +pthread.h +- +io_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.c +stdio.h +- +arpa/inet.h +- +time.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/zf_log/zf_log.h +io_utils_sys_info.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h +stdio.h +- +string.h +- +stdint.h +- +stdlib.h +- +unistd.h +- +fcntl.h +- +signal.h +- +string.h +- +sys/ioctl.h +- +sys/mman.h +- + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/command.h +stdio.h +- +string.h +- +pigpio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/custom.cext +pigpio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.c +stdio.h +- +string.h +- +strings.h +- +stdlib.h +- +stdint.h +- +inttypes.h +- +stdarg.h +- +ctype.h +- +syslog.h +- +poll.h +- +unistd.h +- +fcntl.h +- +termios.h +- +signal.h +- +errno.h +- +time.h +- +sys/ioctl.h +- +limits.h +- +pthread.h +- +sys/time.h +- +sys/mman.h +- +sys/types.h +- +sys/stat.h +- +sys/file.h +- +sys/socket.h +- +sys/sysmacros.h +- +netinet/tcp.h +- +arpa/inet.h +- +sys/select.h +- +fnmatch.h +- +glob.h +- +arpa/inet.h +- +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/zf_log/zf_log.h +pigpio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h +command.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/command.h +custom.cext +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/custom.cext + +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h +stddef.h +- +stdint.h +- +pthread.h +- +stdio.h +- +pigpio.h +- +stdio.h +- +pigpio.h +/home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h +stdio.h +- +pigpio.h +- +stdio.h +- +pigpio.h +- +stdio.h +- +pigpio.h +- + diff --git a/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/depend.internal b/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/depend.internal index dd56d49..57dc7d9 100644 --- a/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/depend.internal +++ b/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/depend.internal @@ -2,15 +2,18 @@ # Generated by "Unix Makefiles" Generator, CMake Version 3.18 src/io_utils/CMakeFiles/io_utils.dir/io_utils.c.o + ../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.c /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h src/io_utils/CMakeFiles/io_utils.dir/io_utils_spi.c.o + ../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_spi.c /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_spi.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h src/io_utils/CMakeFiles/io_utils.dir/io_utils_sys_info.c.o + ../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.c /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h src/io_utils/CMakeFiles/io_utils.dir/pigpio/command.c.o @@ -18,6 +21,7 @@ src/io_utils/CMakeFiles/io_utils.dir/pigpio/command.c.o /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/command.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.h src/io_utils/CMakeFiles/io_utils.dir/pigpio/pigpio.c.o + ../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/command.h /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/custom.cext /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/pigpio/pigpio.c diff --git a/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/depend.make b/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/depend.make index e25efbc..71e4ab8 100644 --- a/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/depend.make +++ b/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/depend.make @@ -1,15 +1,18 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.18 +src/io_utils/CMakeFiles/io_utils.dir/io_utils.c.o: ../src/zf_log/zf_log.h src/io_utils/CMakeFiles/io_utils.dir/io_utils.c.o: ../src/io_utils/io_utils.c src/io_utils/CMakeFiles/io_utils.dir/io_utils.c.o: ../src/io_utils/io_utils.h src/io_utils/CMakeFiles/io_utils.dir/io_utils.c.o: ../src/io_utils/pigpio/pigpio.h +src/io_utils/CMakeFiles/io_utils.dir/io_utils_spi.c.o: ../src/zf_log/zf_log.h src/io_utils/CMakeFiles/io_utils.dir/io_utils_spi.c.o: ../src/io_utils/io_utils.h src/io_utils/CMakeFiles/io_utils.dir/io_utils_spi.c.o: ../src/io_utils/io_utils_spi.c src/io_utils/CMakeFiles/io_utils.dir/io_utils_spi.c.o: ../src/io_utils/io_utils_spi.h src/io_utils/CMakeFiles/io_utils.dir/io_utils_spi.c.o: ../src/io_utils/pigpio/pigpio.h +src/io_utils/CMakeFiles/io_utils.dir/io_utils_sys_info.c.o: ../src/zf_log/zf_log.h src/io_utils/CMakeFiles/io_utils.dir/io_utils_sys_info.c.o: ../src/io_utils/io_utils_sys_info.c src/io_utils/CMakeFiles/io_utils.dir/io_utils_sys_info.c.o: ../src/io_utils/io_utils_sys_info.h @@ -17,6 +20,7 @@ src/io_utils/CMakeFiles/io_utils.dir/pigpio/command.c.o: ../src/io_utils/pigpio/ src/io_utils/CMakeFiles/io_utils.dir/pigpio/command.c.o: ../src/io_utils/pigpio/command.h src/io_utils/CMakeFiles/io_utils.dir/pigpio/command.c.o: ../src/io_utils/pigpio/pigpio.h +src/io_utils/CMakeFiles/io_utils.dir/pigpio/pigpio.c.o: ../src/zf_log/zf_log.h src/io_utils/CMakeFiles/io_utils.dir/pigpio/pigpio.c.o: ../src/io_utils/pigpio/command.h src/io_utils/CMakeFiles/io_utils.dir/pigpio/pigpio.c.o: ../src/io_utils/pigpio/custom.cext src/io_utils/CMakeFiles/io_utils.dir/pigpio/pigpio.c.o: ../src/io_utils/pigpio/pigpio.c diff --git a/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/progress.make b/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/progress.make index e27694c..cdde7ec 100644 --- a/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/progress.make +++ b/software/libcariboulite/build/src/io_utils/CMakeFiles/io_utils.dir/progress.make @@ -1,7 +1,7 @@ -CMAKE_PROGRESS_1 = 22 -CMAKE_PROGRESS_2 = 23 -CMAKE_PROGRESS_3 = 24 -CMAKE_PROGRESS_4 = 25 -CMAKE_PROGRESS_5 = 26 -CMAKE_PROGRESS_6 = 27 +CMAKE_PROGRESS_1 = 21 +CMAKE_PROGRESS_2 = 22 +CMAKE_PROGRESS_3 = 23 +CMAKE_PROGRESS_4 = 24 +CMAKE_PROGRESS_5 = 25 +CMAKE_PROGRESS_6 = 26 diff --git a/software/libcariboulite/build/src/io_utils/CMakeFiles/test_io_utils.dir/progress.make b/software/libcariboulite/build/src/io_utils/CMakeFiles/test_io_utils.dir/progress.make index 4733d2b..ab595e5 100644 --- a/software/libcariboulite/build/src/io_utils/CMakeFiles/test_io_utils.dir/progress.make +++ b/software/libcariboulite/build/src/io_utils/CMakeFiles/test_io_utils.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 49 -CMAKE_PROGRESS_2 = 50 +CMAKE_PROGRESS_1 = 47 +CMAKE_PROGRESS_2 = 48 diff --git a/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/C.includecache b/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/C.includecache index 4c1de2a..c1014e6 100644 --- a/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/C.includecache +++ b/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/C.includecache @@ -56,6 +56,8 @@ stdio.h pigpio.h - +../src/zf_log/zf_log.h + /home/pi/projects/cariboulite/software/libcariboulite/src/latticeice40/latticeice40.c stdio.h - @@ -65,6 +67,8 @@ string.h - errno.h - +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/latticeice40/zf_log/zf_log.h latticeice40.h /home/pi/projects/cariboulite/software/libcariboulite/src/latticeice40/latticeice40.h diff --git a/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/depend.internal b/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/depend.internal index 520ba47..3e5c503 100644 --- a/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/depend.internal +++ b/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/depend.internal @@ -5,5 +5,6 @@ src/latticeice40/CMakeFiles/latticeice40.dir/latticeice40.c.o ../src/io_utils/io_utils.h ../src/io_utils/io_utils_spi.h ../src/io_utils/pigpio/pigpio.h + ../src/zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/latticeice40/latticeice40.c /home/pi/projects/cariboulite/software/libcariboulite/src/latticeice40/latticeice40.h diff --git a/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/depend.make b/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/depend.make index 4cc5e5b..fd1a74c 100644 --- a/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/depend.make +++ b/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/depend.make @@ -4,6 +4,7 @@ src/latticeice40/CMakeFiles/latticeice40.dir/latticeice40.c.o: ../src/io_utils/io_utils.h src/latticeice40/CMakeFiles/latticeice40.dir/latticeice40.c.o: ../src/io_utils/io_utils_spi.h src/latticeice40/CMakeFiles/latticeice40.dir/latticeice40.c.o: ../src/io_utils/pigpio/pigpio.h +src/latticeice40/CMakeFiles/latticeice40.dir/latticeice40.c.o: ../src/zf_log/zf_log.h src/latticeice40/CMakeFiles/latticeice40.dir/latticeice40.c.o: ../src/latticeice40/latticeice40.c src/latticeice40/CMakeFiles/latticeice40.dir/latticeice40.c.o: ../src/latticeice40/latticeice40.h diff --git a/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/progress.make b/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/progress.make index ec204d3..8791cb6 100644 --- a/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/progress.make +++ b/software/libcariboulite/build/src/latticeice40/CMakeFiles/latticeice40.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 28 -CMAKE_PROGRESS_2 = 29 +CMAKE_PROGRESS_1 = 27 +CMAKE_PROGRESS_2 = 28 diff --git a/software/libcariboulite/build/src/rffc507x/CMakeFiles/rffc507x.dir/progress.make b/software/libcariboulite/build/src/rffc507x/CMakeFiles/rffc507x.dir/progress.make index 335ef43..df87bc2 100644 --- a/software/libcariboulite/build/src/rffc507x/CMakeFiles/rffc507x.dir/progress.make +++ b/software/libcariboulite/build/src/rffc507x/CMakeFiles/rffc507x.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 30 -CMAKE_PROGRESS_2 = 31 +CMAKE_PROGRESS_1 = 29 +CMAKE_PROGRESS_2 = 30 diff --git a/software/libcariboulite/build/src/rffc507x/CMakeFiles/test_rffc507x.dir/progress.make b/software/libcariboulite/build/src/rffc507x/CMakeFiles/test_rffc507x.dir/progress.make index a48de7a..ffa309e 100644 --- a/software/libcariboulite/build/src/rffc507x/CMakeFiles/test_rffc507x.dir/progress.make +++ b/software/libcariboulite/build/src/rffc507x/CMakeFiles/test_rffc507x.dir/progress.make @@ -1,4 +1,4 @@ -CMAKE_PROGRESS_1 = 51 -CMAKE_PROGRESS_2 = 52 -CMAKE_PROGRESS_3 = 53 +CMAKE_PROGRESS_1 = 49 +CMAKE_PROGRESS_2 = 50 +CMAKE_PROGRESS_3 = 51 diff --git a/software/libcariboulite/build/src/ustimer/CMakeFiles/test_ustimer.dir/progress.make b/software/libcariboulite/build/src/ustimer/CMakeFiles/test_ustimer.dir/progress.make index 2e6ba90..3b1f03a 100644 --- a/software/libcariboulite/build/src/ustimer/CMakeFiles/test_ustimer.dir/progress.make +++ b/software/libcariboulite/build/src/ustimer/CMakeFiles/test_ustimer.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 54 -CMAKE_PROGRESS_2 = 55 +CMAKE_PROGRESS_1 = 52 +CMAKE_PROGRESS_2 = 53 diff --git a/software/libcariboulite/build/src/ustimer/CMakeFiles/ustimer.dir/C.includecache b/software/libcariboulite/build/src/ustimer/CMakeFiles/ustimer.dir/C.includecache index 8e54ca9..40f904d 100644 --- a/software/libcariboulite/build/src/ustimer/CMakeFiles/ustimer.dir/C.includecache +++ b/software/libcariboulite/build/src/ustimer/CMakeFiles/ustimer.dir/C.includecache @@ -6,3 +6,33 @@ #IncludeRegexTransform: +/home/pi/projects/cariboulite/software/libcariboulite/src/ustimer/ustimer.c +ustimer.h +/home/pi/projects/cariboulite/software/libcariboulite/src/ustimer/ustimer.h +unistd.h +- +time.h +- +signal.h +- +stdlib.h +- +stdio.h +- +string.h +- +sys/time.h +- + +/home/pi/projects/cariboulite/software/libcariboulite/src/ustimer/ustimer.h +stdlib.h +- +unistd.h +- +stdio.h +- +signal.h +- +time.h +- + diff --git a/software/libcariboulite/build/src/ustimer/CMakeFiles/ustimer.dir/progress.make b/software/libcariboulite/build/src/ustimer/CMakeFiles/ustimer.dir/progress.make index fb03824..2e6ba90 100644 --- a/software/libcariboulite/build/src/ustimer/CMakeFiles/ustimer.dir/progress.make +++ b/software/libcariboulite/build/src/ustimer/CMakeFiles/ustimer.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 56 -CMAKE_PROGRESS_2 = 57 +CMAKE_PROGRESS_1 = 54 +CMAKE_PROGRESS_2 = 55 diff --git a/software/libcariboulite/build/src/zf_log/CMakeFiles/zf_log.dir/progress.make b/software/libcariboulite/build/src/zf_log/CMakeFiles/zf_log.dir/progress.make index 42baaba..fb03824 100644 --- a/software/libcariboulite/build/src/zf_log/CMakeFiles/zf_log.dir/progress.make +++ b/software/libcariboulite/build/src/zf_log/CMakeFiles/zf_log.dir/progress.make @@ -1,3 +1,3 @@ -CMAKE_PROGRESS_1 = 58 -CMAKE_PROGRESS_2 = 59 +CMAKE_PROGRESS_1 = 56 +CMAKE_PROGRESS_2 = 57 diff --git a/software/libcariboulite/build/test/fpgacomm b/software/libcariboulite/build/test/fpgacomm deleted file mode 100755 index 20ce552..0000000 Binary files a/software/libcariboulite/build/test/fpgacomm and /dev/null differ diff --git a/software/libcariboulite/src/caribou_smi/CMakeLists.txt b/software/libcariboulite/src/caribou_smi/CMakeLists.txt index db958be..514a9a8 100644 --- a/software/libcariboulite/src/caribou_smi/CMakeLists.txt +++ b/software/libcariboulite/src/caribou_smi/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(/.) include_directories(${SUPER_DIR}) #However, the file(GLOB...) allows for wildcard additions: -set(SOURCES_LIB dma_utils.c mbox_utils.c register_utils.c) +set(SOURCES_LIB caribou_smi.c dma_utils.c mbox_utils.c register_utils.c) set(SOURCES ${SOURCES_LIB} test_caribou_smi.c) set(EXTERN_LIBS ${SUPER_DIR}/io_utils/build/libio_utils.a ${SUPER_DIR}/zf_log/build/libzf_log.a) diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Makefile2 b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Makefile2 index 9e86e97..61fdc06 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Makefile2 +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Makefile2 @@ -95,12 +95,12 @@ clean: CMakeFiles/caribou_smi.dir/clean CMakeFiles/test_caribou_smi.dir/all: $(MAKE) $(MAKESILENT) -f CMakeFiles/test_caribou_smi.dir/build.make CMakeFiles/test_caribou_smi.dir/depend $(MAKE) $(MAKESILENT) -f CMakeFiles/test_caribou_smi.dir/build.make CMakeFiles/test_caribou_smi.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=5,6,7,8,9 "Built target test_caribou_smi" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=6,7,8,9,10,11 "Built target test_caribou_smi" .PHONY : CMakeFiles/test_caribou_smi.dir/all # Build rule for subdir invocation for target. CMakeFiles/test_caribou_smi.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles 5 + $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles 6 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/test_caribou_smi.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles 0 .PHONY : CMakeFiles/test_caribou_smi.dir/rule @@ -122,12 +122,12 @@ CMakeFiles/test_caribou_smi.dir/clean: CMakeFiles/caribou_smi.dir/all: $(MAKE) $(MAKESILENT) -f CMakeFiles/caribou_smi.dir/build.make CMakeFiles/caribou_smi.dir/depend $(MAKE) $(MAKESILENT) -f CMakeFiles/caribou_smi.dir/build.make CMakeFiles/caribou_smi.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=1,2,3,4 "Built target caribou_smi" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=1,2,3,4,5 "Built target caribou_smi" .PHONY : CMakeFiles/caribou_smi.dir/all # Build rule for subdir invocation for target. CMakeFiles/caribou_smi.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles 4 + $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles 5 $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/caribou_smi.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles 0 .PHONY : CMakeFiles/caribou_smi.dir/rule diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/6 b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/6 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/6 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/count.txt b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/count.txt index ec63514..b4de394 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/count.txt +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/Progress/count.txt @@ -1 +1 @@ -9 +11 diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/DependInfo.cmake b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/DependInfo.cmake index 9b3d3a0..b306811 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/DependInfo.cmake +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/DependInfo.cmake @@ -4,6 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: set(CMAKE_DEPENDS_CHECK_C + "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/caribou_smi.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/dma_utils.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/mbox_utils.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/register_utils.c.o" diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/build.make b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/build.make index 6d08f43..358b26b 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/build.make +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/build.make @@ -76,9 +76,22 @@ include CMakeFiles/caribou_smi.dir/progress.make # Include the compile flags for this target's objects. include CMakeFiles/caribou_smi.dir/flags.make +CMakeFiles/caribou_smi.dir/caribou_smi.c.o: CMakeFiles/caribou_smi.dir/flags.make +CMakeFiles/caribou_smi.dir/caribou_smi.c.o: ../caribou_smi.c + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object CMakeFiles/caribou_smi.dir/caribou_smi.c.o" + /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/caribou_smi.dir/caribou_smi.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c + +CMakeFiles/caribou_smi.dir/caribou_smi.c.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/caribou_smi.dir/caribou_smi.c.i" + /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c > CMakeFiles/caribou_smi.dir/caribou_smi.c.i + +CMakeFiles/caribou_smi.dir/caribou_smi.c.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/caribou_smi.dir/caribou_smi.c.s" + /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c -o CMakeFiles/caribou_smi.dir/caribou_smi.c.s + CMakeFiles/caribou_smi.dir/dma_utils.c.o: CMakeFiles/caribou_smi.dir/flags.make CMakeFiles/caribou_smi.dir/dma_utils.c.o: ../dma_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object CMakeFiles/caribou_smi.dir/dma_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object CMakeFiles/caribou_smi.dir/dma_utils.c.o" /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/caribou_smi.dir/dma_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c CMakeFiles/caribou_smi.dir/dma_utils.c.i: cmake_force @@ -91,7 +104,7 @@ CMakeFiles/caribou_smi.dir/dma_utils.c.s: cmake_force CMakeFiles/caribou_smi.dir/mbox_utils.c.o: CMakeFiles/caribou_smi.dir/flags.make CMakeFiles/caribou_smi.dir/mbox_utils.c.o: ../mbox_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object CMakeFiles/caribou_smi.dir/mbox_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object CMakeFiles/caribou_smi.dir/mbox_utils.c.o" /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/caribou_smi.dir/mbox_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c CMakeFiles/caribou_smi.dir/mbox_utils.c.i: cmake_force @@ -104,7 +117,7 @@ CMakeFiles/caribou_smi.dir/mbox_utils.c.s: cmake_force CMakeFiles/caribou_smi.dir/register_utils.c.o: CMakeFiles/caribou_smi.dir/flags.make CMakeFiles/caribou_smi.dir/register_utils.c.o: ../register_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object CMakeFiles/caribou_smi.dir/register_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building C object CMakeFiles/caribou_smi.dir/register_utils.c.o" /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/caribou_smi.dir/register_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c CMakeFiles/caribou_smi.dir/register_utils.c.i: cmake_force @@ -117,6 +130,7 @@ CMakeFiles/caribou_smi.dir/register_utils.c.s: cmake_force # Object files for target caribou_smi caribou_smi_OBJECTS = \ +"CMakeFiles/caribou_smi.dir/caribou_smi.c.o" \ "CMakeFiles/caribou_smi.dir/dma_utils.c.o" \ "CMakeFiles/caribou_smi.dir/mbox_utils.c.o" \ "CMakeFiles/caribou_smi.dir/register_utils.c.o" @@ -124,12 +138,13 @@ caribou_smi_OBJECTS = \ # External object files for target caribou_smi caribou_smi_EXTERNAL_OBJECTS = +libcaribou_smi.a: CMakeFiles/caribou_smi.dir/caribou_smi.c.o libcaribou_smi.a: CMakeFiles/caribou_smi.dir/dma_utils.c.o libcaribou_smi.a: CMakeFiles/caribou_smi.dir/mbox_utils.c.o libcaribou_smi.a: CMakeFiles/caribou_smi.dir/register_utils.c.o libcaribou_smi.a: CMakeFiles/caribou_smi.dir/build.make libcaribou_smi.a: CMakeFiles/caribou_smi.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Linking C static library libcaribou_smi.a" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Linking C static library libcaribou_smi.a" $(CMAKE_COMMAND) -P CMakeFiles/caribou_smi.dir/cmake_clean_target.cmake $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/caribou_smi.dir/link.txt --verbose=$(VERBOSE) diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/cmake_clean.cmake b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/cmake_clean.cmake index 235c8ae..b3969a3 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/cmake_clean.cmake +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/cmake_clean.cmake @@ -1,4 +1,5 @@ file(REMOVE_RECURSE + "CMakeFiles/caribou_smi.dir/caribou_smi.c.o" "CMakeFiles/caribou_smi.dir/dma_utils.c.o" "CMakeFiles/caribou_smi.dir/mbox_utils.c.o" "CMakeFiles/caribou_smi.dir/register_utils.c.o" diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/link.txt b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/link.txt index cd2e7e3..5b24f10 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/link.txt +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/link.txt @@ -1,2 +1,2 @@ -/usr/bin/ar qc libcaribou_smi.a CMakeFiles/caribou_smi.dir/dma_utils.c.o CMakeFiles/caribou_smi.dir/mbox_utils.c.o CMakeFiles/caribou_smi.dir/register_utils.c.o +/usr/bin/ar qc libcaribou_smi.a CMakeFiles/caribou_smi.dir/caribou_smi.c.o CMakeFiles/caribou_smi.dir/dma_utils.c.o CMakeFiles/caribou_smi.dir/mbox_utils.c.o CMakeFiles/caribou_smi.dir/register_utils.c.o /usr/bin/ranlib libcaribou_smi.a diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/progress.make b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/progress.make index a69a57e..33e6bff 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/progress.make +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/caribou_smi.dir/progress.make @@ -2,4 +2,5 @@ CMAKE_PROGRESS_1 = 1 CMAKE_PROGRESS_2 = 2 CMAKE_PROGRESS_3 = 3 CMAKE_PROGRESS_4 = 4 +CMAKE_PROGRESS_5 = 5 diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/progress.marks b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/progress.marks index ec63514..b4de394 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/progress.marks +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/progress.marks @@ -1 +1 @@ -9 +11 diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/C.includecache b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/C.includecache index 16d2dd7..0410499 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/C.includecache +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/C.includecache @@ -70,6 +70,32 @@ pigpio.h ../../zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c +zf_log/zf_log.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/zf_log/zf_log.h +stdio.h +- +fcntl.h +- +stdint.h +- +stdlib.h +- +string.h +- +unistd.h +- +math.h +- +caribou_smi.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.h +dma_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h +mbox_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.h +register_utils.h +/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.h caribou_smi_defs.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi_defs.h @@ -86,16 +112,6 @@ stdint.h register_utils.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c -zf_log/zf_log.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/zf_log/zf_log.h -dma_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h -register_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h -mbox_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.h - /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h stdio.h - @@ -118,12 +134,6 @@ stdint.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/test_caribou_smi.c -stdio.h -- -caribou_smi.h -/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.h - /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h stdio.h - diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/DependInfo.cmake b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/DependInfo.cmake index c320a20..2e00919 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/DependInfo.cmake +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/DependInfo.cmake @@ -4,6 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: set(CMAKE_DEPENDS_CHECK_C + "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c" "/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/register_utils.c.o" diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/build.make b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/build.make index 33ea694..d1f7c3a 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/build.make +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/build.make @@ -76,9 +76,22 @@ include CMakeFiles/test_caribou_smi.dir/progress.make # Include the compile flags for this target's objects. include CMakeFiles/test_caribou_smi.dir/flags.make +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: CMakeFiles/test_caribou_smi.dir/flags.make +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../caribou_smi.c + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o" + /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c + +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/test_caribou_smi.dir/caribou_smi.c.i" + /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c > CMakeFiles/test_caribou_smi.dir/caribou_smi.c.i + +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/test_caribou_smi.dir/caribou_smi.c.s" + /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c -o CMakeFiles/test_caribou_smi.dir/caribou_smi.c.s + CMakeFiles/test_caribou_smi.dir/dma_utils.c.o: CMakeFiles/test_caribou_smi.dir/flags.make CMakeFiles/test_caribou_smi.dir/dma_utils.c.o: ../dma_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/dma_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c CMakeFiles/test_caribou_smi.dir/dma_utils.c.i: cmake_force @@ -91,7 +104,7 @@ CMakeFiles/test_caribou_smi.dir/dma_utils.c.s: cmake_force CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o: CMakeFiles/test_caribou_smi.dir/flags.make CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o: ../mbox_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.c CMakeFiles/test_caribou_smi.dir/mbox_utils.c.i: cmake_force @@ -104,7 +117,7 @@ CMakeFiles/test_caribou_smi.dir/mbox_utils.c.s: cmake_force CMakeFiles/test_caribou_smi.dir/register_utils.c.o: CMakeFiles/test_caribou_smi.dir/flags.make CMakeFiles/test_caribou_smi.dir/register_utils.c.o: ../register_utils.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object CMakeFiles/test_caribou_smi.dir/register_utils.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building C object CMakeFiles/test_caribou_smi.dir/register_utils.c.o" /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/register_utils.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.c CMakeFiles/test_caribou_smi.dir/register_utils.c.i: cmake_force @@ -117,7 +130,7 @@ CMakeFiles/test_caribou_smi.dir/register_utils.c.s: cmake_force CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o: CMakeFiles/test_caribou_smi.dir/flags.make CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o: ../test_caribou_smi.c - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building C object CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building C object CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o" /usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o -c /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/test_caribou_smi.c CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.i: cmake_force @@ -130,6 +143,7 @@ CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.s: cmake_force # Object files for target test_caribou_smi test_caribou_smi_OBJECTS = \ +"CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o" \ "CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" \ "CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" \ "CMakeFiles/test_caribou_smi.dir/register_utils.c.o" \ @@ -138,6 +152,7 @@ test_caribou_smi_OBJECTS = \ # External object files for target test_caribou_smi test_caribou_smi_EXTERNAL_OBJECTS = +test_caribou_smi: CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o test_caribou_smi: CMakeFiles/test_caribou_smi.dir/dma_utils.c.o test_caribou_smi: CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o test_caribou_smi: CMakeFiles/test_caribou_smi.dir/register_utils.c.o @@ -146,7 +161,7 @@ test_caribou_smi: CMakeFiles/test_caribou_smi.dir/build.make test_caribou_smi: ../../io_utils/build/libio_utils.a test_caribou_smi: ../../zf_log/build/libzf_log.a test_caribou_smi: CMakeFiles/test_caribou_smi.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Linking C executable test_caribou_smi" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Linking C executable test_caribou_smi" $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/test_caribou_smi.dir/link.txt --verbose=$(VERBOSE) # Rule to build all files generated by this target. diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/cmake_clean.cmake b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/cmake_clean.cmake index e5110f8..679c4fe 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/cmake_clean.cmake +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/cmake_clean.cmake @@ -1,4 +1,5 @@ file(REMOVE_RECURSE + "CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o" "CMakeFiles/test_caribou_smi.dir/dma_utils.c.o" "CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o" "CMakeFiles/test_caribou_smi.dir/register_utils.c.o" diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/depend.internal b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/depend.internal index 8c4f82d..4337558 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/depend.internal +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/depend.internal @@ -1,6 +1,18 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.18 +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o + ../../io_utils/io_utils.h + ../../io_utils/io_utils_sys_info.h + ../../io_utils/pigpio/pigpio.h + ../../zf_log/zf_log.h + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.c + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi.h + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/caribou_smi_defs.h + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.h + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/mbox_utils.h + /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/register_utils.h + /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h CMakeFiles/test_caribou_smi.dir/dma_utils.c.o ../../zf_log/zf_log.h /home/pi/projects/cariboulite/software/libcariboulite/src/caribou_smi/dma_utils.c diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/depend.make b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/depend.make index a2f1282..a4cbc27 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/depend.make +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/depend.make @@ -1,6 +1,18 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.18 +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../../io_utils/io_utils.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../../io_utils/io_utils_sys_info.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../../io_utils/pigpio/pigpio.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../../zf_log/zf_log.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../caribou_smi.c +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../caribou_smi.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../caribou_smi_defs.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../dma_utils.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../mbox_utils.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: ../register_utils.h +CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o: /home/pi/projects/cariboulite/software/libcariboulite/src/io_utils/io_utils_sys_info.h + CMakeFiles/test_caribou_smi.dir/dma_utils.c.o: ../../zf_log/zf_log.h CMakeFiles/test_caribou_smi.dir/dma_utils.c.o: ../dma_utils.c CMakeFiles/test_caribou_smi.dir/dma_utils.c.o: ../dma_utils.h diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/link.txt b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/link.txt index 3112814..b188e6a 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/link.txt +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/link.txt @@ -1 +1 @@ -/usr/bin/cc -O3 -DNDEBUG CMakeFiles/test_caribou_smi.dir/dma_utils.c.o CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o CMakeFiles/test_caribou_smi.dir/register_utils.c.o CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o -o test_caribou_smi ../../io_utils/build/libio_utils.a ../../zf_log/build/libzf_log.a -lm -lrt -lpthread +/usr/bin/cc -O3 -DNDEBUG CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o CMakeFiles/test_caribou_smi.dir/dma_utils.c.o CMakeFiles/test_caribou_smi.dir/mbox_utils.c.o CMakeFiles/test_caribou_smi.dir/register_utils.c.o CMakeFiles/test_caribou_smi.dir/test_caribou_smi.c.o -o test_caribou_smi ../../io_utils/build/libio_utils.a ../../zf_log/build/libzf_log.a -lm -lrt -lpthread diff --git a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/progress.make b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/progress.make index d79b081..9c10aa6 100644 --- a/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/progress.make +++ b/software/libcariboulite/src/caribou_smi/build/CMakeFiles/test_caribou_smi.dir/progress.make @@ -1,6 +1,7 @@ -CMAKE_PROGRESS_1 = 5 -CMAKE_PROGRESS_2 = 6 -CMAKE_PROGRESS_3 = 7 -CMAKE_PROGRESS_4 = 8 -CMAKE_PROGRESS_5 = 9 +CMAKE_PROGRESS_1 = 6 +CMAKE_PROGRESS_2 = 7 +CMAKE_PROGRESS_3 = 8 +CMAKE_PROGRESS_4 = 9 +CMAKE_PROGRESS_5 = 10 +CMAKE_PROGRESS_6 = 11 diff --git a/software/libcariboulite/src/caribou_smi/build/Makefile b/software/libcariboulite/src/caribou_smi/build/Makefile index 52f8610..babf82b 100644 --- a/software/libcariboulite/src/caribou_smi/build/Makefile +++ b/software/libcariboulite/src/caribou_smi/build/Makefile @@ -201,6 +201,36 @@ caribou_smi/fast: $(MAKE) $(MAKESILENT) -f CMakeFiles/caribou_smi.dir/build.make CMakeFiles/caribou_smi.dir/build .PHONY : caribou_smi/fast +caribou_smi.o: caribou_smi.c.o + +.PHONY : caribou_smi.o + +# target to build an object file +caribou_smi.c.o: + $(MAKE) $(MAKESILENT) -f CMakeFiles/test_caribou_smi.dir/build.make CMakeFiles/test_caribou_smi.dir/caribou_smi.c.o + $(MAKE) $(MAKESILENT) -f CMakeFiles/caribou_smi.dir/build.make CMakeFiles/caribou_smi.dir/caribou_smi.c.o +.PHONY : caribou_smi.c.o + +caribou_smi.i: caribou_smi.c.i + +.PHONY : caribou_smi.i + +# target to preprocess a source file +caribou_smi.c.i: + $(MAKE) $(MAKESILENT) -f CMakeFiles/test_caribou_smi.dir/build.make CMakeFiles/test_caribou_smi.dir/caribou_smi.c.i + $(MAKE) $(MAKESILENT) -f CMakeFiles/caribou_smi.dir/build.make CMakeFiles/caribou_smi.dir/caribou_smi.c.i +.PHONY : caribou_smi.c.i + +caribou_smi.s: caribou_smi.c.s + +.PHONY : caribou_smi.s + +# target to generate assembly for a file +caribou_smi.c.s: + $(MAKE) $(MAKESILENT) -f CMakeFiles/test_caribou_smi.dir/build.make CMakeFiles/test_caribou_smi.dir/caribou_smi.c.s + $(MAKE) $(MAKESILENT) -f CMakeFiles/caribou_smi.dir/build.make CMakeFiles/caribou_smi.dir/caribou_smi.c.s +.PHONY : caribou_smi.c.s + dma_utils.o: dma_utils.c.o .PHONY : dma_utils.o @@ -332,6 +362,9 @@ help: @echo "... rebuild_cache" @echo "... caribou_smi" @echo "... test_caribou_smi" + @echo "... caribou_smi.o" + @echo "... caribou_smi.i" + @echo "... caribou_smi.s" @echo "... dma_utils.o" @echo "... dma_utils.i" @echo "... dma_utils.s" diff --git a/software/libcariboulite/src/caribou_smi/caribou_smi.c b/software/libcariboulite/src/caribou_smi/caribou_smi.c index 1b76f6b..9161d9b 100644 --- a/software/libcariboulite/src/caribou_smi/caribou_smi.c +++ b/software/libcariboulite/src/caribou_smi/caribou_smi.c @@ -114,10 +114,13 @@ int caribou_smi_init(caribou_smi_st* dev) map_periph(&dev->smi_regs, SMI_BASE, PAGE_SIZE); // the allocation is page_size rounded-up + // The page-size if 0x1000 = (4096) decimal. Thus for a CB sized 32byte => 128 maximal number of CBs + // Sample size from the modem is 4 bytes and each buffer contains "sample_buf_length" samples. + // We allocate unchahced memory for max 128 CBs and "num_sample_bufs" sample buffers uint32_t single_buffer_size_round = PAGE_ROUNDUP(dev->sample_buf_length * SAMPLE_SIZE_BYTES); dev->videocore_alloc_size = PAGE_SIZE + dev->num_sample_bufs * single_buffer_size_round; dev->actual_sample_buf_length_sec = (float)(single_buffer_size_round) / 16e6; - + map_uncached_mem(&dev->vc_mem, dev->videocore_alloc_size); printf("INFO: caribou_smi_init - The actual single buffer contains %.2f usec of data\n", @@ -143,29 +146,13 @@ int caribou_smi_init(caribou_smi_st* dev) // Setup a reading rate of 32 MSPS (16 MSPS x2) //--------------------------------------------- caribou_smi_timing_st timing = {0}; - float actual_sps = caribou_smi_calculate_clocking (dev, 32e6, &timing); - caribou_smi_print_timing (actual_sps, &timing); + timing.hold_steps = 1; + timing.setup_steps = 1; + timing.strobe_steps = 1; caribou_smi_init_registers(dev, caribou_smi_transaction_size_8bits, &timing); - - - dev->smi_dmc->dmaen = 1; - dev->smi_cs->enable = 1; - dev->smi_cs->clear = 1; - - void* rxbuff = adc_dma_start(&dev->vc_mem, NSAMPLES); - smi_start(dev, NSAMPLES, 1); - - while (dma_active(dev->dma_channel)) ; - - adc_dma_end(dev, rxbuff, sample_data, NSAMPLES); - - disp_reg_fields(smi_cs_regstrs, "CS", *REG32(dev->smi_regs, SMI_CS)); - dev->smi_cs->enable = dev->smi_dcs->enable = 0; - for (int i=0; iinitialized = 1; return 0; @@ -181,6 +168,8 @@ int caribou_smi_close(caribou_smi_st* dev) dev->initialized = 0; + caribou_smi_reset_read(dev); + // GPIO Setting back to default for (int i=0; inum_data_pins; i++) { @@ -209,6 +198,111 @@ int caribou_smi_close(caribou_smi_st* dev) return 0; } +//=========================================================================== +void caribou_smi_reset_read (caribou_smi_st* dev) +{ + ZF_LOGI("Reseting read process"); + int *ret; + dev->read_active = 0; + pthread_join(&dev->read_thread, &ret); + + dev->read_cb = NULL; + dev->read_buffer = NULL; + dev->read_buffer_length = 0; + dev->current_read_counter = 0; + ZF_LOGI("Read process reset"); +} + +//=========================================================================== +void *caribou_smi_read_thread( void *ptr ) +{ + caribou_smi_st* dev = (caribou_smi_st*)ptr; + ZF_LOGI("Reading thread started ID = %d", pthread_self()); + + void* rxbuff = adc_dma_start(&dev->vc_mem, NSAMPLES); + smi_start(dev, NSAMPLES, 1); + + while (dma_active(dev->dma_channel)) ; + + adc_dma_end(dev, rxbuff, sample_data, NSAMPLES); + + disp_reg_fields(smi_cs_regstrs, "CS", *REG32(dev->smi_regs, SMI_CS)); + dev->smi_cs->enable = dev->smi_dcs->enable = 0; + for (int i=0; iread_active) + { + usleep(1000); + } + + // idle the smi address + dev->smi_a = caribou_smi_address_idle; + + // exit the thread + dev->read_thread_ret_val = 0; + pthread_exit(&dev->read_thread_ret_val); +} + +//=========================================================================== +// Setup SMI reading process +int caribou_smi_configure_read(caribou_smi_st* dev, + caribou_smi_channel_en channel, + uint32_t continues, + uint32_t single_number_of_samples, + caribou_smi_read_data_callback cb, + uint8_t *serv_buffer, uint32_t serv_buffer_len) +{ + ZF_LOGI("Configuring SMI read from Channel %d", channel); + + if (dev->read_active) + { + ZF_LOGI("Read process already active, deactivate and try again"); + return -1; + } + + dev->smi_dmc->dmaen = 1; + dev->smi_cs->enable = 1; + dev->smi_cs->clear = 1; + + switch (channel) + { + case caribou_smi_channel_900: dev->smi_a = caribou_smi_address_read_900; break; + case caribou_smi_channel_2400: dev->smi_a = caribou_smi_address_read_2400; break; + default: + { + ZF_LOGE("Channel %d is not implemented for read", channel); + return -1; + break; + } + } + + int ret = 0; + if (continues) + { + // start a continues thread + dev->read_cb = cb; + dev->read_buffer = serv_buffer; + dev->read_buffer_length = serv_buffer_len; + dev->current_read_counter = 0; + dev->read_active = 1; + ret = pthread_create(&dev->read_thread, NULL, caribou_smi_read_thread, (void*) dev); + } + else + { + //continues; + //single_number_of_samples + + dev->smi_a = caribou_smi_address_idle; + } + + + return ret; +} + //=========================================================================== // Start SMI, given number of samples, optionally pack bytes into words void caribou_smi_start(caribou_smi_st* dev, int nsamples, int pre_samp, int packed) diff --git a/software/libcariboulite/src/caribou_smi/caribou_smi.h b/software/libcariboulite/src/caribou_smi/caribou_smi.h index f489280..b5015d7 100644 --- a/software/libcariboulite/src/caribou_smi/caribou_smi.h +++ b/software/libcariboulite/src/caribou_smi/caribou_smi.h @@ -1,6 +1,7 @@ #ifndef __CARIBOU_SMI_H__ #define __CARIBOU_SMI_H__ +#include #include "caribou_smi_defs.h" #include "io_utils/io_utils.h" #include "io_utils/io_utils_sys_info.h" @@ -36,6 +37,30 @@ typedef enum caribou_smi_transaction_size_9bits = 3, } caribou_smi_transaction_size_bits_en; +typedef enum +{ + caribou_smi_address_idle = 0, + caribou_smi_address_read_900 = 1, + caribou_smi_address_read_2400 = 2, + caribou_smi_address_read_res = 3, + caribou_smi_address_write_res1 = 4, + caribou_smi_address_write_900 = 5, + caribou_smi_address_write_2400 = 6, + caribou_smi_address_write_res2 = 7, +} caribou_smi_address_en; + +typedef enum +{ + caribou_smi_channel_900 = 0, + caribou_smi_channel_2400 = 1, +} caribou_smi_channel_en; + +typedef void (*caribou_smi_read_data_callback)( void *ctx, + caribou_smi_channel_en ch, + uint32_t count, + uint8_t *buffer, + uint32_t buffer_len_bytes); + typedef struct { int data_0_pin; @@ -57,11 +82,22 @@ typedef struct uint32_t videocore_alloc_size; float actual_sample_buf_length_sec; + // read parameters + caribou_smi_read_data_callback read_cb; + uint8_t *read_buffer; + uint32_t read_buffer_length; + uint32_t current_read_counter; + int read_active; + pthread_t read_thread; + uint32_t read_thread_ret_val; + + // memory maps dma_utils_st dma; MEM_MAP smi_regs; MEM_MAP vc_mem; - MEM_MAP clk_regs; + //MEM_MAP clk_regs; + // SMI registers SMI_CS_REG *smi_cs; SMI_L_REG *smi_l; SMI_A_REG *smi_a; diff --git a/software/libcariboulite/src/caribou_smi/dma_utils.c b/software/libcariboulite/src/caribou_smi/dma_utils.c index 4b11386..f6daf76 100644 --- a/software/libcariboulite/src/caribou_smi/dma_utils.c +++ b/software/libcariboulite/src/caribou_smi/dma_utils.c @@ -7,36 +7,6 @@ #include "register_utils.h" #include "mbox_utils.h" - -// Control Blocks and data to be in uncached memory -typedef struct { - DMA_CB cbs[NUM_CBS]; - uint32_t pindata, pwmdata; -} DMA_TEST_DATA; - - -// Updated DMA trigger test, using data structure -/*void dma_test_pwm_trigger(int pin) -{ - DMA_TEST_DATA *dp=virt_dma_mem; - DMA_TEST_DATA dma_data = { - .pindata=1<pindata), GPIO(GPIO_CLR0), 4, 0, CBS(1), 0}, // 0 - {PWM_TI, MEM(&dp->pwmdata), PWM(PWM_FIF1), 4, 0, CBS(2), 0}, // 1 - {PWM_TI, MEM(&dp->pindata), GPIO(GPIO_SET0), 4, 0, CBS(3), 0}, // 2 - {PWM_TI, MEM(&dp->pwmdata), PWM(PWM_FIF1), 4, 0, CBS(0), 0}, // 3 - } - }; - memcpy(dp, &dma_data, sizeof(dma_data)); // Copy data into uncached memory - init_pwm(PWM_FREQ); // Enable PWM with DMA - *VIRT_PWM_REG(PWM_DMAC) = PWM_DMAC_ENAB|1; - start_dma(&dp->cbs[0]); // Start DMA - start_pwm(); // Start PWM - sleep(4); // Do nothing while LED flashing -}*/ - //================================================================================ void dma_utils_init (dma_utils_st *dev) { @@ -55,26 +25,26 @@ void dma_utils_close (dma_utils_st *dev) void dma_utils_enable_dma(dma_utils_st *dev, int chan) { *REG32(dev->dma_regs, DMA_ENABLE) |= (1 << chan); - *REG32(dev->dma_regs, DMA_REG(chan, DMA_CS)) = 1 << 31; + *REG32(dev->dma_regs, DMA_REG(chan, DMA_CS)) = 1 << 31; // Resetting / halting the channel } //================================================================================ void dma_utils_start_dma(dma_utils_st *dev, MEM_MAP *mp, int chan, DMA_CB *cbp, uint32_t csval) { *REG32(dev->dma_regs, DMA_REG(chan, DMA_CONBLK_AD)) = MEM_BUS_ADDR(mp, cbp); - *REG32(dev->dma_regs, DMA_REG(chan, DMA_CS)) = 2; // Clear 'end' flag - *REG32(dev->dma_regs, DMA_REG(chan, DMA_DEBUG)) = 7; // Clear error bits - *REG32(dev->dma_regs, DMA_REG(chan, DMA_CS)) = 1|csval; // Start DMA + *REG32(dev->dma_regs, DMA_REG(chan, DMA_CS)) = 0x2; // End flag- clear by writing '1' bit 1 + *REG32(dev->dma_regs, DMA_REG(chan, DMA_DEBUG)) = 0x7; // Clear error bits + *REG32(dev->dma_regs, DMA_REG(chan, DMA_CS)) = 0x1 | csval; // Start DMA (send '1' to "activate" bit) } //================================================================================ -uint32_t dma_utils_dma_transfer_len(dma_utils_st *dev, int chan) +uint32_t dma_utils_dma_get_transfer_len(dma_utils_st *dev, int chan) { return(*REG32(dev->dma_regs, DMA_REG(chan, DMA_TXFR_LEN))); } //================================================================================ -uint32_t dma_utils_dma_active(dma_utils_st *dev, int chan) +uint32_t dma_utils_dma_is_active(dma_utils_st *dev, int chan) { return((*REG32(dev->dma_regs, DMA_REG(chan, DMA_CS))) & 1); } @@ -84,7 +54,64 @@ void dma_utils_stop_dma(dma_utils_st *dev, int chan) { if (dev->dma_regs.virt) { - *REG32(dev->dma_regs, DMA_REG(chan, DMA_CS)) = 1 << 31; + *REG32(dev->dma_regs, DMA_REG(chan, DMA_CS)) = 1 << 31; // reset / halt + } +} + +//================================================================================ +int dma_utils_init_uncached_memory(dma_utils_st *dev, int chan, + MEM_MAP *uncached_mp, + uint32_t num_CBs, + uint32_t single_buffer_size, + uint32_t num_of_buffers, + uint32_t recurring) +{ + DMA_CB *cbs=uncached_mp->virt; + + if (num_CBs > MAX_NUM_CBS) + { + ZF_LOGE("the requested number of CBs is too large (%d > %d)", num_CBs, MAX_NUM_CBS); + return -1; + } + + uint8_t *data=(uint8_t *)(cbs + num_CBs); + + DMA_CB* current_cb = cbs; + uint8_t* current_data = data; + for (int i = 0; i < num_CBs; i++) + { + // Control blocks 0 and 1: enable SMI I/P pins + cbs[i].ti = DMA_SRCE_DREQ | (DMA_SMI_DREQ << 16) | DMA_WAIT_RESP; + cbs[i].tfr_len = 4; + cbs[i].srce_ad = MEM_BUS_ADDR(mp, modep1); + cbs[i].dest_ad = REG_BUS_ADDR(gpio_regs, GPIO_MODE0+4); + cbs[i].next_cb = MEM_BUS_ADDR(mp, &cbs[1]); + + +cbs[2].ti = DMA_SRCE_DREQ | (DMA_SMI_DREQ << 16) | DMA_CB_DEST_INC; +cbs[2].tfr_len = (nsamp + PRE_SAMP) * SAMPLE_SIZE; +cbs[2].srce_ad = REG_BUS_ADDR(smi_regs, SMI_D); +cbs[2].dest_ad = MEM_BUS_ADDR(mp, rxdata); +cbs[2].next_cb = MEM_BUS_ADDR(mp, &cbs[3]); + + + if (i==(num_CBs-1)) // reached the last buffer + { + if (recurring) + { + // put CB(0) to the next nextCB + } + else + { + // put '0' / NULL to the nextCB + } + } + else + { + // put the nextCB = CB(i+1) + current_cb += 1; + current_data += single_buffer_size; + } } } diff --git a/software/libcariboulite/src/caribou_smi/dma_utils.h b/software/libcariboulite/src/caribou_smi/dma_utils.h index 35d42e1..de3c435 100644 --- a/software/libcariboulite/src/caribou_smi/dma_utils.h +++ b/software/libcariboulite/src/caribou_smi/dma_utils.h @@ -18,41 +18,14 @@ #define DMA_CHAN_B 11 /* - 0 DREQ = 1 This is always on so use this channel if no DREQ is required - 1 DSI0 / PWM1 ** + ... 2 PCM TX 3 PCM RX 4 SMI <---==== 5 PWM0 6 SPI0 TX 7 SPI0 RX - 8 BSC/SPI Slave TX - 9 BSC/SPI Slave RX - 10 HDMI0 - 11 eMMC - 12 UART0 TX - 13 SD HOST - 14 UART0 RX - 15 DSI1 - 16 SPI1 TX - 17 HDMI1 - 18 SPI1 RX - 19 UART3 TX / SPI4 TX ** - 20 UART3 RX / SPI4 RX ** - 21 UART5 TX / SPI5 TX ** - 22 UART5 RX / SPI5 RX ** - 23 SPI6 TX - 24 Scaler FIFO 0 & SMI * - 25 Scaler FIFO 1 & SMI * - 26 Scaler FIFO 2 & SMI * - 27 SPI6 RX - 28 UART2 TX - 29 UART2 RX - 30 UART4 TX - 31 UART4 RX - - *) The SMI element of the Scaler FIFO 0 & SMI DREQs can be disabled by setting the SMI_DISABLE bit in the - DMA_DREQ_CONTROL register in the system arbiter control block. + ... */ #define DMA_SMI_DREQ 4 @@ -236,14 +209,6 @@ Destination Address Increment #define BUS_PWM_REG(a) (PWM_BASE-PHYS_REG_BASE+BUS_REG_BASE+(uint32_t)(a)) #define BUS_DMA_MEM(a) ((uint32_t)a-(uint32_t)virt_dma_mem+(uint32_t)bus_dma_mem) -// DMA control block macros -#define NUM_CBS 4 -#define GPIO(r) BUS_GPIO_REG(r) -#define PWM(r) BUS_PWM_REG(r) -#define MEM(m) BUS_DMA_MEM(m) -#define CBS(n) BUS_DMA_MEM(&dp->cbs[(n)]) -#define PWM_TI ((1 << 6) | (DMA_PWM_DREQ << 16)) - // DMA control block (must be 32-byte aligned) typedef struct { @@ -257,6 +222,17 @@ typedef struct uint32_t unused; } DMA_CB __attribute__ ((aligned(32))); + +// DMA control block macros +#define MAX_NUM_CBS (PAGE_SIZE / sizeof(DMA_CB)) +#define GPIO(r) BUS_GPIO_REG(r) +#define PWM(r) BUS_PWM_REG(r) +#define MEM(m) BUS_DMA_MEM(m) +#define CBS(n) BUS_DMA_MEM(&dp->cbs[(n)]) +//#define PWM_TI ((1 << 6) | (DMA_PWM_DREQ << 16)) +#define SMI_TI ((1 << 6) | (DMA_SMI_DREQ << 16)) + + typedef struct { MEM_MAP dma_regs; @@ -269,8 +245,8 @@ void dma_utils_init (dma_utils_st *dev); void dma_utils_close (dma_utils_st *dev); void dma_utils_enable_dma(dma_utils_st *dev, int chan); void dma_utils_start_dma(dma_utils_st *dev, MEM_MAP *mp, int chan, DMA_CB *cbp, uint32_t csval); -uint32_t dma_utils_dma_transfer_len(dma_utils_st *dev, int chan); -uint32_t dma_utils_dma_active(dma_utils_st *dev, int chan); +uint32_t dma_utils_dma_get_transfer_len(dma_utils_st *dev, int chan); +uint32_t dma_utils_dma_is_active(dma_utils_st *dev, int chan); void dma_utils_stop_dma(dma_utils_st *dev, int chan); void dma_utils_disp_dma(dma_utils_st *dev, int chan);