claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanups, some fixes, moved zip.ch into the disk/ folder.

Browse Source
This commit is contained in:
waltje
2018-02-25 02:32:19 -05:00
parent 2da54a4ca0
commit 9f4c8423d6
15 changed files with 608 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.c
View File

@@ -12,7 +12,7 @@
* it on Windows XP, and possibly also Vista. Use the * it on Windows XP, and possibly also Vista. Use the
* -DANSI_CFG for use on these systems. * -DANSI_CFG for use on these systems.
* *
* Version: @(#)config.c 1.0.1 2018/02/14 * Version: @(#)config.c 1.0.2 2018/02/24
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -54,10 +54,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.1 2018/02/14 * Version: @(#)hdc_ide.c 1.0.2 2018/02/24
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk> * Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -55,12 +55,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' */

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

@@ -9,9 +9,10 @@
* 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.1 2018/02/14 * Version: @(#)zip.c 1.0.2 2018/02/24
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
* *
* Copyright 2016-2018 Miran Grca. * Copyright 2016-2018 Miran Grca.
* *
@@ -40,17 +41,17 @@
#include <stdarg.h> #include <stdarg.h>
#include <wchar.h> #include <wchar.h>
#define HAVE_STDARG_H #define HAVE_STDARG_H
#include "emu.h" #include "../emu.h"
#include "config.h" #include "../config.h"
#include "timer.h" #include "../timer.h"
#include "device.h" #include "../device.h"
#include "intel_piix.h" #include "../intel_piix.h"
#include "scsi/scsi.h" #include "../scsi/scsi.h"
#include "nvr.h" #include "../nvr.h"
#include "disk/hdc.h" #include "../disk/hdc.h"
#include "disk/hdc_ide.h" #include "../disk/hdc_ide.h"
#include "plat.h" #include "../plat.h"
#include "ui.h" #include "../ui.h"
#include "zip.h" #include "zip.h"

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

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.1 2018/02/14 * Version: @(#)pc.c 1.0.2 2018/02/24
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -74,10 +74,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"

6
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.1 2018/02/14 * Version: @(#)scsi.c 1.0.2 2018/02/24
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -45,9 +45,9 @@
#include "../rom.h" #include "../rom.h"
#include "../timer.h" #include "../timer.h"
#include "../device.h" #include "../device.h"
#include "../cdrom/cdrom.h"
#include "../zip.h"
#include "../disk/hdc.h" #include "../disk/hdc.h"
#include "../disk/zip.h"
#include "../cdrom/cdrom.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.1 2018/02/14 * Version: @(#)scsi_device.c 1.0.2 2018/02/24
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -41,8 +41,8 @@
#include "../emu.h" #include "../emu.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"

13
src/sound/midi_fluidsynth.c
View File

@@ -8,6 +8,15 @@
* *
* Interface to FluidSynth MIDI. * Interface to FluidSynth MIDI.
* *
* Note that on Windows, the fluidsynth DLL is not normally
* installed, and it can be a pain to find it. Many people
* have reported that the files offered on the:
*
* https://zdoom.org/wiki/FluidSynth
*
* website (for 32bit and 64bit Windows) are working, and
* need no additional support files other than sound fonts.
*
* Version: @(#)midi_fluidsynth.c 1.0.2 2018/02/24 * Version: @(#)midi_fluidsynth.c 1.0.2 2018/02/24
* *
* Code borrowed from scummvm. * Code borrowed from scummvm.
@@ -144,7 +153,7 @@ fluidsynth_t fsdev;
static int static int
fluidsynth_available(void) fluidsynth_available(void)
{ {
return(1); return((fluidsynth_handle != NULL)?1:0);
} }
@@ -356,7 +365,7 @@ fluidsynth_init(device_t *info)
al_set_midi(data->samplerate, data->buf_size); al_set_midi(data->samplerate, data->buf_size);
#if 0 #if 1
pclog("fluidsynth (%s) initialized, samplerate %d, buf_size %d\n", f_fluid_version_str(), data->samplerate, data->buf_size); pclog("fluidsynth (%s) initialized, samplerate %d, buf_size %d\n", f_fluid_version_str(), data->samplerate, data->buf_size);
#endif #endif

2
src/win/Makefile.mingw
View File

@@ -221,7 +221,7 @@ ifneq ($(CROSS), n)
endif endif
WINDRES := /usr/bin/$(MINGW)-windres WINDRES := /usr/bin/$(MINGW)-windres
SYSINC := -I/usr/$(MINGW)/include -I../mingw/include SYSINC := -I/usr/$(MINGW)/include -I../support/mingw/include
SYSLIB := -L/usr/$(MINGW)/lib SYSLIB := -L/usr/$(MINGW)/lib
else else
# Native compilation using MinGW for Windows. # Native compilation using MinGW for Windows.

6
src/win/win_cdrom.c
View File

@@ -8,7 +8,7 @@
* *
* Handle the platform-side of CDROM drives. * Handle the platform-side of CDROM drives.
* *
* Version: @(#)win_cdrom.c 1.0.2 2018/02/21 * Version: @(#)win_cdrom.c 1.0.3 2018/02/24
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -43,11 +43,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <wchar.h> #include <wchar.h>
#include "../config.h" #include "../config.h"
#include "../disk/hdd.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 "../disk/hdd.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"

13
src/win/win_crashdump.c
View File

@@ -8,7 +8,7 @@
* *
* Handle generation of crash-dump reports. * Handle generation of crash-dump reports.
* *
* Version: @(#)win_crashdump.c 1.0.2 2018/02/21 * Version: @(#)win_crashdump.c 1.0.3 2018/02/24
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Riley (Rain-chan), * Riley (Rain-chan),
@@ -60,6 +60,7 @@ MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo)
SYSTEMTIME SystemTime; SYSTEMTIME SystemTime;
HANDLE hDumpFile; HANDLE hDumpFile;
char *BufPtr; char *BufPtr;
int i;
/* /*
* Win32-specific functions will be used wherever possible, * Win32-specific functions will be used wherever possible,
@@ -150,21 +151,21 @@ MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo)
HMODULE hMods[1024]; HMODULE hMods[1024];
MODULEINFO modInfo; MODULEINFO modInfo;
HMODULE ipModule = 0; HMODULE ipModule = 0;
DWORD cbNeeded; DWORD cbNeeded, w;
/* Try to get a list of all loaded modules. */ /* Try to get a list of all loaded modules. */
if (EnumProcessModules(GetCurrentProcess(), if (EnumProcessModules(GetCurrentProcess(),
hMods, sizeof(hMods), &cbNeeded)) { hMods, sizeof(hMods), &cbNeeded)) {
/* Got it, now walk through all modules.. */ /* Got it, now walk through all modules.. */
for (DWORD i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) { for (w=0; w<(cbNeeded / sizeof(HMODULE)); w++) {
/* For each module, get the module information. */ /* For each module, get the module information. */
GetModuleInformation(GetCurrentProcess(), GetModuleInformation(GetCurrentProcess(),
hMods[i], &modInfo, sizeof(MODULEINFO)); hMods[w], &modInfo, sizeof(MODULEINFO));
/* If the exception address is in the range of this module.. */ /* If the exception address is in the range of this module.. */
if ( ((char *)ExceptionInfo->ExceptionRecord->ExceptionAddress >= (char *)modInfo.lpBaseOfDll) && if ( ((char *)ExceptionInfo->ExceptionRecord->ExceptionAddress >= (char *)modInfo.lpBaseOfDll) &&
((char *)ExceptionInfo->ExceptionRecord->ExceptionAddress < ((char *)modInfo.lpBaseOfDll + modInfo.SizeOfImage))) { ((char *)ExceptionInfo->ExceptionRecord->ExceptionAddress < ((char *)modInfo.lpBaseOfDll + modInfo.SizeOfImage))) {
/* ...this is the module we're looking for! */ /* ...this is the module we're looking for! */
ipModule = hMods[i]; ipModule = hMods[w];
break; break;
} }
} }
@@ -204,7 +205,7 @@ MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo)
"\r\nNumber of parameters: %lu\r\nException parameters: ", "\r\nNumber of parameters: %lu\r\nException parameters: ",
ExceptionInfo->ExceptionRecord->NumberParameters); ExceptionInfo->ExceptionRecord->NumberParameters);
for (int i = 0; i < ExceptionInfo->ExceptionRecord->NumberParameters; i++) { for (i=0; i<ExceptionInfo->ExceptionRecord->NumberParameters; i++) {
BufPtr = &ExceptionHandlerBuffer[strlen(ExceptionHandlerBuffer)]; BufPtr = &ExceptionHandlerBuffer[strlen(ExceptionHandlerBuffer)];
sprintf(BufPtr,"0x%p ", sprintf(BufPtr,"0x%p ",
(void *)ExceptionInfo->ExceptionRecord->ExceptionInformation[i]); (void *)ExceptionInfo->ExceptionRecord->ExceptionInformation[i]);

1019
src/win/win_devconf.c
View File

File diff suppressed because it is too large Load Diff

4
src/win/win_new_floppy.c
View File

@@ -8,7 +8,7 @@
* *
* Implementation of the New Floppy Image dialog. * Implementation of the New Floppy Image dialog.
* *
* Version: @(#)win_new_floppy.c 1.0.2 2018/02/21 * Version: @(#)win_new_floppy.c 1.0.3 2018/02/24
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -47,7 +47,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"

6
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
* *
* Implementation of the Settings dialog. * Implementation of the Settings dialog.
* *
* Version: @(#)win_settings.c 1.0.3 2018/02/22 * Version: @(#)win_settings.c 1.0.4 2018/02/24
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -54,11 +54,11 @@
#include "../game/gameport.h" #include "../game/gameport.h"
#include "../lpt.h" #include "../lpt.h"
#include "../mouse.h" #include "../mouse.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 "../cdrom/cdrom.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"

8
src/win/win_stbar.c
View File

@@ -49,13 +49,13 @@
#include "../cpu/cpu.h" #include "../cpu/cpu.h"
#include "../device.h" #include "../device.h"
#include "../machine/machine.h" #include "../machine/machine.h"
#include "../floppy/fdd.h"
#include "../disk/hdd.h"
#include "../disk/hdc.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 "../disk/hdd.h"
#include "../disk/hdc.h"
#include "../floppy/fdd.h"
#include "../scsi/scsi.h" #include "../scsi/scsi.h"
#include "../scsi/scsi_disk.h" #include "../scsi/scsi_disk.h"
#include "../network/network.h" #include "../network/network.h"