reduce tests for FFOSD bit

hoglet67 · Jan 27, 2021 · d5feb98 · d5feb98
1 parent 0614476
commit d5feb98
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/capture_line_fast_simple_16bpp.S b/src/capture_line_fast_simple_16bpp.S
@@ -31,8 +31,6 @@
         // Pixel in GPIO 13.. 2 -> 31.. 16
         and    r9, r8, r14
         eor    \reg, r10, r9, lsl #(16 - PIXEL_BASE)
-        tst    r8, #MUX_MASK
-        orrne  r3, #BIT_PROBE
 .endm
 
 .macro OSD_SIMPLE_CAPTURE_TWELVE_BITS_16BPP_LO reg

diff --git a/src/defs.h b/src/defs.h
@@ -122,6 +122,11 @@
 #define GPCLR0  (PERIPHERAL_BASE + 0x200028)
 #define GPLEV0  (PERIPHERAL_BASE + 0x200034)
 #define GPEDS0  (PERIPHERAL_BASE + 0x200040)
+#define GPREN0  (PERIPHERAL_BASE + 0x20004C)
+#define GPFEN0  (PERIPHERAL_BASE + 0x200058)
+#define GPAREN0 (PERIPHERAL_BASE + 0x20007C)
+#define GPAFEN0 (PERIPHERAL_BASE + 0x200088)
+
 #define FIQCTRL (PERIPHERAL_BASE + 0x00B20C)
 
 #define INTPEND2 (PERIPHERAL_BASE + 0x00B208)

diff --git a/src/geometry.c b/src/geometry.c
@@ -62,8 +62,8 @@ static const char *bpp_names[] = {
 
 static param_t params[] = {
    {  SETUP_MODE,         "Setup Mode",         "setup_mode",         0,NUM_SETUP-1, 1 },
-   {    H_OFFSET,           "H Offset",           "h_offset",         0,        512, 4 },
-   {    V_OFFSET,           "V Offset",           "v_offset",         0,        512, 1 },
+   {    H_OFFSET,           "H Offset",           "h_offset",         1,        384, 4 },
+   {    V_OFFSET,           "V Offset",           "v_offset",         0,        256, 1 },
    { MIN_H_WIDTH,        "Min H Width",        "min_h_width",       150,       1920, 8 },
    {MIN_V_HEIGHT,       "Min V Height",       "min_v_height",       150,       1200, 2 },
    { MAX_H_WIDTH,        "Max H Width",        "max_h_width",       200,       1920, 8 },