ff.cfg: New HFE-override options hfe-step= and hfe-rpm=

Refs #966

Author: keirf

examples/FF.CFG

@@ -267,6 +267,17 @@ nav-scroll-rate = 80
 # Values: 0 <= N <= 65535
 nav-scroll-pause = 300
 
+##
+## HFE OVERRIDES
+
+# HFE step size
+# Values: 0 <= N <= 2; N=0: no override
+hfe-step = 0
+
+# HFE rotation speed
+# Values: 0 <= N <= 1023; N=0: no override
+hfe-rpm = 0
+
 ##
 ## MISCELLANEOUS
 

inc/config.h

@@ -170,6 +170,8 @@ struct packed ff_cfg {
 #define NOTIFY_volume_mask 15
 #define NOTIFY_slotnr      (1<<4)
     uint8_t notify_volume;
+    uint16_t hfe_rpm;
+    uint8_t hfe_step;
 };
 
 extern struct ff_cfg ff_cfg;

src/image/hfe.c

@@ -97,7 +97,8 @@ static bool_t hfe_open(struct image *im)
         return FALSE;
     }
 
-    im->hfe.double_step = !dhdr.single_step;
+    im->hfe.double_step = (ff_cfg.hfe_step ? (ff_cfg.hfe_step == 2)
+                           : !dhdr.single_step);
     im->hfe.tlut_base = le16toh(dhdr.track_list_offset);
     im->nr_cyls = dhdr.nr_tracks;
     im->step = im->hfe.double_step ? 2 : 1;
@@ -131,6 +132,11 @@ static void hfe_seek_track(struct image *im, uint16_t track)
     if (im->hfe.is_v3 && im->tracklen_ticks) {
         /* Opcodes in v3 make it difficult to predict the track's length. Keep
          * the previous track's value since this isn't the first seek. */
+    } else if (!im->hfe.is_v3 && ff_cfg.hfe_rpm) {
+        im->stk_per_rev = ((uint32_t)stk_ms(200) * 300) / ff_cfg.hfe_rpm;
+        im->ticks_per_cell = ((sampleclk_stk(im->stk_per_rev) * 16u)
+                              / im->tracklen_bc);
+        im->write_bc_ticks = im->ticks_per_cell / 16;
     } else {
         im->tracklen_ticks = im->tracklen_bc * im->ticks_per_cell;
         im->stk_per_rev = stk_sampleclk(im->tracklen_ticks / 16);

src/main.c

@@ -1269,6 +1269,16 @@ static void read_ff_cfg(void)
             ff_cfg.nav_scroll_pause = strtol(opts.arg, NULL, 10);
             break;
 
+            /* HFE OVERRIDES */
+
+        case FFCFG_hfe_step:
+            ff_cfg.hfe_step = strtol(opts.arg, NULL, 10);
+            break;
+
+        case FFCFG_hfe_rpm:
+            ff_cfg.hfe_rpm = strtol(opts.arg, NULL, 10);
+            break;
+
             /* MISCELLANEOUS */
 
         case FFCFG_step_volume: {