# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1591394525 -7200
# Node ID 45eb45c9d0caf97c34838b1bf70aa4cc8a969f53
# Parent  19eb92c444df58886cbdaa6000c2b174f710c446
Removed debugging statements.

diff -r 19eb92c444df -r 45eb45c9d0ca pkg/devices/lib/lcd/src/jz4740/lcd-jz4740.cc
--- a/pkg/devices/lib/lcd/src/jz4740/lcd-jz4740.cc	Fri Jun 05 23:59:12 2020 +0200
+++ b/pkg/devices/lib/lcd/src/jz4740/lcd-jz4740.cc	Sat Jun 06 00:02:05 2020 +0200
@@ -23,7 +23,6 @@
 
 #include <l4/devices/hw_mmio_register_block.h>
 #include <l4/sys/cache.h>
-#include <l4/sys/err.h>
 #include <l4/sys/irq.h>
 #include <l4/sys/types.h>
 #include <l4/util/util.h>
@@ -32,7 +31,6 @@
 #include "lcd-jz4740-config.h"
 
 #include <stdint.h>
-#include <stdio.h>
 
 enum Regs : unsigned
 {
@@ -352,9 +350,6 @@
   _regs = new Hw::Mmio_register_block<32>(addr);
   _burst_size = 64; // 64-word burst size (JZ4780)
   //_burst_size = 16; // 16-word burst size
-
-  // add_cid("lcd");
-  // add_cid("lcd-jz4740");
 }
 
 struct Jz4740_lcd_panel *
@@ -388,7 +383,6 @@
   _regs[Osd_status] = 0;
   _regs[Lcd_status] = 0;
   _regs[Lcd_control] = (_regs[Lcd_control] & ~(1U << Control_disable)) | (1U << Control_enable);
-  printf("LCD control: %x\n", (unsigned int) _regs[Lcd_control]);
 }
 
 bool
@@ -717,8 +711,7 @@
 uint32_t
 Lcd_jz4740_chip::_control_irq()
 {
-  return // (1U << Control_out_underrun_irq_enable) |
-         ((_irq_conditions & Lcd_irq_frame_start) ? (1U << Control_frame_start_irq_enable) : 0) |
+  return ((_irq_conditions & Lcd_irq_frame_start) ? (1U << Control_frame_start_irq_enable) : 0) |
          ((_irq_conditions & Lcd_irq_frame_end) ? (1U << Control_frame_end_irq_enable) : 0);
 }
 
@@ -745,8 +738,7 @@
 uint32_t
 Lcd_jz4740_chip::_status_irq()
 {
-  return // (1U << Status_out_underrun_irq) |
-         ((_irq_conditions & Lcd_irq_frame_start) ? (1U << Status_frame_start_irq) : 0) |
+  return ((_irq_conditions & Lcd_irq_frame_start) ? (1U << Status_frame_start_irq) : 0) |
          ((_irq_conditions & Lcd_irq_frame_end) ? (1U << Status_frame_end_irq) : 0);
 }
 
@@ -966,17 +958,10 @@
 
   _regs[Rgb_control] = (1U << Rgb_format_enable) | Rgb_odd_line_rgb | Rgb_even_line_rgb;
   _regs[Priority_level] = _priority_transfer();
-  _regs[Osd_config] = //_osd_config_irq() |
-                      (1U << Osd_config_enable) |
+  _regs[Osd_config] = (1U << Osd_config_enable) |
                       (1U << Osd_config_alpha_enable);
   _regs[Alpha_levels] = ((255U << Alpha_level_fg1) & Alpha_level_fg1_mask) |
                         ((255U << Alpha_level_fg0) & Alpha_level_fg0_mask);
-
-  printf("LCD control: %08x\n", (unsigned int) _regs[Lcd_control]);
-  printf("LCD status: %08x\n", (unsigned int) _regs[Lcd_status]);
-  printf("OSD control: %08x\n", (unsigned int) _regs[Osd_control]);
-  printf("OSD config: %08x\n", (unsigned int) _regs[Osd_config]);
-  printf("OSD status: %08x\n", (unsigned int) _regs[Osd_status]);
 }
 
 // Set the interrupt for controller-related events.
@@ -999,35 +984,14 @@
 
   // Wait for a condition.
 
-  //printf("Waiting for IRQ...\n");
   tag = l4_irq_receive(_irq, l4_timeout(L4_IPC_TIMEOUT_NEVER, l4util_micros2l4to(2000000)));
 
-  //if (_regs[Lcd_status] & (1U << Status_out_underrun_irq))
-  //  enable();
-
-#if 0
-  printf("LCD config: %08x\n", (unsigned int) _regs[Lcd_config]);
-  printf("LCD control: %08x\n", (unsigned int) _regs[Lcd_control]);
-  printf("LCD status: %08x\n", (unsigned int) _regs[Lcd_status]);
-  printf("OSD config: %08x\n", (unsigned int) _regs[Osd_config]);
-  printf("OSD control: %08x\n", (unsigned int) _regs[Osd_control]);
-  printf("OSD status: %08x\n", (unsigned int) _regs[Osd_status]);
-  printf("LCD command: %08x\n", (unsigned int) _regs[Command_0]);
-  printf("LCD IRQ id: %08x\n", (unsigned int) _regs[Lcd_irq_id]);
-  printf("LCD descriptor: %08x\n", (unsigned int) _regs[Desc_address_0]);
-  printf("LCD source: %08x\n", (unsigned int) _regs[Source_address_0]);
-  printf("LCD frame id: %08x\n", (unsigned int) _regs[Frame_id_0]);
-  printf("LCD counter/position: %08x\n", (unsigned int) _regs[Counter_position_0]);
-  printf("LCD foreground size: %08x\n", (unsigned int) _regs[Foreground_size_0]);
-#endif
-
   // Acknowledge interrupts.
 
   _regs[Lcd_status] = 0;
 
   // Return errors.
 
-  //printf("Error: %s\n", l4sys_errtostr(l4_error(tag)));
   return l4_error(tag);
 }