build: Rename TARGET_floppy to TARGET_shugart

Author: keirf

Makefile

@@ -14,23 +14,23 @@ export ROOT := $(CURDIR)
 
 prod-%: FORCE
 	$(MAKE) target mcu=$* target=bootloader level=prod
-	$(MAKE) target mcu=$* target=floppy level=prod
+	$(MAKE) target mcu=$* target=shugart level=prod
 	$(MAKE) target mcu=$* target=apple2 level=prod
 	$(MAKE) target mcu=$* target=quickdisk level=prod
 	$(MAKE) target mcu=$* target=bl_update level=prod
 	$(MAKE) target mcu=$* target=io_test level=prod
 
 debug-%: FORCE
 	$(MAKE) target mcu=$* target=bootloader level=debug
-	$(MAKE) target mcu=$* target=floppy level=debug
+	$(MAKE) target mcu=$* target=shugart level=debug
 	$(MAKE) target mcu=$* target=apple2 level=debug
 	$(MAKE) target mcu=$* target=quickdisk level=debug
 	$(MAKE) target mcu=$* target=bl_update level=debug
 	$(MAKE) target mcu=$* target=io_test level=debug
 
 logfile-%: FORCE
 	$(MAKE) target mcu=$* target=bootloader level=logfile
-	$(MAKE) target mcu=$* target=floppy level=logfile
+	$(MAKE) target mcu=$* target=shugart level=logfile
 	$(MAKE) target mcu=$* target=apple2 level=logfile
 	$(MAKE) target mcu=$* target=quickdisk level=logfile
 
@@ -58,7 +58,7 @@ _legacy_dist: PROJ := FF_Gotek
 _legacy_dist: FORCE
 	$(PYTHON) $(ROOT)/scripts/mk_update.py old \
 	  $(t)/$(PROJ)-$(VER).upd \
-	  out/$(mcu)/$(level)/floppy/target.bin & \
+	  out/$(mcu)/$(level)/shugart/target.bin & \
 	$(PYTHON) $(ROOT)/scripts/mk_update.py old \
 	  $(t)/alt/bootloader/$(PROJ)-bootloader-$(VER).upd \
 	  out/$(mcu)/$(level)/bl_update/target.bin & \
@@ -67,7 +67,7 @@ _legacy_dist: FORCE
 	  out/$(mcu)/$(level)/io_test/target.bin & \
 	$(PYTHON) $(ROOT)/scripts/mk_update.py old \
 	  $(t)/alt/logfile/$(PROJ)-logfile-$(VER).upd \
-	  out/$(mcu)/logfile/floppy/target.bin & \
+	  out/$(mcu)/logfile/shugart/target.bin & \
 	$(PYTHON) $(ROOT)/scripts/mk_update.py old \
 	  $(t)/alt/apple2/$(PROJ)-apple2-$(VER).upd \
 	  out/$(mcu)/$(level)/apple2/target.bin & \
@@ -83,12 +83,12 @@ _legacy_dist: FORCE
 	wait
 
 _dist: FORCE
-	cd out/$(mcu)/$(level)/floppy; \
+	cd out/$(mcu)/$(level)/shugart; \
 	  cp -a target.dfu $(t)/dfu/$(PROJ)-$(n)-$(VER).dfu; \
 	  cp -a target.hex $(t)/hex/$(PROJ)-$(n)-$(VER).hex
 	$(PYTHON) $(ROOT)/scripts/mk_update.py new \
 	  $(t)/$(PROJ)-$(VER).upd \
-	  out/$(mcu)/$(level)/floppy/target.bin $(mcu) & \
+	  out/$(mcu)/$(level)/shugart/target.bin $(mcu) & \
 	$(PYTHON) $(ROOT)/scripts/mk_update.py new \
 	  $(t)/alt/bootloader/$(PROJ)-bootloader-$(VER).upd \
 	  out/$(mcu)/$(level)/bl_update/target.bin $(mcu) & \
@@ -97,7 +97,7 @@ _dist: FORCE
 	  out/$(mcu)/$(level)/io_test/target.bin $(mcu) & \
 	$(PYTHON) $(ROOT)/scripts/mk_update.py new \
 	  $(t)/alt/logfile/$(PROJ)-logfile-$(VER).upd \
-	  out/$(mcu)/logfile/floppy/target.bin $(mcu) & \
+	  out/$(mcu)/logfile/shugart/target.bin $(mcu) & \
 	$(PYTHON) $(ROOT)/scripts/mk_update.py new \
 	  $(t)/alt/apple2/$(PROJ)-apple2-$(VER).upd \
 	  out/$(mcu)/$(level)/apple2/target.bin $(mcu) & \

inc/build_enums.h

@@ -18,7 +18,7 @@
 #define TARGET_bootloader 1
 #define TARGET_bl_update  2
 #define TARGET_io_test    3
-#define TARGET_floppy     4
+#define TARGET_shugart    4
 #define TARGET_apple2     5
 #define TARGET_quickdisk  6
 

src/Makefile

@@ -38,8 +38,8 @@ else
 OBJS += main.o
 OBJS += cache.o
 
+OBJS-$(shugart) += floppy.o
 OBJS-$(apple2) += floppy.o
-OBJS-$(floppy) += floppy.o
 OBJS-$(quickdisk) += quickdisk.o
 
 SUBDIRS += display

src/floppy_generic.c

@@ -368,7 +368,7 @@ static void wdata_stop(void)
     write->dma_end = ARRAY_SIZE(dma_wr->buf) - dma_wdata.cndtr;
     image->wr_prod++;
 
-#if TARGET == TARGET_floppy || TARGET == TARGET_apple2
+#if TARGET == TARGET_shugart || TARGET == TARGET_apple2
     if (!ff_cfg.index_suppression && ff_cfg.write_drain != WDRAIN_realtime) {
         /* Opportunistically insert an INDEX pulse ahead of writeback. */
         drive_change_output(drv, outp_index, TRUE);

src/gotek/floppy.c

@@ -24,7 +24,7 @@
 #endif
 #define pin_pha2    0 /* PB0 */
 #define pin_pha3    1 /* PA1 */
-#else
+#elif TARGET == TARGET_shugart
 #define pin_dir     0 /* PB0 */
 #define pin_step    1 /* PA1 */
 #endif
@@ -62,7 +62,7 @@ DEFINE_IRQ(dma_rdata_irq, "IRQ_rdata_dma");
 #if TARGET == TARGET_apple2
 static struct timer step_timer;
 static void POLL_step(void *unused);
-#else
+#elif TARGET == TARGET_shugart
 void IRQ_28(void) __attribute__((alias("IRQ_STEP_changed"))); /* TMR2 */
 #endif
 
@@ -81,7 +81,7 @@ static const struct exti_irq exti_irqs[] = {
     /* WDATA */ { 27, FLOPPY_IRQ_WGATE_PRI, 0 },
 #endif
     /* SELA */ {  6, FLOPPY_IRQ_SEL_PRI, 0 }, 
-#if TARGET == TARGET_floppy
+#if TARGET == TARGET_shugart
     /* STEP */ { 28, FLOPPY_IRQ_STEP_PRI, m(2) /* dummy */ },
 #endif
     /* WGATE */ {  7, FLOPPY_IRQ_WGATE_PRI, 0 },
@@ -107,7 +107,7 @@ static volatile uint32_t *p_dma_rd_active;
 
 bool_t floppy_ribbon_is_reversed(void)
 {
-#if TARGET == TARGET_floppy
+#if TARGET == TARGET_shugart
     time_t t_start = time_now();
 
     /* If ribbon is reversed then most/all inputs are grounded. 
@@ -140,7 +140,7 @@ static void board_floppy_init(void)
     gpio->crl = (gpio->crl & ~(0xfu<<((pin)<<2)))       \
         | (((mode)&0xfu)<<((pin)<<2))
 
-#if TARGET == TARGET_floppy
+#if TARGET == TARGET_shugart
     gpio_configure_pin(gpioa, pin_step, GPI_bus);
 #endif
     gpio_configure_pin(gpio_data, pin_wdata, GPI_bus);
@@ -153,7 +153,7 @@ static void board_floppy_init(void)
         | (((mode)&0x3u)<<((pin)<<1));
 #define afio syscfg
 
-#if TARGET == TARGET_floppy
+#if TARGET == TARGET_shugart
     gpio_set_af(gpioa, pin_step, 1);
     gpio_configure_pin(gpioa, pin_step, AFI(PUPD_none));
 #endif
@@ -189,7 +189,7 @@ static void board_floppy_init(void)
     gpio_configure_pin(gpioa, pin_pha3,  GPI_bus);
     timer_init(&step_timer, POLL_step, NULL);
     timer_set(&step_timer, time_now());
-#else
+#elif TARGET == TARGET_shugart
     gpio_configure_pin(gpiob, pin_dir,   GPI_bus);
 #endif
     gpio_configure_pin(gpioa, pin_sel0,  GPI_bus);
@@ -385,7 +385,7 @@ static void POLL_step(void *unused)
     timer_set(&step_timer, step_timer.deadline + time_ms(1));
 }
 
-#else
+#elif TARGET == TARGET_shugart
 
 static bool_t drive_is_writing(void)
 {

src/image/Makefile

@@ -4,13 +4,13 @@ OBJS += image.o
 OBJS-$(quickdisk) += qd.o
 
 ifeq ($(apple2),y)
-floppy := y
+shugart := y
 endif
 
-OBJS-$(floppy) += adf.o
-OBJS-$(floppy) += dsk.o
-OBJS-$(floppy) += hfe.o
-OBJS-$(floppy) += img.o
-OBJS-$(floppy) += da.o
-OBJS-$(floppy) += dummy.o
-OBJS-$(floppy) += mfm.o
+OBJS-$(shugart) += adf.o
+OBJS-$(shugart) += dsk.o
+OBJS-$(shugart) += hfe.o
+OBJS-$(shugart) += img.o
+OBJS-$(shugart) += da.o
+OBJS-$(shugart) += dummy.o
+OBJS-$(shugart) += mfm.o

src/image/image.c

@@ -9,7 +9,7 @@
  * See the file COPYING for more details, or visit <http://unlicense.org>.
  */
 
-#if TARGET == TARGET_floppy || TARGET == TARGET_apple2
+#if TARGET == TARGET_shugart || TARGET == TARGET_apple2
 
 extern const struct image_handler adf_image_handler;
 extern const struct image_handler atr_image_handler;
@@ -135,7 +135,7 @@ static bool_t try_handler(struct image *im, struct slot *slot,
     return handler->open(im);
 }
 
-#if TARGET == TARGET_floppy || TARGET == TARGET_apple2
+#if TARGET == TARGET_shugart || TARGET == TARGET_apple2
 
 void image_open(struct image *im, struct slot *slot, DWORD *cltbl)
 {
@@ -262,7 +262,7 @@ bool_t image_setup_track(
 {
     const struct image_handler *h = im->track_handler;
 
-#if TARGET == TARGET_floppy
+#if TARGET == TARGET_shugart
     if (!in_da_mode(im, track>>1)) {
         /* If we are exiting D-A mode then need to re-read the config file. */
         if (h == &da_image_handler)