Skip to content

Commit 55f29d1

Browse files
keirfkeirf
committed
build: Rename TARGET_floppy to TARGET_shugart
1 parent 1975789 commit 55f29d1

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

‎Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ export ROOT := $(CURDIR)
1414

1515
prod-%: FORCE
1616
$(MAKE) target mcu=$* target=bootloader level=prod
17-
$(MAKE) target mcu=$* target=floppy level=prod
17+
$(MAKE) target mcu=$* target=shugart level=prod
1818
$(MAKE) target mcu=$* target=apple2 level=prod
1919
$(MAKE) target mcu=$* target=quickdisk level=prod
2020
$(MAKE) target mcu=$* target=bl_update level=prod
2121
$(MAKE) target mcu=$* target=io_test level=prod
2222

2323
debug-%: FORCE
2424
$(MAKE) target mcu=$* target=bootloader level=debug
25-
$(MAKE) target mcu=$* target=floppy level=debug
25+
$(MAKE) target mcu=$* target=shugart level=debug
2626
$(MAKE) target mcu=$* target=apple2 level=debug
2727
$(MAKE) target mcu=$* target=quickdisk level=debug
2828
$(MAKE) target mcu=$* target=bl_update level=debug
2929
$(MAKE) target mcu=$* target=io_test level=debug
3030

3131
logfile-%: FORCE
3232
$(MAKE) target mcu=$* target=bootloader level=logfile
33-
$(MAKE) target mcu=$* target=floppy level=logfile
33+
$(MAKE) target mcu=$* target=shugart level=logfile
3434
$(MAKE) target mcu=$* target=apple2 level=logfile
3535
$(MAKE) target mcu=$* target=quickdisk level=logfile
3636

@@ -58,7 +58,7 @@ _legacy_dist: PROJ := FF_Gotek
5858
_legacy_dist: FORCE
5959
$(PYTHON) $(ROOT)/scripts/mk_update.py old \
6060
$(t)/$(PROJ)-$(VER).upd \
61-
out/$(mcu)/$(level)/floppy/target.bin & \
61+
out/$(mcu)/$(level)/shugart/target.bin & \
6262
$(PYTHON) $(ROOT)/scripts/mk_update.py old \
6363
$(t)/alt/bootloader/$(PROJ)-bootloader-$(VER).upd \
6464
out/$(mcu)/$(level)/bl_update/target.bin & \
@@ -67,7 +67,7 @@ _legacy_dist: FORCE
6767
out/$(mcu)/$(level)/io_test/target.bin & \
6868
$(PYTHON) $(ROOT)/scripts/mk_update.py old \
6969
$(t)/alt/logfile/$(PROJ)-logfile-$(VER).upd \
70-
out/$(mcu)/logfile/floppy/target.bin & \
70+
out/$(mcu)/logfile/shugart/target.bin & \
7171
$(PYTHON) $(ROOT)/scripts/mk_update.py old \
7272
$(t)/alt/apple2/$(PROJ)-apple2-$(VER).upd \
7373
out/$(mcu)/$(level)/apple2/target.bin & \
@@ -83,12 +83,12 @@ _legacy_dist: FORCE
8383
wait
8484

8585
_dist: FORCE
86-
cd out/$(mcu)/$(level)/floppy; \
86+
cd out/$(mcu)/$(level)/shugart; \
8787
cp -a target.dfu $(t)/dfu/$(PROJ)-$(n)-$(VER).dfu; \
8888
cp -a target.hex $(t)/hex/$(PROJ)-$(n)-$(VER).hex
8989
$(PYTHON) $(ROOT)/scripts/mk_update.py new \
9090
$(t)/$(PROJ)-$(VER).upd \
91-
out/$(mcu)/$(level)/floppy/target.bin $(mcu) & \
91+
out/$(mcu)/$(level)/shugart/target.bin $(mcu) & \
9292
$(PYTHON) $(ROOT)/scripts/mk_update.py new \
9393
$(t)/alt/bootloader/$(PROJ)-bootloader-$(VER).upd \
9494
out/$(mcu)/$(level)/bl_update/target.bin $(mcu) & \
@@ -97,7 +97,7 @@ _dist: FORCE
9797
out/$(mcu)/$(level)/io_test/target.bin $(mcu) & \
9898
$(PYTHON) $(ROOT)/scripts/mk_update.py new \
9999
$(t)/alt/logfile/$(PROJ)-logfile-$(VER).upd \
100-
out/$(mcu)/logfile/floppy/target.bin $(mcu) & \
100+
out/$(mcu)/logfile/shugart/target.bin $(mcu) & \
101101
$(PYTHON) $(ROOT)/scripts/mk_update.py new \
102102
$(t)/alt/apple2/$(PROJ)-apple2-$(VER).upd \
103103
out/$(mcu)/$(level)/apple2/target.bin $(mcu) & \

‎inc/build_enums.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define TARGET_bootloader 1
1919
#define TARGET_bl_update 2
2020
#define TARGET_io_test 3
21-
#define TARGET_floppy 4
21+
#define TARGET_shugart 4
2222
#define TARGET_apple2 5
2323
#define TARGET_quickdisk 6
2424

‎src/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ else
3838
OBJS += main.o
3939
OBJS += cache.o
4040

41+
OBJS-$(shugart) += floppy.o
4142
OBJS-$(apple2) += floppy.o
42-
OBJS-$(floppy) += floppy.o
4343
OBJS-$(quickdisk) += quickdisk.o
4444

4545
SUBDIRS += display

‎src/floppy_generic.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ static void wdata_stop(void)
368368
write->dma_end = ARRAY_SIZE(dma_wr->buf) - dma_wdata.cndtr;
369369
image->wr_prod++;
370370

371-
#if TARGET == TARGET_floppy || TARGET == TARGET_apple2
371+
#if TARGET == TARGET_shugart || TARGET == TARGET_apple2
372372
if (!ff_cfg.index_suppression && ff_cfg.write_drain != WDRAIN_realtime) {
373373
/* Opportunistically insert an INDEX pulse ahead of writeback. */
374374
drive_change_output(drv, outp_index, TRUE);

‎src/gotek/floppy.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#endif
2525
#define pin_pha2 0 /* PB0 */
2626
#define pin_pha3 1 /* PA1 */
27-
#else
27+
#elif TARGET == TARGET_shugart
2828
#define pin_dir 0 /* PB0 */
2929
#define pin_step 1 /* PA1 */
3030
#endif
@@ -62,7 +62,7 @@ DEFINE_IRQ(dma_rdata_irq, "IRQ_rdata_dma");
6262
#if TARGET == TARGET_apple2
6363
static struct timer step_timer;
6464
static void POLL_step(void *unused);
65-
#else
65+
#elif TARGET == TARGET_shugart
6666
void IRQ_28(void) __attribute__((alias("IRQ_STEP_changed"))); /* TMR2 */
6767
#endif
6868

@@ -81,7 +81,7 @@ static const struct exti_irq exti_irqs[] = {
8181
/* WDATA */ { 27, FLOPPY_IRQ_WGATE_PRI, 0 },
8282
#endif
8383
/* SELA */ { 6, FLOPPY_IRQ_SEL_PRI, 0 },
84-
#if TARGET == TARGET_floppy
84+
#if TARGET == TARGET_shugart
8585
/* STEP */ { 28, FLOPPY_IRQ_STEP_PRI, m(2) /* dummy */ },
8686
#endif
8787
/* WGATE */ { 7, FLOPPY_IRQ_WGATE_PRI, 0 },
@@ -107,7 +107,7 @@ static volatile uint32_t *p_dma_rd_active;
107107

108108
bool_t floppy_ribbon_is_reversed(void)
109109
{
110-
#if TARGET == TARGET_floppy
110+
#if TARGET == TARGET_shugart
111111
time_t t_start = time_now();
112112

113113
/* If ribbon is reversed then most/all inputs are grounded.
@@ -140,7 +140,7 @@ static void board_floppy_init(void)
140140
gpio->crl = (gpio->crl & ~(0xfu<<((pin)<<2))) \
141141
| (((mode)&0xfu)<<((pin)<<2))
142142

143-
#if TARGET == TARGET_floppy
143+
#if TARGET == TARGET_shugart
144144
gpio_configure_pin(gpioa, pin_step, GPI_bus);
145145
#endif
146146
gpio_configure_pin(gpio_data, pin_wdata, GPI_bus);
@@ -153,7 +153,7 @@ static void board_floppy_init(void)
153153
| (((mode)&0x3u)<<((pin)<<1));
154154
#define afio syscfg
155155

156-
#if TARGET == TARGET_floppy
156+
#if TARGET == TARGET_shugart
157157
gpio_set_af(gpioa, pin_step, 1);
158158
gpio_configure_pin(gpioa, pin_step, AFI(PUPD_none));
159159
#endif
@@ -189,7 +189,7 @@ static void board_floppy_init(void)
189189
gpio_configure_pin(gpioa, pin_pha3, GPI_bus);
190190
timer_init(&step_timer, POLL_step, NULL);
191191
timer_set(&step_timer, time_now());
192-
#else
192+
#elif TARGET == TARGET_shugart
193193
gpio_configure_pin(gpiob, pin_dir, GPI_bus);
194194
#endif
195195
gpio_configure_pin(gpioa, pin_sel0, GPI_bus);
@@ -385,7 +385,7 @@ static void POLL_step(void *unused)
385385
timer_set(&step_timer, step_timer.deadline + time_ms(1));
386386
}
387387

388-
#else
388+
#elif TARGET == TARGET_shugart
389389

390390
static bool_t drive_is_writing(void)
391391
{

‎src/image/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ OBJS += image.o
44
OBJS-$(quickdisk) += qd.o
55

66
ifeq ($(apple2),y)
7-
floppy := y
7+
shugart := y
88
endif
99

10-
OBJS-$(floppy) += adf.o
11-
OBJS-$(floppy) += dsk.o
12-
OBJS-$(floppy) += hfe.o
13-
OBJS-$(floppy) += img.o
14-
OBJS-$(floppy) += da.o
15-
OBJS-$(floppy) += dummy.o
16-
OBJS-$(floppy) += mfm.o
10+
OBJS-$(shugart) += adf.o
11+
OBJS-$(shugart) += dsk.o
12+
OBJS-$(shugart) += hfe.o
13+
OBJS-$(shugart) += img.o
14+
OBJS-$(shugart) += da.o
15+
OBJS-$(shugart) += dummy.o
16+
OBJS-$(shugart) += mfm.o

‎src/image/image.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* See the file COPYING for more details, or visit <http://unlicense.org>.
1010
*/
1111

12-
#if TARGET == TARGET_floppy || TARGET == TARGET_apple2
12+
#if TARGET == TARGET_shugart || TARGET == TARGET_apple2
1313

1414
extern const struct image_handler adf_image_handler;
1515
extern const struct image_handler atr_image_handler;
@@ -135,7 +135,7 @@ static bool_t try_handler(struct image *im, struct slot *slot,
135135
return handler->open(im);
136136
}
137137

138-
#if TARGET == TARGET_floppy || TARGET == TARGET_apple2
138+
#if TARGET == TARGET_shugart || TARGET == TARGET_apple2
139139

140140
void image_open(struct image *im, struct slot *slot, DWORD *cltbl)
141141
{
@@ -262,7 +262,7 @@ bool_t image_setup_track(
262262
{
263263
const struct image_handler *h = im->track_handler;
264264

265-
#if TARGET == TARGET_floppy
265+
#if TARGET == TARGET_shugart
266266
if (!in_da_mode(im, track>>1)) {
267267
/* If we are exiting D-A mode then need to re-read the config file. */
268268
if (h == &da_image_handler)

0 commit comments

Comments
 (0)