Update ARM build limits

hoglet67 · Nov 25, 2021 · adc1032 · adc1032
1 parent 31ca539
commit adc1032
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 38 deletions.
diff --git a/src/filesystem.c b/src/filesystem.c
@@ -586,49 +586,15 @@ void scan_profiles(char profile_names[MAX_PROFILES][MAX_PROFILE_WIDTH], int has_
             res = f_readdir(&dir, &fno);
             if (res != FR_OK || fno.fname[0] == 0 || *count == MAX_PROFILES) break;
             if (fno.fattrib & AM_DIR) {
-#ifdef USE_ARM_CAPTURE
-                if (_get_hardware_id() == _RPI2 || _get_hardware_id() == _RPI3) {
-                    if (!((strcmp(fno.fname, "Amiga") == 0 && (cpld->get_version() >> VERSION_DESIGN_BIT) != DESIGN_SIMPLE)
-                      ||  strcmp(fno.fname, "Amiga_2000") == 0
-                      ||  strcmp(fno.fname, "Amiga_Var-Scanlines") == 0
-                      ||  strcmp(fno.fname, "Amiga_Blk-Scanlines") == 0
-                      ||  strcmp(fno.fname, "Atari_ST") == 0
-                      ||  strcmp(fno.fname, "Atari_STE") == 0
-                      ||  strcmp(fno.fname, "Apple_IIGS") == 0)) {
-                        strncpy(profile_names[*count], fno.fname, MAX_PROFILE_WIDTH);
-                        (*count)++;
-                    }
-                } else {
-                    strncpy(profile_names[*count], fno.fname, MAX_PROFILE_WIDTH);
-                    (*count)++;
-                }
-#else
                 strncpy(profile_names[*count], fno.fname, MAX_PROFILE_WIDTH);
                 (*count)++;
-#endif
             } else {
                 if (fno.fname[0] != '.' && strlen(fno.fname) > 4 && strcmp(fno.fname, DEFAULTTXT_STRING) != 0) {
                     char* filetype = fno.fname + strlen(fno.fname)-4;
                     if (strcmp(filetype, ".txt") == 0) {
-#ifdef USE_ARM_CAPTURE
-                        if (_get_hardware_id() == _RPI2 || _get_hardware_id() == _RPI3) {
-                            if (!(strcmp(fno.fname, "BBC_NuLA_3bpp_Mode7.txt") == 0
-                              ||  strcmp(fno.fname, "Sam_Coupe.txt") == 0
-                              ||  strcmp(fno.fname, "BBC_NuLA_12bpp_Mode7.txt") == 0)) {
-                                strncpy(profile_names[*count], fno.fname, MAX_PROFILE_WIDTH);
-                                profile_names[*count][strlen(fno.fname) - 4] = 0;
-                                (*count)++;
-                            }
-                        } else {
-                            strncpy(profile_names[*count], fno.fname, MAX_PROFILE_WIDTH);
-                            profile_names[*count][strlen(fno.fname) - 4] = 0;
-                            (*count)++;
-                        }
-#else
                         strncpy(profile_names[*count], fno.fname, MAX_PROFILE_WIDTH);
                         profile_names[*count][strlen(fno.fname) - 4] = 0;
                         (*count)++;
-#endif
                     }
                 }
             }

diff --git a/src/geometry.c b/src/geometry.c
@@ -463,10 +463,11 @@ void geometry_get_fb_params(capture_info_t *capinfo) {
     }
 
 #ifdef USE_ARM_CAPTURE
-    if (_get_hardware_id() == _RPI2 || _get_hardware_id() == _RPI3) {            //in ARM build have to inhibit double height on Pi2 / Pi 3 /Zero 2 otherwise you get stalling
-        if (capinfo->video_type == VIDEO_PROGRESSIVE) {
-            capinfo->sizex2 &= SIZEX2_DOUBLE_WIDTH;
-        }
+    if ((_get_hardware_id() == _RPI2 || _get_hardware_id() == _RPI3) && capinfo->video_type != VIDEO_TELETEXT) {
+        capinfo->sizex2 &= SIZEX2_DOUBLE_WIDTH;   //in ARM build have to inhibit double height on Pi Zero 2Pi2 / Pi 3 otherwise you get stalling
+    }
+    if (_get_hardware_id() == _RPI && capinfo->video_type != VIDEO_TELETEXT && capinfo->sample_width >= SAMPLE_WIDTH_9LO) {
+        capinfo->sizex2 &= SIZEX2_DOUBLE_WIDTH;   //in ARM build have to inhibit double height on Pi zero / Pi 1 in 9/12bpp capture
     }
 #endif