Minor adjustments

mfkiwl · Dec 15, 2021 · e8fa690 · e8fa690
1 parent ad3b2b2
commit e8fa690
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/data/sx120f-p2r.txt b/data/sx120f-p2r.txt
@@ -1908,9 +1908,9 @@ HPS_DBG_APB 052 080
   p_wdata . 32 GIN.051.040.0010 GIN.051.039.0053 GIN.051.039.0042 GIN.051.039.0039 GIN.051.039.0038 GIN.051.039.0037 GIN.051.039.0036 GIN.051.039.0035 GIN.051.039.0034 GIN.051.039.0033 GIN.051.040.0009 GIN.051.040.0008 GIN.051.040.0007 GIN.051.040.0006 GIN.051.040.0005 GIN.051.040.0004 GIN.051.040.0003 GIN.051.040.0002 GIN.051.040.0001 GIN.051.040.0000 GIN.051.039.0052 GIN.051.039.0051 GIN.051.039.0050 GIN.051.039.0049 GIN.051.039.0048 GIN.051.039.0047 GIN.051.039.0046 GIN.051.039.0045 GIN.051.039.0044 GIN.051.039.0043 GIN.051.039.0041 GIN.051.039.0040
   p_write . . GIN.051.039.0032
 HPS_DMA 052 069
-  channel_req 8 . GOUT.051.075.0040 GOUT.051.075.0038 GOUT.051.075.0036 GOUT.051.075.0034 GOUT.051.075.0032 GOUT.051.075.0030 GOUT.051.075.0028 GOUT.051.075.0026
-  channel_single 8 . GOUT.051.075.0039 GOUT.051.075.0037 GOUT.051.075.0035 GOUT.051.075.0033 GOUT.051.075.0031 GOUT.051.075.0029 GOUT.051.075.0027 GOUT.051.075.0025
-  channel_xx_ack 8 . GIN.051.075.0032 GIN.051.075.0031 GIN.051.075.0030 GIN.051.075.0029 GIN.051.075.0028 GIN.051.075.0027 GIN.051.075.0026 GIN.051.075.0025
+  ack 8 . GIN.051.075.0032 GIN.051.075.0031 GIN.051.075.0030 GIN.051.075.0029 GIN.051.075.0028 GIN.051.075.0027 GIN.051.075.0026 GIN.051.075.0025
+  req 8 . GOUT.051.075.0040 GOUT.051.075.0038 GOUT.051.075.0036 GOUT.051.075.0034 GOUT.051.075.0032 GOUT.051.075.0030 GOUT.051.075.0028 GOUT.051.075.0026
+  single 8 . GOUT.051.075.0039 GOUT.051.075.0037 GOUT.051.075.0035 GOUT.051.075.0033 GOUT.051.075.0031 GOUT.051.075.0029 GOUT.051.075.0027 GOUT.051.075.0025
 HPS_FPGA2HPS 052 045
   araddr . 32 GOUT.051.048.0036 GOUT.051.048.0025 GOUT.051.048.0014 GOUT.051.048.0011 GOUT.051.048.0010 GOUT.051.048.0009 GOUT.051.048.0008 GOUT.051.048.0007 GOUT.051.048.0006 GOUT.051.048.0005 GOUT.051.048.0035 GOUT.051.048.0034 GOUT.051.048.0033 GOUT.051.048.0032 GOUT.051.048.0031 GOUT.051.048.0030 GOUT.051.048.0029 GOUT.051.048.0028 GOUT.051.048.0027 GOUT.051.048.0026 GOUT.051.048.0024 GOUT.051.048.0023 GOUT.051.048.0022 GOUT.051.048.0021 GOUT.051.048.0020 GOUT.051.048.0019 GOUT.051.048.0018 GOUT.051.048.0017 GOUT.051.048.0016 GOUT.051.048.0015 GOUT.051.048.0013 GOUT.051.048.0012
   arburst . 2 GOUT.051.048.0004 GOUT.051.048.0003
@@ -2171,9 +2171,7 @@ HPS_PERIPHERAL_NAND 052 050
   wpbar . . GIN.051.071.0000
 HPS_PERIPHERAL_QSPI 052 065
   mi 4 . GOUT.051.075.0001 GOUT.051.075.0000 GOUT.051.074.0040 GOUT.051.074.0039
-  mo 2 . GIN.051.074.0019 GIN.051.074.0018
-  mo2_wpn . . GIN.051.074.0017
-  mo3_hold . . GIN.051.074.0016
+  mo 4 . GIN.051.074.0019 GIN.051.074.0018 GIN.051.074.0017 GIN.051.074.0016
   n_mo_en . 4 GIN.051.074.0015 GIN.051.074.0014 GIN.051.074.0013 GIN.051.074.0012
   n_ss_out . 4 GIN.051.074.0011 GIN.051.074.0010 GIN.051.074.0009 GIN.051.074.0008
 HPS_PERIPHERAL_SDMMC 052 068

diff --git a/data/sx50f-p2r.txt b/data/sx50f-p2r.txt
@@ -1461,9 +1461,9 @@ HPS_DBG_APB 032 053
   p_wdata . 32 GIN.031.020.0010 GIN.031.019.0053 GIN.031.019.0042 GIN.031.019.0039 GIN.031.019.0038 GIN.031.019.0037 GIN.031.019.0036 GIN.031.019.0035 GIN.031.019.0034 GIN.031.019.0033 GIN.031.020.0009 GIN.031.020.0008 GIN.031.020.0007 GIN.031.020.0006 GIN.031.020.0005 GIN.031.020.0004 GIN.031.020.0003 GIN.031.020.0002 GIN.031.020.0001 GIN.031.020.0000 GIN.031.019.0052 GIN.031.019.0051 GIN.031.019.0050 GIN.031.019.0049 GIN.031.019.0048 GIN.031.019.0047 GIN.031.019.0046 GIN.031.019.0045 GIN.031.019.0044 GIN.031.019.0043 GIN.031.019.0041 GIN.031.019.0040
   p_write . . GIN.031.019.0032
 HPS_DMA 032 041
-  channel_req 8 . GOUT.031.055.0040 GOUT.031.055.0038 GOUT.031.055.0036 GOUT.031.055.0034 GOUT.031.055.0032 GOUT.031.055.0030 GOUT.031.055.0028 GOUT.031.055.0026
-  channel_single 8 . GOUT.031.055.0039 GOUT.031.055.0037 GOUT.031.055.0035 GOUT.031.055.0033 GOUT.031.055.0031 GOUT.031.055.0029 GOUT.031.055.0027 GOUT.031.055.0025
-  channel_xx_ack 8 . GIN.031.055.0032 GIN.031.055.0031 GIN.031.055.0030 GIN.031.055.0029 GIN.031.055.0028 GIN.031.055.0027 GIN.031.055.0026 GIN.031.055.0025
+  ack 8 . GIN.031.055.0032 GIN.031.055.0031 GIN.031.055.0030 GIN.031.055.0029 GIN.031.055.0028 GIN.031.055.0027 GIN.031.055.0026 GIN.031.055.0025
+  req 8 . GOUT.031.055.0040 GOUT.031.055.0038 GOUT.031.055.0036 GOUT.031.055.0034 GOUT.031.055.0032 GOUT.031.055.0030 GOUT.031.055.0028 GOUT.031.055.0026
+  single 8 . GOUT.031.055.0039 GOUT.031.055.0037 GOUT.031.055.0035 GOUT.031.055.0033 GOUT.031.055.0031 GOUT.031.055.0029 GOUT.031.055.0027 GOUT.031.055.0025
 HPS_FPGA2HPS 032 023
   araddr . 32 GOUT.031.028.0036 GOUT.031.028.0025 GOUT.031.028.0014 GOUT.031.028.0011 GOUT.031.028.0010 GOUT.031.028.0009 GOUT.031.028.0008 GOUT.031.028.0007 GOUT.031.028.0006 GOUT.031.028.0005 GOUT.031.028.0035 GOUT.031.028.0034 GOUT.031.028.0033 GOUT.031.028.0032 GOUT.031.028.0031 GOUT.031.028.0030 GOUT.031.028.0029 GOUT.031.028.0028 GOUT.031.028.0027 GOUT.031.028.0026 GOUT.031.028.0024 GOUT.031.028.0023 GOUT.031.028.0022 GOUT.031.028.0021 GOUT.031.028.0020 GOUT.031.028.0019 GOUT.031.028.0018 GOUT.031.028.0017 GOUT.031.028.0016 GOUT.031.028.0015 GOUT.031.028.0013 GOUT.031.028.0012
   arburst . 2 GOUT.031.028.0004 GOUT.031.028.0003
@@ -1724,9 +1724,7 @@ HPS_PERIPHERAL_NAND 032 026
   wpbar . . GIN.031.051.0000
 HPS_PERIPHERAL_QSPI 032 037
   mi 4 . GOUT.031.055.0001 GOUT.031.055.0000 GOUT.031.054.0040 GOUT.031.054.0039
-  mo 2 . GIN.031.054.0019 GIN.031.054.0018
-  mo2_wpn . . GIN.031.054.0017
-  mo3_hold . . GIN.031.054.0016
+  mo 4 . GIN.031.054.0019 GIN.031.054.0018 GIN.031.054.0017 GIN.031.054.0016
   n_mo_en . 4 GIN.031.054.0015 GIN.031.054.0014 GIN.031.054.0013 GIN.031.054.0012
   n_ss_out . 4 GIN.031.054.0011 GIN.031.054.0010 GIN.031.054.0009 GIN.031.054.0008
 HPS_PERIPHERAL_SDMMC 032 040

diff --git a/generator/generator.cc b/generator/generator.cc
@@ -253,7 +253,7 @@ int main(int argc, char **argv)
     memcpy(output.data() + dh->off_p2r_info, p2r.data.data(), p2rs);
     memcpy(output.data() + dh->off_p2p_info, p2p.data.data(), p2ps);
 
-    fprintf(stderr, "%-6s size %9d nodeinfo %9d hash %9d hashmap %9d nodes %7d lines %5d p2r %5d p2p %5d\n", chip.c_str(), int(output.size()), dh->off_rnode_end - dh->off_rnode, int(len1), int(len2), dh->count_rnode, int(rli_data.size()), int(p2r.data.size()), int(p2p.data.size()));
+    fprintf(stderr, "%-6s size %9d nodeinfo %9d hash %9d hashmap %9d nodes %7d lines %5d p2r %5d p2p %4d\n", chip.c_str(), int(output.size()), dh->off_rnode_end - dh->off_rnode, int(len1), int(len2), dh->count_rnode, int(rli_data.size()), int(p2r.data.size()), int(p2p.data.size()));
 
     file_save(dest_dir + '/' + chip + "-r.bin", output, strtol(argv[4], nullptr, 10));
   }