Feature pe sync

Taskfile.box.yaml

@@ -7,7 +7,7 @@ vars:
   NOW:
     sh: "date +%Y%m%d%H%m%S"
   LABEL:
-    sh: "echo box-$(basename {{.ROOT_DIR}})"
+    sh: "echo box-$(basename {{.ROOT_DIR}} | tr '[:upper:]' '[:lower:]')"
   DOCKER_FILE_PREFIX: "docker/Dockerfile.box"
 
 tasks:

packaging/debian-bookworm/changelog

@@ -1,5 +1,5 @@
-usdr (0.9.9~bookworm0) stable; urgency=low
+usdr (0.9.10b~bookworm0) stable; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <[email protected]>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <[email protected]>  Thu, 26 Jun 2025 00:00:00 +0000

packaging/debian-bookworm/control

@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <[email protected]>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

packaging/ubuntu-bionic/changelog

@@ -1,5 +1,5 @@
-usdr (0.9.9~bionic0) bionic; urgency=low
+usdr (0.9.10b~bionic0) bionic; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <[email protected]>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <[email protected]>  Thu, 26 Jun 2025 00:00:00 +0000

packaging/ubuntu-bionic/control

@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <[email protected]>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

packaging/ubuntu-focal/changelog

@@ -1,5 +1,5 @@
-usdr (0.9.9~focal0) focal; urgency=low
+usdr (0.9.10b~focal0) focal; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <[email protected]>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <[email protected]>  Thu, 26 Jun 2025 00:00:00 +0000

packaging/ubuntu-focal/control

@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <[email protected]>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

packaging/ubuntu-jammy/changelog

@@ -1,5 +1,5 @@
-usdr (0.9.9~jammy0) jammy; urgency=low
+usdr (0.9.10b~jammy0) jammy; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <[email protected]>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <[email protected]>  Thu, 26 Jun 2025 00:00:00 +0000

packaging/ubuntu-jammy/control

@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <[email protected]>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

packaging/ubuntu-noble/changelog

@@ -1,5 +1,5 @@
-usdr (0.9.9~noble0) noble; urgency=low
+usdr (0.9.10b~noble0) noble; urgency=low
 
   * Fixes and improvements
 
- -- Ivan Kolesnikov <[email protected]>  Sun, 30 Jan 2025 00:00:00 +0000
+ -- Ivan Kolesnikov <[email protected]>  Thu, 26 Jun 2025 00:00:00 +0000

packaging/ubuntu-noble/control

@@ -2,7 +2,7 @@ Source: usdr
 Section: misc
 Priority: optional
 Maintainer: Ivan Kolesnikov <[email protected]>
-Standards-Version: 0.9.9
+Standards-Version: 0.9.10b
 Homepage: https://github.com/wavelet-lab/usdr-lib
 Vcs-Browser: https://github.com/wavelet-lab/usdr-lib
 Vcs-Git: https://github.com/wavelet-lab/usdr-lib.git

src/Changelog.txt

@@ -1,3 +1,8 @@
+Release 0.9.10b (2025-06-26)
+==========================
+
+- Fixes and improvements
+
 Release 0.9.9 (2025-01-30)
 ==========================
 

src/dmonitor/usdr_registers

@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-exec /usr/bin/env python3 /usr/libexec/usdr_dmonitor/registers_widget.py
+exec /usr/bin/env python3 /usr/libexec/usdr_dmonitor/registers_widget.py "$@"

src/dmonitor/yamls/ext_fe_ch4_400_7200_e.yaml

@@ -0,0 +1 @@
+../../lib/device/ext_fe_ch4_400_7200/ext_fe_ch4_400_7200_e.yaml

src/dmonitor/yamls/ext_fe_ch4_400_7200_usr.yaml

@@ -0,0 +1 @@
+../../lib/device/ext_fe_ch4_400_7200/ext_fe_ch4_400_7200_usr.yaml

src/hwparser/gen_h.py

@@ -17,7 +17,7 @@ def __init__(self, parser: reg_parser.ParserTop, filename: str) -> None:
         self.o_name = str(os.path.splitext(os.path.basename(filename))[0])
         self.l_name = self.o_name.lower()
         self.h_name = self.o_name.upper()
-    
+
         self.parser = parser
         self.addr_width = parser.addr_width
         self.data_width = parser.data_width
@@ -26,7 +26,7 @@ def __init__(self, parser: reg_parser.ParserTop, filename: str) -> None:
         self.page_prefix = parser.page_prefix
         self.reg_prefix = "%s_" % parser.reg_prefix.upper() if len(parser.reg_prefix) > 0 else ''
 
-        self.field_prefix_ar = [ a.lower() for a in parser.field_prefix_ar ]
+        self.field_prefix_ar = [a.lower() for a in parser.field_prefix_ar]
 
         # Flat all pages
         self.regs = {}
@@ -36,8 +36,8 @@ def __init__(self, parser: reg_parser.ParserTop, filename: str) -> None:
                 name = "%s_%s" % (pname, r.name) if self.page_prefix else r.name
 
                 if name in self.regs.keys():
-                    raise(Exception("Rigester `%s` is already in flat map! Rename it" % name))
-                
+                    raise (Exception("Rigester `%s` is already in flat map! Rename it" % name))
+
                 # TODO: parse ucnt
                 if r.ucnt == 1:
                     self.regs[name] = r.addr
@@ -48,14 +48,12 @@ def __init__(self, parser: reg_parser.ParserTop, filename: str) -> None:
                     for k in range(r.ucnt):
                         self.regs[name + "_BY%d" % (r.ucnt - k - 1)] = r.addr_l + k
 
-
     def regName(self, reg: reg_parser.ParserRegs) -> str:
         if self.page_prefix:
             return "%s_%s" % (reg.page.name.upper(), reg.name)
 
         return reg.name
 
-
     def fieldName(self, field: reg_parser.ParserFields) -> str:
         pfx = []
         for i in self.field_prefix_ar:
@@ -66,24 +64,30 @@ def fieldName(self, field: reg_parser.ParserFields) -> str:
             elif i == "regaddr":
                 pfx.append("%02x" % field.reg.addr_l)
             else:
-                raise(Exception("Unknown prefix type '%s'" % i))
+                raise (Exception("Unknown prefix type '%s'" % i))
 
         if len(pfx) > 0:
             pfx.append(field.name)
             return reduce(lambda x, y: "%s_%s" % (x, y), pfx)
 
         return field.name
 
-
     def normalize(self, name: str) -> str:
         return (name.replace('-', '_')
-                        .replace('.', '_')
-                        .replace(',', '_')
-                        .replace(' ', '_')
-                        .replace('(', '')
-                        .replace('|', 'OR')
-                        .replace(')', '')
-                        .replace('/', 'DIV'))
+                .replace('<=', 'LE')
+                .replace('>=', 'GE')
+                .replace('>', 'GT')
+                .replace('<', 'LT')
+                .replace('=', 'EQ')
+                .replace('+', 'PL')
+                .replace("'", 'MARK')
+                .replace('.', '_')
+                .replace(',', '_')
+                .replace(' ', '_')
+                .replace('(', '')
+                .replace('|', 'OR')
+                .replace(')', '')
+                .replace('/', 'DIV'))
 
     def ser_ch_fenum(self, reg: reg_parser.ParserRegs, name: str) -> str:
         vt = False
@@ -96,7 +100,7 @@ def ser_ch_fenum(self, reg: reg_parser.ParserRegs, name: str) -> str:
         str += "};"
         if vt and len(reg.fields) == 1:
             return ""
-        
+
         return str
 
     def generate_setter_expression(self, f, custom_name) -> str:
@@ -165,13 +169,13 @@ def ser_ch_enum(self, name: str, en_dict: dict, prefix: str = "") -> str:
         str = "enum %s_t {\n" % name
         for i, v in en_dict.items():
             str += "%s%s%s = 0x%x,\n" % (GenH.TAB, prefix, i.replace('-', '_')
-                .replace('.', '_')
-                .replace(',', '_')
-                .replace(' ', '_')
-                .replace('(', '')
-                .replace('|', 'OR')
-                .replace(')', '')
-                .replace('/', 'DIV'), v)
+                                         .replace('.', '_')
+                                         .replace(',', '_')
+                                         .replace(' ', '_')
+                                         .replace('(', '')
+                                         .replace('|', 'OR')
+                                         .replace(')', '')
+                                         .replace('/', 'DIV'), v)
         str += "};"
         return str
 
@@ -181,11 +185,19 @@ def write_ch(self, filename):
         print(all_regs)
 
         # Make register define
+        if (self.parser.wr_mask is not None) and (self.parser.rd_mask is not None):
+            raise (Exception("You should specify rd_mask OR wr_mask, but not both!"))
+
         def_macro = "MAKE_%s_REG_WR" % self.h_name
         def_wr_msk = "0x%x | " % self.parser.wr_mask if self.parser.wr_mask is not None else ""
         def_wr = "#define %s(a, v) (%s((a) << %d) | ((v) & 0x%x))" % (def_macro, def_wr_msk, self.data_width, (1 << self.data_width) - 1)
         print(def_wr)
 
+        def_macro_rd = "MAKE_%s_REG_RD" % self.h_name
+        def_rd_msk = "0x%x | " % self.parser.rd_mask if self.parser.rd_mask is not None else ""
+        def_rd = "#define %s(a) (%s((a) << %d))" % (def_macro_rd, def_rd_msk, self.data_width)
+        print(def_rd)
+
         # Predefined universal enums
         for e in self.enums:
             em = e.replace('-', '_')
@@ -213,10 +225,12 @@ def write_ch(self, filename):
                     print(self.ser_cf_fmacro(r))
 
                 if r.ucnt == 1:
-                    defc = "#define MAKE_%s_%s(%s)" % (self.h_name, name, reduce(lambda x, y: "%s, %s" % (x, y), [x.name.lower() for x in r.fields]))
-                    #defc += " ((%s << %d) |" % (name, self.data_width)
+                    defc = "#define MAKE_%s_%s(%s)" % (
+                    self.h_name, name, reduce(lambda x, y: "%s, %s" % (x, y), [x.name.lower() for x in r.fields]))
+                    # defc += " ((%s << %d) |" % (name, self.data_width)
                     defc += " %s(%s," % (def_macro, name)
-                    defc += reduce(lambda x, y: "%s | %s" % (x, y), [" \\\n%s%s" % (self.TAB, self.generate_setter_expression(x, x.name.lower())) for x in r.fields ])
+                    defc += reduce(lambda x, y: "%s | %s" % (x, y),
+                                   [" \\\n%s%s" % (self.TAB, self.generate_setter_expression(x, x.name.lower())) for x in r.fields])
                     defc += ")"
                     print(defc)
                 else:
@@ -228,8 +242,10 @@ def write_ch(self, filename):
                     value_msk = reduce(lambda x, y: x | y, [x.mask for x in r.fields])
                     value_off = reduce(lambda x, y: min(x, y), [x.bits_l for x in r.fields])
                     if len(r.fields) > 1:
-                        defc = "#define MAKE_%s_%s_LONG(%s) (" % (self.h_name, name, reduce(lambda x, y: "%s, %s" % (x, y), [x.name.lower() for x in r.fields]))
-                        defc += reduce(lambda x, y: "%s | %s" % (x, y), [" \\\n%s%s" % (self.TAB, self.generate_setter_expression(x, x.name.lower())) for x in r.fields ])
+                        defc = "#define MAKE_%s_%s_LONG(%s) (" % (
+                        self.h_name, name, reduce(lambda x, y: "%s, %s" % (x, y), [x.name.lower() for x in r.fields]))
+                        defc += reduce(lambda x, y: "%s | %s" % (x, y),
+                                       [" \\\n%s%s" % (self.TAB, self.generate_setter_expression(x, x.name.lower())) for x in r.fields])
                         defc += ")"
                         print(defc)
 
@@ -247,9 +263,9 @@ def write_ch(self, filename):
                         else:
                             # defc += " ((%s_BY%d << %d) | (((value) << %d) & 0x%x))" % (name, u, self.data_width, -by_off, by_msk)
                             defc += " (((value) << %d) & 0x%x))" % (-by_off, by_msk)
-                        print(defc)  
+                        print(defc)
 
-        # if 'c-cache' in self.parser.raw_yaml:
+                        # if 'c-cache' in self.parser.raw_yaml:
         #     cc = self.parser.raw_yaml['c-cache']
         #     if 'regs' in cc:
         #         print("\n\n/* Cached operations */")
@@ -284,10 +300,10 @@ def parse_c_cache(self, cregs):
                 fn += "p->%s = (p->%s & ~%s_MSK) | ((%s << %s_OFF) & %s_MSK); }" % (regn, regn, FLDN, fname, FLDN, FLDN)
                 print(fn)
 
-
     def write_vh(self, filename):
         pass
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Debug UI options')
     parser.add_argument('--yaml', dest='yaml', type=str,

src/lib/cal/opt_func.c

@@ -4,6 +4,7 @@
 #include "opt_func.h"
 #include <limits.h>
 #include <usdr_logging.h>
+#include <stdio.h>
 
 int find_golden_min(int start, int stop, void* param, evaluate_fn_t fn, int* px, int* pv, int exparam)
 {
@@ -170,3 +171,45 @@ int find_best_2d(struct opt_iteration2d *ops, unsigned max_count, void* param, i
     return 0;
 }
 
+// Function to implement Stein's Algorithm
+// Borrowed from: https://www.geeksforgeeks.org/steins-algorithm-for-finding-gcd/ (C)
+//
+uint64_t find_gcd(uint64_t a, uint64_t b)
+{
+    if (a == b)
+        return a;
+
+    // GCD(0, b) == b; GCD(a, 0) == a,
+    // GCD(0, 0) == 0
+    if (a == 0)
+        return b;
+    if (b == 0)
+        return a;
+
+    // look for factors of 2
+    if (~a & 1) // a is even
+    {
+        if (b & 1) // b is odd
+            return find_gcd(a >> 1, b);
+        else // both a and b are even
+            return find_gcd(a >> 1, b >> 1) << 1;
+    }
+
+    if (~b & 1) // a is odd, b is even
+        return find_gcd(a, b >> 1);
+
+    // reduce larger number
+    if (a > b)
+        return find_gcd((a - b) >> 1, b);
+
+    return find_gcd((b - a) >> 1, a);
+}
+
+void binary_print_u32(uint32_t x, char* s, bool reverse)
+{
+    unsigned len = 0;
+    for(unsigned i = 0; i < sizeof(x) * 8; ++i)
+    {
+        len += sprintf(s + len, "%1u", reverse ? (x >> i) & 0x1 : (int32_t)(x << i) < 0);
+    }
+}

src/lib/cal/opt_func.h

@@ -8,6 +8,9 @@
 #ifndef OPT_FUNC_H
 #define OPT_FUNC_H
 
+#include "stdint.h"
+#include "stdbool.h"
+#include "time.h"
 
 #define MAX(a, b) \
   ({ __typeof__ (a) _a = (a); \
@@ -55,5 +58,14 @@ struct opt_iteration2d
 int find_best_2d(struct opt_iteration2d *ops, unsigned max_count, void* param, int stop_when,
                  int *px, int *py, int *pfxy);
 
+uint64_t find_gcd(uint64_t a, uint64_t b);
+void binary_print_u32(uint32_t x, char* s, bool reverse);
+
+static inline uint64_t clock_get_time()
+{
+    struct timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
+    return (uint64_t)ts.tv_sec * 1000000LL + (uint64_t)ts.tv_nsec/1000LL;
+}
 
 #endif

src/lib/common/ring_buffer.c

@@ -92,7 +92,7 @@ unsigned ring_buffer_pwait(struct ring_buffer* rb, int usecs)
 
 void ring_buffer_ppost(struct ring_buffer* rb)
 {
-    int res = sem_post(&rb->consumer);
+    __attribute__((unused)) int res = sem_post(&rb->consumer);
     assert(res == 0);
 }
 
@@ -110,7 +110,7 @@ unsigned ring_buffer_cwait(struct ring_buffer* rb, int usecs)
 
 void ring_buffer_cpost(struct ring_buffer* rb)
 {
-    int res = sem_post(&rb->producer);
+    __attribute__((unused)) int res = sem_post(&rb->producer);
     assert(res == 0);
 }