mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Fix merge mistake

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-15 21:32:26 -05:00
parent b4fd6e1069
commit 694f2b47cc
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu/cpu.c
View File

@@ -164,9 +164,6 @@ static int cyrix_addr;
static void cpu_write(uint16_t addr, uint8_t val, void *priv);
static uint8_t cpu_read(uint16_t addr, void *priv);
static void cpu_write(uint16_t addr, uint8_t val, void *priv);
static uint8_t cpu_read(uint16_t addr, void *priv);
#ifdef ENABLE_CPU_LOG
int cpu_do_log = ENABLE_CPU_LOG;

8
src/floppy/fdd.c
View File

@@ -383,14 +383,6 @@ fdd_is_dd(int drive)
return (drive_types[fdd[drive].type].flags & 0x70) == 0x10;
}
#if 0
int
fdd_is_hd(int drive)
{
return drive_types[fdd[drive].type].flags & FLAG_HOLE1;
}
#endif
int
fdd_is_hd(int drive)
{