1 files changed, 14 insertions, 52 deletions

diff --git a/firmware/target/arm/imx233/debug-imx233.c b/firmware/target/arm/imx233/debug-imx233.c
index ff3313a59e..7cb217f40f 100644
--- a/firmware/target/arm/imx233/debug-imx233.c
+++ b/firmware/target/arm/imx233/debug-imx233.c
@@ -242,26 +242,10 @@ static struct
     { CLK_XBUS, "xbus", false, false, true, false, true }
 };
 
-static struct
-{
-    enum imx233_as_monitor_t monitor;
-    const char *name;
-} dbg_as_monitor[] =
-{
-    { AS_CPU_INSTR, "cpu inst" },
-    { AS_CPU_DATA, "cpu data" },
-    { AS_TRAFFIC, "traffic" },
-    { AS_TRAFFIC_JAM, "traffic jam" },
-    { AS_APBXDMA, "apbx" },
-    { AS_APBHDMA, "apbh" },
-    { AS_PXP, "pxp" },
-    { AS_DCP, "dcp" }
-};
-
 bool dbg_hw_info_clkctrl(void)
 {
     lcd_setfont(FONT_SYSFIXED);
-    
+
     while(1)
     {
         int button = get_action(CONTEXT_STD, HZ / 10);
@@ -277,7 +261,7 @@ bool dbg_hw_info_clkctrl(void)
                 lcd_setfont(FONT_UI);
                 return false;
         }
-        
+
         lcd_clear_display();
 
         /*               012345678901234567890123456789 */
@@ -287,45 +271,23 @@ bool dbg_hw_info_clkctrl(void)
             #define c dbg_clk[i]
             lcd_putsf(0, i + 1, "%4s", c.name);
             if(c.has_enable)
-                lcd_putsf(5, i + 1, "%2d", imx233_clkctrl_is_clock_enabled(c.clk));
+                lcd_putsf(5, i + 1, "%2d", imx233_clkctrl_is_enabled(c.clk));
             if(c.has_bypass)
-                lcd_putsf(8, i + 1, "%2d", imx233_clkctrl_get_bypass_pll(c.clk));
-            if(c.has_idiv && imx233_clkctrl_get_clock_divisor(c.clk) != 0)
-                lcd_putsf(10, i + 1, "%4d", imx233_clkctrl_get_clock_divisor(c.clk));
-            if(c.has_fdiv && imx233_clkctrl_get_fractional_divisor(c.clk) != 0)
-                lcd_putsf(16, i + 1, "%4d", imx233_clkctrl_get_fractional_divisor(c.clk));
+                lcd_putsf(8, i + 1, "%2d", imx233_clkctrl_get_bypass(c.clk));
+            if(c.has_idiv && imx233_clkctrl_get_div(c.clk) != 0)
+                lcd_putsf(10, i + 1, "%4d", imx233_clkctrl_get_div(c.clk));
+            if(c.has_fdiv && imx233_clkctrl_get_frac_div(c.clk) != 0)
+                lcd_putsf(16, i + 1, "%4d", imx233_clkctrl_get_frac_div(c.clk));
             if(c.has_freq)
-                lcd_putsf(21, i + 1, "%9d", imx233_clkctrl_get_clock_freq(c.clk));
+                lcd_putsf(21, i + 1, "%9d", imx233_clkctrl_get_freq(c.clk));
             #undef c
         }
         int line = ARRAYLEN(dbg_clk) + 1;
-        lcd_putsf(0, line, "as: %d/%d  emi sync: %d", imx233_clkctrl_is_auto_slow_enabled(),
-            1 << imx233_clkctrl_get_auto_slow_divisor(), imx233_clkctrl_is_emi_sync_enabled());
-        line++;
-        lcd_putsf(0, line, "as monitor: ");
-        int x_off = 12;
-        bool first = true;
-        unsigned line_w = lcd_getwidth() / font_get_width(font_get(lcd_getfont()), ' ');
-        for(unsigned i = 0; i < ARRAYLEN(dbg_as_monitor); i++)
-        {
-            if(!imx233_clkctrl_is_auto_slow_monitor_enabled(dbg_as_monitor[i].monitor))
-                continue;
-            if(!first)
-            {
-                lcd_putsf(x_off, line, ", ");
-                x_off += 2;
-            }
-            first = false;
-            if((x_off + strlen(dbg_as_monitor[i].name)) > line_w)
-            {
-                x_off = 1;
-                line++;
-            }
-            lcd_putsf(x_off, line, "%s", dbg_as_monitor[i].name);
-            x_off += strlen(dbg_as_monitor[i].name);
-        }
-        line++;
-        
+        if(!imx233_clkctrl_is_auto_slow_enabled())
+            lcd_putsf(0, line++, "auto-slow: disabled");
+        else
+            lcd_putsf(0, line++, "auto-slow: 1/%d", 1 << imx233_clkctrl_get_auto_slow_div());
+
         lcd_update();
         yield();
     }