Fixed the makefiles again, hopefully this time properly;

Single-sided floppy drives are actually single-sided now;
Temporarily re-enabled floppy logs for bugfixing purposes.
This commit is contained in:
OBattler
2017-05-05 02:43:34 +02:00
parent 55be173485
commit 7610dbe209
6 changed files with 18 additions and 7 deletions

View File

@@ -167,12 +167,12 @@ $(PROG).exe: $(OBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ)
$(OBJ) \
$(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) \
$(LIBS)
all: $(PROG).exe
ifneq ($(DEBUG), y)
strip $(PROG).exe
endif
all: $(PROG).exe
clean:
rm *.o
rm *.exe

View File

@@ -167,12 +167,12 @@ $(PROG).exe: $(OBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ)
$(OBJ) \
$(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) \
$(LIBS)
all: $(PROG).exe
ifneq ($(DEBUG), y)
strip $(PROG).exe
endif
all: $(PROG).exe
clean:
rm *.o
rm *.exe

View File

@@ -1972,6 +1972,11 @@ void d86f_poll(int drive)
int mfm = 1;
side = fdd_get_head(drive);
if (!fdd_is_double_sided(drive))
{
side = 0;
}
mfm = fdc_is_mfm();
if ((d86f[drive].state & 0xF8) == 0xE8)

View File

@@ -142,11 +142,11 @@ int discrate[4];
int discint;
int fdc_do_log = 0;
int fdc_do_log = 1;
void fdc_log(const char *format, ...)
{
#ifdef ENABLE_FDC_LOG
// #ifdef ENABLE_FDC_LOG
if (fdc_do_log)
{
va_list ap;
@@ -155,7 +155,7 @@ void fdc_log(const char *format, ...)
va_end(ap);
fflush(stdout);
}
#endif
// #endif
}
void fdc_reset()

View File

@@ -276,6 +276,11 @@ int fdd_is_ed(int drive)
return drive_types[fdd[drive].type].flags & FLAG_HOLE2;
}
int fdd_is_double_sided(int drive)
{
return drive_types[fdd[drive].type].flags & FLAG_DS;
}
void fdd_set_head(int drive, int head)
{
drive = real_drive(drive);

View File

@@ -11,6 +11,7 @@ int fdd_can_read_medium(int drive);
int fdd_doublestep_40(int drive);
int fdd_is_525(int drive);
int fdd_is_ed(int drive);
int fdd_is_double_sided(int drive);
void fdd_set_head(int drive, int head);
int fdd_get_head(int drive);