empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minimal changes to ensure compilation in Linux / gcc.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2017-05-16 09:02:48 +01:00
parent ba6a38d325
commit 26f4532cb8
26 changed files with 82 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/CPU.cpp
View file

@ -86,7 +86,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "CPU.h"
#include "Frame.h"
#include "Memory.h"
@ -99,8 +99,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "NTSC.h"
#include "z80emu.h"
#include "Z80VICE\z80.h"
#include "Z80VICE\z80mem.h"
#include "Z80VICE/z80.h"
#include "Z80VICE/z80mem.h"
#include "YamlHelper.h"
@ -195,9 +195,9 @@ void SetActiveCpu(eCpuType cpu)
//
#include "cpu/cpu_general.inl"
#include "CPU/cpu_general.inl"
#include "cpu/cpu_instructions.inl"
#include "CPU/cpu_instructions.inl"
// Break into debugger on invalid opcodes
//#define INV IsDebugBreakOnInvalid(AM_1);
@ -429,9 +429,9 @@ static __forceinline void CheckInterruptSources(ULONG uExecutedCycles)
//===========================================================================
#include "cpu/cpu6502.h" // MOS 6502
#include "cpu/cpu65C02.h" // WDC 65C02
#include "cpu/cpu65d02.h" // Debug CPU Memory Visualizer
#include "CPU/cpu6502.h" // MOS 6502
#include "CPU/cpu65C02.h" // WDC 65C02
#include "CPU/cpu65d02.h" // Debug CPU Memory Visualizer
//===========================================================================

2
source/CPU/cpu65d02.h
View file

@ -91,7 +91,7 @@ inline u8 ReadByte( u16 addr, int uExecutedCycles )
IOWrite[(addr>>4) & 0xFF](regs.pc,addr,1,(BYTE)(a),uExecutedCycles); \
}
#include "cpu/cpu_instructions.inl"
#include "CPU/cpu_instructions.inl"
//===========================================================================

2
source/CommonVICE/alarm.h
View file

@ -28,7 +28,7 @@
#ifndef _ALARM_H
#define _ALARM_H
#include "..\CommonVICE\types.h"
#include "CommonVICE/types.h"
#define ALARM_CONTEXT_MAX_PENDING_ALARMS 0x100

2
source/CommonVICE/interrupt.h
View file

@ -31,7 +31,7 @@
#include <stdio.h>
#include "..\CommonVICE\types.h"
#include "CommonVICE/types.h"
/* Define the number of cycles needed by the CPU to detect the NMI or IRQ. */
#define INTERRUPT_DELAY 2

2
source/CommonVICE/mem.h
View file

@ -29,7 +29,7 @@
#ifndef _MEM_H_
#define _MEM_H_
#include "..\CommonVICE\types.h"
#include "CommonVICE/types.h"
typedef BYTE REGPARM1 read_func_t(WORD addr);
typedef read_func_t *read_func_ptr_t;

8
source/Configuration/Config.h
View file

@ -1,9 +1,9 @@
#pragma once
#include "..\AppleWin.h"
#include "..\CPU.h"
#include "..\Disk.h" // BOOL enhancedisk
#include "..\HardDisk.h" // HD_CardIsEnabled()
#include "Applewin.h"
#include "CPU.h"
#include "Disk.h" // BOOL enhancedisk
#include "Harddisk.h" // HD_CardIsEnabled()
class CConfigNeedingRestart
{

2
source/Configuration/PageConfigTfe.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "IPropertySheetPage.h"
#include "..\Tfe\Uilib.h"
#include "Tfe/Uilib.h"
class CPageConfigTfe : private IPropertySheetPage
{

2
source/Configuration/PageInput.h
View file

@ -2,7 +2,7 @@
#include "IPropertySheetPage.h"
#include "PropertySheetDefs.h"
#include "..\Joystick.h"
#include "Joystick.h"
class CPropertySheetHelper;
class CConfigNeedingRestart;

10
source/Disk.cpp
View file

@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "SaveState_Structs_v1.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "Disk.h"
#include "DiskImage.h"
#include "Frame.h"
@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Video.h"
#include "YamlHelper.h"
#include "..\resource\resource.h"
#include "../resource/resource.h"
#define LOG_DISK_ENABLED 0
#define LOG_DISK_TRACKS 1
@ -144,7 +144,7 @@ const char* DiskGetDiskPathFilename(const int iDrive)
return g_aFloppyDisk[iDrive].fullname;
}
char* DiskGetCurrentState(void)
const char* DiskGetCurrentState(void)
{
if (g_aFloppyDisk[currdrive].imagehandle == NULL)
return "Empty";
@ -186,7 +186,7 @@ void Disk_LoadLastDiskImage(const int iDrive)
char sFilePath[ MAX_PATH + 1];
sFilePath[0] = 0;
char *pRegKey = (iDrive == DRIVE_1)
const char *pRegKey = (iDrive == DRIVE_1)
? REGVALUE_PREF_LAST_DISK_1
: REGVALUE_PREF_LAST_DISK_2;
@ -1333,7 +1333,7 @@ static void DiskLoadSnapshotDriveUnit(YamlLoadHelper& yamlLoadHelper, UINT unit)
g_aFloppyDisk[unit].trackimagedata = yamlLoadHelper.LoadUint(SS_YAML_KEY_TRACK_IMAGE_DATA);
g_aFloppyDisk[unit].trackimagedirty = yamlLoadHelper.LoadUint(SS_YAML_KEY_TRACK_IMAGE_DIRTY);
std::auto_ptr<BYTE> pTrack( new BYTE [NIBBLES_PER_TRACK] );
std::shared_ptr<BYTE> pTrack( new BYTE [NIBBLES_PER_TRACK] );
memset(pTrack.get(), 0, NIBBLES_PER_TRACK);
if (yamlLoadHelper.GetSubMap(SS_YAML_KEY_TRACK_IMAGE))
{

2
source/Disk.h
View file

@ -65,7 +65,7 @@ int DiskGetCurrentTrack();
int DiskGetTrack( int drive );
int DiskGetCurrentPhase();
int DiskGetCurrentOffset();
char* DiskGetCurrentState();
const char* DiskGetCurrentState();
bool DiskSelect(const int iDrive);
void DiskUpdatePosition(DWORD);
bool DiskDriveSwap(void);

2
source/DiskImage.cpp
View file

@ -236,7 +236,7 @@ bool ImageIsMultiFileZip(ImageInfo* const pImageInfo)
const char* ImageGetPathname(ImageInfo* const pImageInfo)
{
static char* szEmpty = "";
static const char* szEmpty = "";
return pImageInfo ? pImageInfo->szFilename : szEmpty;
}

42
source/DiskImageHelper.cpp
View file

@ -27,12 +27,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "stdafx.h"
#include "StdAfx.h"
#include "Common.h"
#include "zlib.h"
#include "unzip.h"
#include "iowin32.h"
#include "minizip/unzip.h"
#include "CPU.h"
#include "Disk.h"
@ -633,8 +632,8 @@ public:
virtual UINT GetImageSizeForCreate(void) { return TRACK_DENIBBLIZED_SIZE * TRACKS_STANDARD; }
virtual eImageType GetType(void) { return eImageDO; }
virtual char* GetCreateExtensions(void) { return ".do;.dsk"; }
virtual char* GetRejectExtensions(void) { return ".nib;.iie;.po;.prg"; }
virtual const char* GetCreateExtensions(void) { return ".do;.dsk"; }
virtual const char* GetRejectExtensions(void) { return ".nib;.iie;.po;.prg"; }
};
//-------------------------------------
@ -697,8 +696,8 @@ public:
}
virtual eImageType GetType(void) { return eImagePO; }
virtual char* GetCreateExtensions(void) { return ".po"; }
virtual char* GetRejectExtensions(void) { return ".do;.iie;.nib;.prg"; }
virtual const char* GetCreateExtensions(void) { return ".po"; }
virtual const char* GetRejectExtensions(void) { return ".do;.iie;.nib;.prg"; }
};
//-------------------------------------
@ -737,8 +736,8 @@ public:
virtual UINT GetImageSizeForCreate(void) { return NIB1_TRACK_SIZE * TRACKS_STANDARD; }
virtual eImageType GetType(void) { return eImageNIB1; }
virtual char* GetCreateExtensions(void) { return ".nib"; }
virtual char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg"; }
virtual const char* GetCreateExtensions(void) { return ".nib"; }
virtual const char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg"; }
};
//-------------------------------------
@ -774,8 +773,8 @@ public:
}
virtual eImageType GetType(void) { return eImageNIB2; }
virtual char* GetCreateExtensions(void) { return ".nb2"; }
virtual char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg;.2mg;.2img"; }
virtual const char* GetCreateExtensions(void) { return ".nb2"; }
virtual const char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg;.2mg;.2img"; }
};
//-------------------------------------
@ -815,8 +814,8 @@ public:
}
virtual eImageType GetType(void) { return eImageHDV; }
virtual char* GetCreateExtensions(void) { return ".hdv"; }
virtual char* GetRejectExtensions(void) { return ".do;.iie;.prg"; }
virtual const char* GetCreateExtensions(void) { return ".hdv"; }
virtual const char* GetRejectExtensions(void) { return ".do;.iie;.prg"; }
};
//-------------------------------------
@ -884,8 +883,8 @@ public:
}
virtual eImageType GetType(void) { return eImageIIE; }
virtual char* GetCreateExtensions(void) { return ".iie"; }
virtual char* GetRejectExtensions(void) { return ".do.;.nib;.po;.prg;.2mg;.2img"; }
virtual const char* GetCreateExtensions(void) { return ".iie"; }
virtual const char* GetRejectExtensions(void) { return ".do.;.nib;.po;.prg;.2mg;.2img"; }
private:
void ConvertSectorOrder(LPBYTE sourceorder)
@ -958,8 +957,8 @@ public:
virtual bool AllowRW(void) { return false; }
virtual eImageType GetType(void) { return eImageAPL; }
virtual char* GetCreateExtensions(void) { return ".apl"; }
virtual char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; }
virtual const char* GetCreateExtensions(void) { return ".apl"; }
virtual const char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; }
};
//-------------------------------------
@ -1009,8 +1008,8 @@ public:
virtual bool AllowRW(void) { return false; }
virtual eImageType GetType(void) { return eImagePRG; }
virtual char* GetCreateExtensions(void) { return ".prg"; }
virtual char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; }
virtual const char* GetCreateExtensions(void) { return ".prg"; }
virtual const char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; }
};
//-----------------------------------------------------------------------------
@ -1194,10 +1193,7 @@ ImageError_e CImageHelperBase::CheckGZipFile(LPCTSTR pszImageFilename, ImageInfo
ImageError_e CImageHelperBase::CheckZipFile(LPCTSTR pszImageFilename, ImageInfo* pImageInfo, std::string& strFilenameInZip)
{
zlib_filefunc_def ffunc;
fill_win32_filefunc(&ffunc); // TODO: Ditch this and use unzOpen() instead?
unzFile hZipFile = unzOpen2(pszImageFilename, &ffunc);
unzFile hZipFile = unzOpen(pszImageFilename);
if (hZipFile == NULL)
return eIMAGE_ERROR_UNABLE_TO_OPEN_ZIP;

6
source/DiskImageHelper.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "zip.h"
#include "minizip/zip.h"
#define GZ_SUFFIX ".gz"
#define GZ_SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
@ -64,8 +64,8 @@ public:
virtual UINT GetImageSizeForCreate(void) { _ASSERT(0); return (UINT)-1; }
virtual eImageType GetType(void) = 0;
virtual char* GetCreateExtensions(void) = 0;
virtual char* GetRejectExtensions(void) = 0;
virtual const char* GetCreateExtensions(void) = 0;
virtual const char* GetRejectExtensions(void) = 0;
void SetVolumeNumber(const BYTE uVolumeNumber) { m_uVolumeNumber = uVolumeNumber; }
bool IsValidImageSize(const DWORD uImageSize);

10
source/Harddisk.cpp
View file

@ -28,16 +28,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "DiskImage.h" // ImageError_e, Disk_Status_e
#include "DiskImageHelper.h"
#include "Frame.h"
#include "HardDisk.h"
#include "Harddisk.h"
#include "Memory.h"
#include "Registry.h"
#include "YamlHelper.h"
#include "..\resource\resource.h"
#include "../resource/resource.h"
/*
Memory map:
@ -187,7 +187,7 @@ void HD_LoadLastDiskImage(const int iDrive)
char sFilePath[ MAX_PATH + 1];
sFilePath[0] = 0;
char *pRegKey = (iDrive == HARDDISK_1)
const char *pRegKey = (iDrive == HARDDISK_1)
? REGVALUE_PREF_LAST_HARDDISK_1
: REGVALUE_PREF_LAST_HARDDISK_2;
@ -331,7 +331,7 @@ void HD_Destroy(void)
}
// pszImageFilename is qualified with path
static BOOL HD_Insert(const int iDrive, LPCTSTR pszImageFilename)
BOOL HD_Insert(const int iDrive, LPCTSTR pszImageFilename)
{
if (*pszImageFilename == 0x00)
return FALSE;

12
source/Memory.cpp
View file

@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "CPU.h"
#include "Disk.h"
#include "Frame.h"
@ -51,10 +51,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Video.h"
#include "z80emu.h"
#include "Z80VICE\z80.h"
#include "..\resource\resource.h"
#include "Configuration\PropertySheet.h"
#include "Debugger\DebugDefs.h"
#include "Z80VICE/z80.h"
#include "../resource/resource.h"
#include "Configuration/IPropertySheet.h"
#include "Debugger/DebugDefs.h"
#include "YamlHelper.h"
#define SW_80STORE (memmode & MF_80STORE)
@ -1239,6 +1239,8 @@ void MemInitialize()
g_pAppTitle,
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
memimage = (LPBYTE)newloc;
#ifdef RAMWORKS
// allocate memory for RAMWorks III - up to 8MB
g_uActiveBank = 0;

6
source/ParallelPrinter.cpp
View file

@ -28,13 +28,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "Memory.h"
#include "ParallelPrinter.h"
#include "Registry.h"
#include "YamlHelper.h"
#include "..\resource\resource.h"
#include "../resource/resource.h"
static DWORD inactivity = 0;
static unsigned int g_PrinterIdleLimit = 10;
@ -169,7 +169,7 @@ static BYTE __stdcall PrintTransmit(WORD, WORD, BYTE, BYTE value, ULONG)
return 0;
}
char c = NULL;
char c = 0;
if ((g_Apple2Type == A2TYPE_PRAVETS8A) && g_bConvertEncoding) //This is print conversion for Pravets 8A/C. Print conversion for Pravets82/M is still to be done.
{
if ((value > 90) && (value < 128)) //This range shall be set more precisely

2
source/Pravets.cpp
View file

@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "Frame.h"
#include "Keyboard.h"
#include "Tape.h"

2
source/SAM.cpp
View file

@ -32,7 +32,7 @@
*/
#include "StdAfx.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "Memory.h"
#include "SAM.h"
#include "Speaker.h"

2
source/Tape.cpp
View file

@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "Keyboard.h"
#include "Memory.h"
#include "Pravets.h"

2
source/Z80VICE/daa.cpp
View file

@ -25,7 +25,7 @@
*/
#include "daa.h"
#include "..\CommonVICE\types.h" // [AppleWin-TC]
#include "CommonVICE/types.h" // [AppleWin-TC]
const BYTE daa_reg_a[2048] = {

2
source/Z80VICE/daa.h
View file

@ -27,7 +27,7 @@
#ifndef _DAA_H
#define _DAA_H
#include "..\CommonVICE\types.h" // [AppleWin-TC]
#include "CommonVICE/types.h" // [AppleWin-TC]
extern const BYTE daa_reg_a[];
extern const BYTE daa_reg_f[];

20
source/Z80VICE/z80.cpp
View file

@ -24,12 +24,12 @@
*
*/
#include "..\StdAfx.h"
#include "StdAfx.h"
#include "..\AppleWin.h"
#include "..\CPU.h"
#include "..\Memory.h"
#include "..\YamlHelper.h"
#include "Applewin.h"
#include "CPU.h"
#include "Memory.h"
#include "YamlHelper.h"
#undef IN // Defined in windef.h
@ -39,15 +39,15 @@
#include <stdlib.h>
#include "..\CommonVICE\6510core.h" // [AppleWin-TC]
#include "..\CommonVICE\alarm.h"
#include "CommonVICE/6510core.h" // [AppleWin-TC]
#include "CommonVICE/alarm.h"
#include "daa.h"
//#include "debug.h" // [AppleWin-TC]
#include "..\CommonVICE\interrupt.h"
#include "CommonVICE/interrupt.h"
//#include "log.h" // [AppleWin-TC]
//#include "maincpu.h" // [AppleWin-TC]
//#include "monitor.h" // [AppleWin-TC]
#include "..\CommonVICE\types.h"
#include "CommonVICE/types.h"
#include "z80.h"
#include "z80mem.h"
#include "z80regs.h"
@ -55,7 +55,7 @@
/*#define DEBUG_Z80*/
static CLOCK maincpu_clk = 0; // [AppleWin-TC]
CLOCK maincpu_clk = 0; // [AppleWin-TC]
static BYTE reg_a = 0;
static BYTE reg_b = 0;

2
source/Z80VICE/z80mem.cpp
View file

@ -44,7 +44,7 @@
//#include "vdc.h"
//#include "vicii-mem.h"
//#include "vicii.h"
#include "..\CommonVICE\types.h" // [AppleWin-TC]
#include "CommonVICE/types.h" // [AppleWin-TC]
#include "z80mem.h"
#include "z80.h" // [AppleWin-TC] Added for z80_RDMEM() & z80_WRMEM

4
source/Z80VICE/z80mem.h
View file

@ -30,10 +30,10 @@
#ifdef WATCOM_COMPILE
#include "../mem.h"
#else
#include "..\CommonVICE\mem.h" // [AppleWin-TC]
#include "CommonVICE/mem.h" // [AppleWin-TC]
#endif
#include "..\CommonVICE\types.h" // [AppleWin-TC]
#include "CommonVICE/types.h" // [AppleWin-TC]
extern int z80mem_resources_init(void);
extern int z80mem_cmdline_options_init(void);

2
source/Z80VICE/z80regs.h
View file

@ -27,7 +27,7 @@
#ifndef _Z80REGS_H
#define _Z80REGS_H
#include "..\CommonVICE\types.h" // [AppleWin-TC]
#include "CommonVICE/types.h" // [AppleWin-TC]
typedef struct z80_regs_s {
WORD reg_af;

2
source/z80emu.cpp
View file

@ -15,7 +15,7 @@
#include "StdAfx.h"
#include "AppleWin.h"
#include "Applewin.h"
#include "CPU.h"
#include "Memory.h"
#include "z80emu.h"