apple2: Build only the HFE image handler

Author: keirf

inc/floppy.h

@@ -302,7 +302,11 @@ static inline unsigned int im_nphys_cyls(struct image *im)
 }
 static inline bool_t in_da_mode(struct image *im, unsigned int cyl)
 {
+#if TARGET == TARGET_shugart
     return cyl >= max_t(unsigned int, DA_FIRST_CYL, im_nphys_cyls(im));
+#else
+    return FALSE;
+#endif
 }
 
 extern uint32_t motor_chgrst_exti_mask;

src/image/Makefile

@@ -3,9 +3,7 @@ OBJS += image.o
 
 OBJS-$(quickdisk) += qd.o
 
-ifeq ($(target),apple2)
-shugart := y
-endif
+OBJS-$(apple2) += hfe.o
 
 OBJS-$(shugart) += adf.o
 OBJS-$(shugart) += dsk.o

src/image/image.c

@@ -9,7 +9,7 @@
  * See the file COPYING for more details, or visit <http://unlicense.org>.
  */
 
-#if TARGET == TARGET_shugart || TARGET == TARGET_apple2
+#if TARGET == TARGET_shugart
 
 extern const struct image_handler adf_image_handler;
 extern const struct image_handler atr_image_handler;
@@ -68,6 +68,15 @@ const struct image_type image_type[] = {
     { "", NULL }
 };
 
+#elif TARGET == TARGET_apple2
+
+extern const struct image_handler hfe_image_handler;
+
+const struct image_type image_type[] = {
+    { "hfe", &hfe_image_handler },
+    { "", NULL }
+};
+
 #elif TARGET == TARGET_quickdisk
 
 extern const struct image_handler qd_image_handler;
@@ -135,7 +144,7 @@ static bool_t try_handler(struct image *im, struct slot *slot,
     return handler->open(im);
 }
 
-#if TARGET == TARGET_shugart || TARGET == TARGET_apple2
+#if TARGET == TARGET_shugart
 
 void image_open(struct image *im, struct slot *slot, DWORD *cltbl)
 {
@@ -200,6 +209,17 @@ void image_open(struct image *im, struct slot *slot, DWORD *cltbl)
     F_die(FR_BAD_IMAGE);
 }
 
+#elif TARGET == TARGET_apple2
+
+void image_open(struct image *im, struct slot *slot, DWORD *cltbl)
+{
+    if (try_handler(im, slot, cltbl, &hfe_image_handler))
+        return;
+
+    /* No handler found: bad image. */
+    F_die(FR_BAD_IMAGE);
+}
+
 #elif TARGET == TARGET_quickdisk
 
 void image_open(struct image *im, struct slot *slot, DWORD *cltbl)