From: Piotr Esden-Tempski <piotr@esden.net>
Date: Fri, 20 Mar 2020 01:12:41 +0000 (-0700)
Subject: Don't let python convert lane number to float.
X-Git-Tag: 24jan2021_ls180~549^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=279886721b4b6c365ec1f64974fea3a4aec83b51;p=litex.git

Don't let python convert lane number to float.

While at it also:
* Don't multilane for reg >= 8 bit width.
* Only check if we should switch to multilane after finding min field width.
---

diff --git a/litex/soc/doc/csr.py b/litex/soc/doc/csr.py
index cfc17bf6..2e7a1bc2 100644
--- a/litex/soc/doc/csr.py
+++ b/litex/soc/doc/csr.py
@@ -257,8 +257,8 @@ class DocumentedCSRRegion:
                 print("                {\"name\": \"" + field_name + "\",  " + type_str + attr_str + "\"bits\": " + str(field.size) + "}" + term, file=stream)
                 bit_offset = field.offset + field.size
                 min_field_size = min(min_field_size, field.size)
-                if min_field_size < 8:
-                    multilane = True
+            if min_field_size < 8:
+                multilane = True
             if bit_offset != self.busword:
                 print("                {\"bits\": " + str(self.busword - bit_offset) + "}", file=stream)
         else:
@@ -270,10 +270,11 @@ class DocumentedCSRRegion:
                 attr_str = "\"attr\": 'reset: " + str(reg.reset_value) + "', "
             print("                {\"name\": \"" + reg.short_name.lower() + self.bit_range(reg.offset, reg.offset + reg.size, empty_if_zero=True) + "\", " + attr_str + "\"bits\": " + str(reg.size) + "}" + term, file=stream)
             if reg.size != self.csr_data_width:
-                multilane = True
                 print("                {\"bits\": " + str(self.csr_data_width - reg.size) + "},", file=stream)
+            if reg.size < 8:
+                multilane = True
         if multilane:
-            lanes = self.busword / 8
+            lanes = self.busword // 8
         else:
             lanes = 1
         print("            ], \"config\": {\"hspace\": 400, \"bits\": " + str(self.busword) + ", \"lanes\": " + str(lanes) + " }, \"options\": {\"hspace\": 400, \"bits\": " + str(self.busword) + ", \"lanes\": " + str(lanes) + "}", file=stream)