amiga: Motor signal must be respected even while a disk is ejected.

Since the motor signal selects between ID and RDY signals on pin 34.

Refs #354

Author: keirf

inc/floppy.h

@@ -298,6 +298,9 @@ static inline bool_t in_da_mode(struct image *im, unsigned int cyl)
     return cyl >= max_t(unsigned int, DA_FIRST_CYL, im_nphys_cyls(im));
 }
 
+extern uint32_t motor_chgrst_exti_mask;
+void motor_chgrst_setup_exti(void);
+
 /*
  * Local variables:
  * mode: C

src/floppy.c

@@ -165,7 +165,7 @@ static void update_amiga_id(struct drive *drv, bool_t amiga_hd_id)
         drive_change_pin(&drive, pin_34, TRUE);
     } else {
         /* Do nothing here. Pin 34 will be updated by IRQ_MOTOR() via
-         * motor_chgrst_{insert,eject}(). */
+         * motor_chgrst_update_status(). */
         IRQ_global_enable();
     }
 }
@@ -204,7 +204,7 @@ void floppy_cancel(void)
     index.fake_fired = FALSE;
     barrier(); /* /then/ cancel index.timer_deassert */
     timer_cancel(&index.timer_deassert);
-    motor_chgrst_eject(drv);
+    motor_chgrst_update_status(drv);
 
     /* Set outputs for empty drive. */
     barrier();
@@ -329,7 +329,7 @@ void floppy_init(void)
     timer_init(&index.timer, index_assert, NULL);
     timer_init(&index.timer_deassert, index_deassert, NULL);
 
-    motor_chgrst_eject(drv);
+    motor_chgrst_setup_exti();
 }
 
 void floppy_insert(unsigned int unit, struct slot *slot)
@@ -354,7 +354,7 @@ void floppy_insert(unsigned int unit, struct slot *slot)
         drive_change_output(drv, outp_wrprot, FALSE);
     barrier();
     drv->inserted = TRUE;
-    motor_chgrst_insert(drv); /* update RDY + motor state */
+    motor_chgrst_update_status(drv); /* update RDY + motor state */
     if (ff_cfg.chgrst <= CHGRST_delay(15))
         timer_set(&drv->chgrst_timer, time_now() + ff_cfg.chgrst*time_ms(500));
 }

src/gotek/floppy.c

@@ -460,36 +460,25 @@ static void motor_chgrst_update_status(struct drive *drv)
     IRQx_set_pending(MOTOR_CHGRST_IRQ);
 }
 
-static void motor_chgrst_insert(struct drive *drv)
+uint32_t motor_chgrst_exti_mask;
+void motor_chgrst_setup_exti(void)
 {
-    uint32_t imr = exti->imr;
+    uint32_t m = 0;
 
     if (ff_cfg.motor_delay != MOTOR_ignore) {
         _exti_route(gotek_enhanced()?0/*PA*/:1/*PB*/, pin_motor);
-        imr |= m(pin_motor);
+        m |= m(pin_motor);
     }
 
     if (ff_cfg.chgrst == CHGRST_pa14) {
         exti_route_pa(pin_chgrst);
-        imr |= m(pin_chgrst);
+        m |= m(pin_chgrst);
     }
 
-    exti->imr = imr;
-    motor_chgrst_update_status(drv);
-}
-
-static void motor_chgrst_eject(struct drive *drv)
-{
-    uint32_t imr = exti->imr;
-
-    if (ff_cfg.motor_delay != MOTOR_ignore)
-        imr &= ~m(pin_motor);
-
-    if (ff_cfg.chgrst == CHGRST_pa14)
-        imr &= ~m(pin_chgrst);
+    motor_chgrst_exti_mask = m;
+    exti->imr |= m;
 
-    exti->imr = imr;
-    motor_chgrst_update_status(drv);
+    motor_chgrst_update_status(&drive);
 }
 
 /*

src/gotek/quickdisk.c

@@ -243,6 +243,12 @@ static void IRQ_rotary_changed(void)
     IRQ_rotary();
 }
 
+uint32_t motor_chgrst_exti_mask;
+void motor_chgrst_setup_exti(void)
+{
+    /* Quick Disk does not have configurable MOTOR and CHGRST. */
+}
+
 /*
  * Local variables:
  * mode: C

src/main.c

@@ -1300,15 +1300,27 @@ static void read_ff_cfg(void)
 
 static void process_ff_cfg_opts(const struct ff_cfg *old)
 {
+    /* chgrst, motor-delay: Reset EXTI handlers. */
+    if ((ff_cfg.motor_delay != old->motor_delay)
+        || (ff_cfg.chgrst != old->chgrst)) {
+        exti->imr &= ~motor_chgrst_exti_mask;
+        motor_chgrst_exti_mask = 0;
+    }
+
     /* rotary, chgrst, motor-delay: Inform the rotary-encoder subsystem. 
-     * It is harmless to notify unconditionally. */
+     * It is harmless to reset rotary EXTI handlers unconditionally. */
     set_rotary_exti();
 
-    /* interface, pin02, pin34: Inform the floppy subsystem. */
+    /* interface, pin02, pin34, chgrst, motor-delay: Inform the floppy
+     * subsystem.  */
     if ((ff_cfg.interface != old->interface)
         || (ff_cfg.pin02 != old->pin02)
-        || (ff_cfg.pin34 != old->pin34))
+        || (ff_cfg.pin34 != old->pin34)
+        || (ff_cfg.motor_delay != old->motor_delay)
+        || (ff_cfg.chgrst != old->chgrst)) {
         floppy_set_fintf_mode();
+        motor_chgrst_setup_exti();
+    }
 
     /* max-cyl: Inform the floppy subsystem. */
     if (ff_cfg.max_cyl != old->max_cyl)