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

Fixed a mistake in floppy/fdd.c;

Browse Source 
Fixed some undeclared variables in floppy/fdd_imd.c;
Moved zip.c/h to disk subfolder;
Fixed the warnings in video/vid_t1000.c.
This commit is contained in:
OBattler
2018-03-06 01:14:38 +01:00
parent 9356ae8bed
commit 22536d8d03
14 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.c
View File

@@ -8,7 +8,7 @@
* *
* Configuration file handler. * Configuration file handler.
* *
* Version: @(#)config.c 1.0.42 2018/02/10 * Version: @(#)config.c 1.0.43 2018/03/06
* *
* Authors: Sarah Walker, * Authors: Sarah Walker,
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -36,10 +36,10 @@
#include "device.h" #include "device.h"
#include "lpt.h" #include "lpt.h"
#include "cdrom/cdrom.h" #include "cdrom/cdrom.h"
#include "zip.h"
#include "disk/hdd.h" #include "disk/hdd.h"
#include "disk/hdc.h" #include "disk/hdc.h"
#include "disk/hdc_ide.h" #include "disk/hdc_ide.h"
#include "disk/zip.h"
#include "floppy/fdd.h" #include "floppy/fdd.h"
#include "floppy/fdc.h" #include "floppy/fdc.h"
#include "game/gameport.h" #include "game/gameport.h"

4
src/disk/hdc_ide.c
View File

@@ -9,7 +9,7 @@
* Implementation of the IDE emulation for hard disks and ATAPI * Implementation of the IDE emulation for hard disks and ATAPI
* CD-ROM devices. * CD-ROM devices.
* *
* Version: @(#)hdc_ide.c 1.0.30 2018/03/02 * Version: @(#)hdc_ide.c 1.0.31 2018/03/06
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -37,12 +37,12 @@
#include "../device.h" #include "../device.h"
#include "../cdrom/cdrom.h" #include "../cdrom/cdrom.h"
#include "../scsi/scsi.h" #include "../scsi/scsi.h"
#include "../zip.h"
#include "../plat.h" #include "../plat.h"
#include "../ui.h" #include "../ui.h"
#include "hdc.h" #include "hdc.h"
#include "hdc_ide.h" #include "hdc_ide.h"
#include "hdd.h" #include "hdd.h"
#include "zip.h"
/* Bits of 'atastat' */ /* Bits of 'atastat' */

24
src/zip.c → src/disk/zip.c
View File

@@ -9,7 +9,7 @@
* Implementation of the Iomega ZIP drive with SCSI(-like) * Implementation of the Iomega ZIP drive with SCSI(-like)
* commands, for both ATAPI and SCSI usage. * commands, for both ATAPI and SCSI usage.
* *
* Version: @(#)zip.c 1.0.6 2018/02/27 * Version: @(#)zip.c 1.0.7 2018/03/06
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* *
@@ -22,17 +22,17 @@
#include <stdarg.h> #include <stdarg.h>
#include <wchar.h> #include <wchar.h>
#define HAVE_STDARG_H #define HAVE_STDARG_H
#include "86box.h" #include "../86box.h"
#include "config.h" #include "../config.h"
#include "timer.h" #include "../timer.h"
#include "device.h" #include "../device.h"
#include "piix.h" #include "../piix.h"
#include "scsi/scsi.h" #include "../scsi/scsi.h"
#include "nvr.h" #include "../nvr.h"
#include "disk/hdc.h" #include "../plat.h"
#include "disk/hdc_ide.h" #include "../ui.h"
#include "plat.h" #include "hdc.h"
#include "ui.h" #include "hdc_ide.h"
#include "zip.h" #include "zip.h"

0
src/zip.h → src/disk/zip.h
View File

6
src/floppy/fdd.c
View File

@@ -8,7 +8,7 @@
* *
* Implementation of the floppy drive emulation. * Implementation of the floppy drive emulation.
* *
* Version: @(#)fdd.c 1.0.7 2018/01/18 * Version: @(#)fdd.c 1.0.8 2018/03/06
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -523,6 +523,7 @@ double fdd_real_period(int drive)
return (32.0 * dusec); return (32.0 * dusec);
} }
#if defined(DEV_BRANCH) && defined(USE_MRTHOR)
if (romset == ROM_MRTHOR) if (romset == ROM_MRTHOR)
{ {
return (ddbp * dusec) / 4.0; return (ddbp * dusec) / 4.0;
@@ -531,6 +532,9 @@ double fdd_real_period(int drive)
{ {
return (ddbp * dusec); return (ddbp * dusec);
} }
#else
return (ddbp * dusec);
#endif
} }
void fdd_poll(int drive) void fdd_poll(int drive)

6
src/floppy/fdd_imd.c
View File

@@ -8,7 +8,7 @@
* *
* Implementation of the IMD floppy image format. * Implementation of the IMD floppy image format.
* *
* Version: @(#)fdd_imd.c 1.0.6 2018/01/16 * Version: @(#)fdd_imd.c 1.0.7 2018/03/06
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* Copyright 2016-2018 Miran Grca. * Copyright 2016-2018 Miran Grca.
@@ -691,7 +691,7 @@ void imd_set_sector(int drive, int side, uint8_t c, uint8_t h, uint8_t r, uint8_
int sc = 0; int sc = 0;
int sh = 0; int sh = 0;
int sn = 0; int sn = 0;
char *c_map, *h_map, *r_map, *n_map; char *c_map = 0, *h_map = 0, *r_map = 0, *n_map = 0;
uint8_t id[4] = { 0, 0, 0, 0 }; uint8_t id[4] = { 0, 0, 0, 0 };
sc = imd[drive].tracks[track][side].params[1]; sc = imd[drive].tracks[track][side].params[1];
sh = imd[drive].tracks[track][side].params[2]; sh = imd[drive].tracks[track][side].params[2];
@@ -734,7 +734,7 @@ void imd_writeback(int drive)
int i = 0; int i = 0;
char *n_map; char *n_map = 0;
uint8_t h, n, spt; uint8_t h, n, spt;
uint32_t ssize; uint32_t ssize;

4
src/pc.c
View File

@@ -8,7 +8,7 @@
* *
* Main emulator module where most things are controlled. * Main emulator module where most things are controlled.
* *
* Version: @(#)pc.c 1.0.61 2018/03/02 * Version: @(#)pc.c 1.0.62 2018/03/06
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -56,10 +56,10 @@
#include "disk/hdd.h" #include "disk/hdd.h"
#include "disk/hdc.h" #include "disk/hdc.h"
#include "disk/hdc_ide.h" #include "disk/hdc_ide.h"
#include "disk/zip.h"
#include "cdrom/cdrom.h" #include "cdrom/cdrom.h"
#include "cdrom/cdrom_image.h" #include "cdrom/cdrom_image.h"
#include "cdrom/cdrom_null.h" #include "cdrom/cdrom_null.h"
#include "zip.h"
#include "scsi/scsi.h" #include "scsi/scsi.h"
#include "network/network.h" #include "network/network.h"
#include "sound/sound.h" #include "sound/sound.h"

4
src/scsi/scsi.c
View File

@@ -8,7 +8,7 @@
* *
* Handling of the SCSI controllers. * Handling of the SCSI controllers.
* *
* Version: @(#)scsi.c 1.0.15 2018/02/18 * Version: @(#)scsi.c 1.0.16 2018/03/06
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
@@ -28,8 +28,8 @@
#include "../timer.h" #include "../timer.h"
#include "../device.h" #include "../device.h"
#include "../cdrom/cdrom.h" #include "../cdrom/cdrom.h"
#include "../zip.h"
#include "../disk/hdc.h" #include "../disk/hdc.h"
#include "../disk/zip.h"
#include "../plat.h" #include "../plat.h"
#include "scsi.h" #include "scsi.h"
#include "scsi_aha154x.h" #include "scsi_aha154x.h"

4
src/scsi/scsi_device.c
View File

@@ -8,7 +8,7 @@
* *
* The generic SCSI device command handler. * The generic SCSI device command handler.
* *
* Version: @(#)scsi_device.c 1.0.12 2018/02/17 * Version: @(#)scsi_device.c 1.0.13 2018/03/06
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
@@ -23,8 +23,8 @@
#include "../86box.h" #include "../86box.h"
#include "../device.h" #include "../device.h"
#include "../cdrom/cdrom.h" #include "../cdrom/cdrom.h"
#include "../zip.h"
#include "../disk/hdd.h" #include "../disk/hdd.h"
#include "../disk/zip.h"
#include "scsi.h" #include "scsi.h"
#include "scsi_disk.h" #include "scsi_disk.h"

2
src/video/vid_t1000.c
View File

@@ -366,7 +366,7 @@ static void t1000_cgaline4(t1000_t *t1000)
{ {
int x, c; int x, c;
uint8_t dat, pattern; uint8_t dat, pattern;
uint32_t ink0, ink1; uint32_t ink0 = 0, ink1 = 0;
uint16_t addr; uint16_t addr;
uint16_t ma = (t1000->cga.crtc[13] | (t1000->cga.crtc[12] << 8)) & 0x3fff; uint16_t ma = (t1000->cga.crtc[13] | (t1000->cga.crtc[12] << 8)) & 0x3fff;

8
src/win/win_cdrom.c
View File

@@ -8,14 +8,14 @@
* *
* Handle the platform-side of CDROM drives. * Handle the platform-side of CDROM drives.
* *
* Version: @(#)win_cdrom.c 1.0.4 2017/10/16 * Version: @(#)win_cdrom.c 1.0.5 2018/03/06
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* *
* Copyright 2016,2017 Miran Grca. * Copyright 2016-2018 Miran Grca.
* Copyright 2017 Fred N. van Kempen. * Copyright 2017,2018 Fred N. van Kempen.
*/ */
#define UNICODE #define UNICODE
#define BITMAP WINDOWS_BITMAP #define BITMAP WINDOWS_BITMAP
@@ -31,8 +31,8 @@
#include "../cdrom/cdrom.h" #include "../cdrom/cdrom.h"
#include "../cdrom/cdrom_image.h" #include "../cdrom/cdrom_image.h"
#include "../cdrom/cdrom_null.h" #include "../cdrom/cdrom_null.h"
#include "../zip.h"
#include "../disk/hdd.h" #include "../disk/hdd.h"
#include "../disk/zip.h"
#include "../scsi/scsi.h" #include "../scsi/scsi.h"
#include "../scsi/scsi_disk.h" #include "../scsi/scsi_disk.h"
#include "../plat.h" #include "../plat.h"

4
src/win/win_new_floppy.c
View File

@@ -8,7 +8,7 @@
* *
* Handle the New Floppy Image dialog. * Handle the New Floppy Image dialog.
* *
* Version: @(#)win_new_floppy.c 1.0.3 2018/03/05 * Version: @(#)win_new_floppy.c 1.0.4 2018/03/06
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* *
@@ -29,7 +29,7 @@
#include "../plat.h" #include "../plat.h"
#include "../random.h" #include "../random.h"
#include "../ui.h" #include "../ui.h"
#include "../zip.h" #include "../disk/zip.h"
#include "win.h" #include "win.h"

4
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
* *
* Windows 86Box Settings dialog handler. * Windows 86Box Settings dialog handler.
* *
* Version: @(#)win_settings.c 1.0.39 2018/02/18 * Version: @(#)win_settings.c 1.0.40 2018/03/06
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* *
@@ -37,10 +37,10 @@
#include "../lpt.h" #include "../lpt.h"
#include "../mouse.h" #include "../mouse.h"
#include "../cdrom/cdrom.h" #include "../cdrom/cdrom.h"
#include "../zip.h"
#include "../disk/hdd.h" #include "../disk/hdd.h"
#include "../disk/hdc.h" #include "../disk/hdc.h"
#include "../disk/hdc_ide.h" #include "../disk/hdc_ide.h"
#include "../disk/zip.h"
#include "../floppy/fdd.h" #include "../floppy/fdd.h"
#include "../scsi/scsi.h" #include "../scsi/scsi.h"
#include "../network/network.h" #include "../network/network.h"

4
src/win/win_stbar.c
View File

@@ -8,7 +8,7 @@
* *
* Implement the application's Status Bar. * Implement the application's Status Bar.
* *
* Version: @(#)win_stbar.c 1.0.14 2018/02/11 * Version: @(#)win_stbar.c 1.0.15 2018/03/06
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
@@ -36,9 +36,9 @@
#include "../cdrom/cdrom.h" #include "../cdrom/cdrom.h"
#include "../cdrom/cdrom_image.h" #include "../cdrom/cdrom_image.h"
#include "../cdrom/cdrom_null.h" #include "../cdrom/cdrom_null.h"
#include "../zip.h"
#include "../disk/hdd.h" #include "../disk/hdd.h"
#include "../disk/hdc.h" #include "../disk/hdc.h"
#include "../disk/zip.h"
#include "../floppy/fdd.h" #include "../floppy/fdd.h"
#include "../scsi/scsi.h" #include "../scsi/scsi.h"
#include "../scsi/scsi_disk.h" #include "../scsi/scsi_disk.h"