Add some #defines for clarity in assembler

hoglet67 · May 21, 2021 · 94b31d9 · 94b31d9
1 parent 2835bf0
commit 94b31d9
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 51 deletions.
diff --git a/src/cpld.h b/src/cpld.h
@@ -62,12 +62,4 @@ signed int analyze_mode7_alignment(capture_info_t *capinfo);
 extern cpld_t         *cpld;
 extern capture_info_t *capinfo;
 
-enum {
-  SAMPLE_WIDTH_1,
-  SAMPLE_WIDTH_3,
-  SAMPLE_WIDTH_6,
-  SAMPLE_WIDTH_9LO,
-  SAMPLE_WIDTH_9HI,
-  SAMPLE_WIDTH_12
-};
 #endif
diff --git a/src/defs.h b/src/defs.h
@@ -441,4 +441,34 @@ typedef struct {
 #define DPMS_FRAME_COUNT 200
 
 
+// can't use enums in assembler
+#define   PALETTECONTROL_OFF                   0
+#define   PALETTECONTROL_INBAND                1
+#define   PALETTECONTROL_NTSCARTIFACT_CGA      2
+#define   PALETTECONTROL_NTSCARTIFACT_BW       3
+#define   PALETTECONTROL_NTSCARTIFACT_BW_AUTO  4
+#define   PALETTECONTROL_PALARTIFACT           5
+#define   PALETTECONTROL_ATARI_GTIA            6
+#define   NUM_CONTROLS                         7
+
+#define  VSYNC_AUTO                    0
+#define  VSYNC_INTERLACED              1
+#define  VSYNC_INTERLACED_160          2
+#define  VSYNC_NONINTERLACED           3
+#define  VSYNC_NONINTERLACED_DEJITTER  4
+#define  NUM_VSYNC                     5
+
+#define  VIDEO_PROGRESSIVE 0
+#define  VIDEO_INTERLACED  1
+#define  VIDEO_TELETEXT    2
+#define  NUM_VIDEO         3
+
+#define  SAMPLE_WIDTH_1    0
+#define  SAMPLE_WIDTH_3    1
+#define  SAMPLE_WIDTH_6    2
+#define  SAMPLE_WIDTH_9LO  3
+#define  SAMPLE_WIDTH_9HI  4
+#define  SAMPLE_WIDTH_12   5
+
+
 #endif
diff --git a/src/geometry.h b/src/geometry.h
@@ -24,22 +24,6 @@ enum {
    NUM_SYNC
 };
 
-enum {
-   VSYNC_AUTO,
-   VSYNC_INTERLACED,
-   VSYNC_INTERLACED_160,
-   VSYNC_NONINTERLACED,
-   VSYNC_NONINTERLACED_DEJITTER,
-   NUM_VSYNC
-};
-
-enum {
-   VIDEO_PROGRESSIVE,
-   VIDEO_INTERLACED,
-   VIDEO_TELETEXT,
-   NUM_VIDEO
-};
-
 enum {
    SETUP_MODE,
    H_OFFSET,

diff --git a/src/osd.h b/src/osd.h
@@ -63,17 +63,6 @@ enum {
    NUM_PALETTES
 };
 
-enum {
-   PALETTECONTROL_OFF,
-   PALETTECONTROL_INBAND,
-   PALETTECONTROL_NTSCARTIFACT_CGA,
-   PALETTECONTROL_NTSCARTIFACT_BW,
-   PALETTECONTROL_NTSCARTIFACT_BW_AUTO,
-   PALETTECONTROL_PALARTIFACT,
-   PALETTECONTROL_ATARI_GTIA,
-   NUM_CONTROLS
-};
-
 enum {
    OVERSCAN_0,
    OVERSCAN_1,

diff --git a/src/rgb_to_fb.S b/src/rgb_to_fb.S
@@ -1,6 +1,5 @@
 #include "rpi-base.h"
 #include "defs.h"
-
 #include "macros.S"
 
 .text
@@ -237,7 +236,7 @@ skip_swap:
         bicne  r9, #1
 
         ldr    r8, param_video_type
-        cmp    r8, #1 //VIDEO_INTERLACED
+        cmp    r8, #VIDEO_INTERLACED
         bne    skip_double_check
         tst    r3, #BIT_INTERLACED_VIDEO
         beq    skip_double_check
@@ -248,14 +247,14 @@ skip_double_check:
 
         ldr    r7, param_sample_width
         ldr    r8, param_palette_control
-        cmp    r7, #3                       // is sample width SAMPLE_WIDTH_9LO, SAMPLE_WIDTH_9HI, SAMPLE_WIDTH_12 (from above test)
-        movge  r8, #0                       // if so then force palette control to 0
+        cmp    r7, #SAMPLE_WIDTH_9LO        // is sample width SAMPLE_WIDTH_9LO, SAMPLE_WIDTH_9HI, SAMPLE_WIDTH_12 (from above test)
+        movge  r8, #PALETTECONTROL_OFF      // if so then force palette control to 0
         str    r8, param_palette_control
 
         ldr    r10, param_h_offset
-        cmp    r8, #6                       // is it PALETTECONTROL_ATARI_GTIA ?
-        moveq  r10, r10, lsl #1             // if so double the offset as sample rate is 2x pixel rate
-        add    r10, r10, #1                 // first psync test is wait for a zero after csync
+        cmp    r8, #PALETTECONTROL_ATARI_GTIA  // is it PALETTECONTROL_ATARI_GTIA ?
+        moveq  r10, r10, lsl #1                // if so double the offset as sample rate is 2x pixel rate
+        add    r10, r10, #1                    // first psync test is wait for a zero after csync
         str    r10, param_h_offset
 
         ldr    r7, param_fb_bpp
@@ -282,7 +281,7 @@ skip_double_check:
         ldr    r8, [r9, r7, lsl #2]
 
         ldr    r9, param_video_type
-        cmp    r9, #2 //VIDEO_TELETEXT
+        cmp    r9, #VIDEO_TELETEXT
         ldreq  r8, =capture_line_mode7_4bpp
 
         ldr    r10, param_border
@@ -372,9 +371,9 @@ buffer_chosen:
         rsbmi  r5, r5, #0
         bic    r3, r3, #BIT_ELK         // clear elk mode
         ldr    r8, param_vsync_type
-        cmp    r8, #0                   // auto
+        cmp    r8, #VSYNC_AUTO
         beq    auto_detect_vsync
-        cmp    r8, #2                   // interlaced half line
+        cmp    r8, #VSYNC_INTERLACED_160  // interlaced half line
         orreq  r3, r3, #BIT_ELK
         ble    get_field_type           // branch for both types of interlace
         tst    r3, #BIT_MODE_DETECT
@@ -485,7 +484,7 @@ not_first_frame:
 
 do_interlace_test:
         ldr    r9, param_video_type
-        cmp    r9, #1  //VIDEO_INTERLACE
+        cmp    r9, #VIDEO_INTERLACED
         bne    skip_interlace_test
 
         ldr    r9, param_sync_type
@@ -568,7 +567,7 @@ no_sync_loss:
         ldr    r5, param_v_offset
 
         ldr    r9, param_vsync_type
-        cmp    r9, #4    //flywheel vsync
+        cmp    r9, #VSYNC_NONINTERLACED_DEJITTER   //flywheel vsync
         bne    skip_fix_vsync_jitter
 
 
@@ -642,7 +641,7 @@ skip_fix_vsync_jitter:
         // In Mode 7, increment the frame buffer pointer by one line for the even field
 
         ldr    r9, param_video_type
-        cmp    r9, #1  //VIDEO_INTERLACE mode (primarily amiga)
+        cmp    r9, #VIDEO_INTERLACED // (primarily amiga)
         bne    nointadj
         tst    r3, #BIT_INTERLACED_VIDEO //is video interlaced?
         beq    nointadj
@@ -826,7 +825,7 @@ skip_all_lines:
         ldr    r7, detectedlinecount
 
         ldr    r9, param_palette_control
-        cmp    r9, #4      //4=auto mono ntsc
+        cmp    r9, #PALETTECONTROL_NTSCARTIFACT_BW_AUTO
         bne    check_dpms
 
         ldr    r9, ntsc_status
@@ -991,7 +990,7 @@ noInBandData:
         tst    r3, #BIT_CLEAR
         bne    force_osd_update
         ldr    r0, param_video_type
-        cmp    r0, #2  //VIDEO_TELETEXT
+        cmp    r0, #VIDEO_TELETEXT
         beq    skip_osd_update
         tst    r3, #BIT_OSD
         beq    skip_osd_update
@@ -1537,7 +1536,7 @@ abortvs:
         WAIT_FOR_CSYNC_1_LONG                   // resync with hsync
 
         ldr    r9, param_video_type
-        cmp    r9, #1  //VIDEO_INTERLACE
+        cmp    r9, #VIDEO_INTERLACED
         bne    skip_interlace_detect
 
         // Wait for the falling edge of csync