claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied a whole slew of patches, getting RAM usage down by a further 10 MB.

Browse Source
This commit is contained in:
OBattler
2018-03-19 01:02:04 +01:00
parent b6c393cc91
commit b1efb99ed6
222 changed files with 9538 additions and 9980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/floppy/fdd.c
View File

@@ -1,20 +1,40 @@
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
* VARCem Virtual ARchaeological Computer EMulator.
* An emulator of (mostly) x86-based PC systems and devices,
* using the ISA,EISA,VLB,MCA and PCI system buses, roughly
* spanning the era between 1981 and 1995.
*
* This file is part of the 86Box distribution.
* This file is part of the VARCem Project.
*
* Implementation of the floppy drive emulation.
*
* Version: @(#)fdd.c 1.0.9 2018/03/14
* Version: @(#)fdd.c 1.0.5 2018/03/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>
*
* Copyright 2008-2018 Sarah Walker.
* Copyright 2018 Fred N. van Kempen.
* Copyright 2016-2018 Miran Grca.
* Copyright 2008-2018 Sarah Walker.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the:
*
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307
* USA.
*/
#include <stdio.h>
#include <stdint.h>
@@ -66,8 +86,9 @@ int fdc_indexcount = 52;
fdc_t *fdd_fdc;
d86f_handler_t d86f_handler[FDD_NUM];
static struct
static const struct
{
wchar_t *ext;
void (*load)(int drive, wchar_t *fn);
@@ -150,7 +171,7 @@ int ui_writeprot[FDD_NUM] = {0, 0, 0, 0};
#define FLAG_IGNORE_DENSEL 512
#define FLAG_PS2 1024
static struct
static const struct
{
int max_track;
int flags;
@@ -207,12 +228,12 @@ static struct
char *fdd_getname(int type)
{
return drive_types[type].name;
return (char *)drive_types[type].name;
}
char *fdd_get_internal_name(int type)
{
return drive_types[type].internal_name;
return (char *)drive_types[type].internal_name;
}
int fdd_get_from_internal_name(char *s)
@@ -221,7 +242,7 @@ int fdd_get_from_internal_name(char *s)
while (strlen(drive_types[c].internal_name))
{
if (!strcmp(drive_types[c].internal_name, s))
if (!strcmp((char *)drive_types[c].internal_name, s))
return c;
c++;
}
@@ -433,6 +454,9 @@ void fdd_load(int drive, wchar_t *fn)
int c = 0, size;
wchar_t *p;
FILE *f;
pclog("FDD: loading drive %d with '%ls'\n", drive, fn);
if (!fn) return;
p = plat_get_extension(fn);
if (!p) return;
@@ -447,7 +471,7 @@ void fdd_load(int drive, wchar_t *fn)
{
driveloaders[drive] = c;
memcpy(floppyfns[drive], fn, (wcslen(fn) << 1) + 2);
d86f_initialize_linked_lists(drive);
d86f_setup(drive);
loaders[c].load(drive, floppyfns[drive]);
drive_empty[drive] = 0;
fdd_forced_seek(drive, 0);
@@ -456,7 +480,7 @@ void fdd_load(int drive, wchar_t *fn)
}
c++;
}
pclog("Couldn't load %ls %s\n",fn,p);
pclog("FDD: could not load '%ls' %s\n",fn,p);
drive_empty[drive] = 1;
fdd_set_head(drive, 0);
memset(floppyfns[drive], 0, sizeof(floppyfns[drive]));
@@ -465,12 +489,13 @@ void fdd_load(int drive, wchar_t *fn)
void fdd_close(int drive)
{
pclog("FDD: closing drive %d\n", drive);
if (loaders[driveloaders[drive]].close) loaders[driveloaders[drive]].close(drive);
drive_empty[drive] = 1;
fdd_set_head(drive, 0);
floppyfns[drive][0] = 0;
d86f_destroy_linked_lists(drive, 0);
d86f_destroy_linked_lists(drive, 1);
d86f_destroy(drive);
drives[drive].hole = NULL;
drives[drive].poll = NULL;
drives[drive].seek = NULL;
@@ -526,18 +551,7 @@ double fdd_real_period(int drive)
return (32.0 * dusec);
}
#if defined(DEV_BRANCH) && defined(USE_MRTHOR)
if (romset == ROM_MRTHOR)
{
return (ddbp * dusec) / 4.0;
}
else
{
return (ddbp * dusec);
}
#else
return (ddbp * dusec);
#endif
}
void fdd_poll(int drive)
@@ -705,6 +719,7 @@ void fdd_init(void)
d86f_init();
td0_init();
imd_init();
json_init();
fdd_load(0, floppyfns[0]);
fdd_load(1, floppyfns[1]);