Allow CPLD driver to provide a default profile (#91)

Change-Id: Id728767b3aa21053f08208dc62542cab89827e46
hoglet67 · May 6, 2019 · 49320d4 · 49320d4
1 parent 98e99af
commit 49320d4
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/src/cpld.h b/src/cpld.h
@@ -22,6 +22,7 @@ typedef struct {
 // for the two different CPLD implementations
 typedef struct {
    const char *name;
+   const char *default_profile;
    void (*init)(int cpld_version);
    int (*get_version)();
    void (*set_mode)(int mode7);

diff --git a/src/cpld_atom.c b/src/cpld_atom.c
@@ -263,6 +263,7 @@ static int cpld_get_delay() {
 }
 cpld_t cpld_atom = {
    .name = "Atom",
+   .default_profile = "Atom_CPLD",
    .init = cpld_init,
    .get_version = cpld_get_version,
    .calibrate = cpld_calibrate,

diff --git a/src/cpld_normal.c b/src/cpld_normal.c
@@ -749,6 +749,7 @@ static int cpld_get_delay() {
 }
 cpld_t cpld_normal = {
    .name = "Normal",
+   .default_profile = "BBC_Micro",
    .init = cpld_init,
    .get_version = cpld_get_version,
    .calibrate = cpld_calibrate,

diff --git a/src/osd.c b/src/osd.c
@@ -2118,7 +2118,9 @@ int osd_key(int key) {
 
             }
             set_status_message(msg);
-            load_profiles(get_feature(F_PROFILE), 1);
+            // Don't re-write profile.txt here - it was
+            // already written if the profile was changed
+            load_profiles(get_feature(F_PROFILE), 0);
             break;
          }
          case I_RESTORE:
@@ -2202,7 +2204,7 @@ int osd_key(int key) {
 }
 
 void osd_init() {
-   char *prop = NULL;
+   const char *prop = NULL;
    // Precalculate character->screen mapping table
    //
    // Normal size mapping, odd numbered characters
@@ -2433,19 +2435,22 @@ void osd_init() {
                log_info("FOUND PROFILE: %s", profile_names[i]);
             }
          }
+         // The default profile is provided by the CPLD
+         prop = cpld->default_profile;
+         // It can be over-ridden by a local profile.txt file
          cbytes = file_load("/profile.txt", config_buffer, MAX_CONFIG_BUFFER_SIZE);
          if (cbytes) {
             prop = get_prop_no_space(config_buffer, "profile");
-            if (prop) {
-               for (int i=0; i<count; i++) {
-                  if (strcmp(profile_names[i], prop) == 0) {
-                     set_profile(i);
-                     load_profiles(i, 0);
-                     process_profile(i);
-                     set_feature(F_SUBPROFILE, 0);
-                     log_info("Profile = %s", prop);
-                     break;
-                  }
+         }
+         if (prop) {
+            for (int i=0; i<count; i++) {
+               if (strcmp(profile_names[i], prop) == 0) {
+                  set_profile(i);
+                  load_profiles(i, 0);
+                  process_profile(i);
+                  set_feature(F_SUBPROFILE, 0);
+                  log_info("Profile = %s", prop);
+                  break;
                }
             }
          }

diff --git a/src/rgb_to_hdmi.c b/src/rgb_to_hdmi.c
@@ -1640,7 +1640,7 @@ int get_paletteControl() {
    return paletteControl;
 }
 
-void set_resolution(int mode, char *name, int reboot) {
+void set_resolution(int mode, const char *name, int reboot) {
    char osdline[80];
    if (resolution != mode) {
       if (osd_active()) {

diff --git a/src/rgb_to_hdmi.h b/src/rgb_to_hdmi.h
@@ -8,7 +8,7 @@ void set_subprofile(int value);
 int  get_subprofile();
 void set_paletteControl(int value);
 int  get_paletteControl();
-void set_resolution(int mode, char *name, int reboot);
+void set_resolution(int mode, const char *name, int reboot);
 int get_resolution();
 void set_interpolation(int mode, int reboot);
 int get_interpolation();

diff --git a/src/scripts/release.sh b/src/scripts/release.sh
@@ -44,13 +44,12 @@ EOF
 
 cp -a config.txt ${DIR}
 cp -a default_config.txt ${DIR}
-cp -a profile.txt ${DIR}
 cp -a firmware/* ${DIR}
 cp -a Profiles ${DIR}
 cp -a Resolutions ${DIR}
 
 cd releases/${NAME}
-zip -qr ../${NAME}.zip `find . -type f | sort`
+zip -qr ../${NAME}.zip .
 cd ../..
 
 unzip -l releases/${NAME}.zip