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

Another cleanup run.

Browse Source
This commit is contained in:
waltje
2017-10-17 01:59:09 -04:00
parent 483ebc17d7
commit 7f24ba9fe9
218 changed files with 642 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cdrom/cdrom_dosbox.cpp
View File

@@ -100,6 +100,7 @@ void CDROM_Interface_Image::InitNewMedia()
bool CDROM_Interface_Image::SetDevice(char* path, int forceCD)
{
(void)forceCD;
if (LoadCueSheet(path)) return true;
if (LoadIsoFile(path)) return true;
@@ -174,6 +175,7 @@ bool CDROM_Interface_Image::ReadSectors(PhysPt buffer, bool raw, unsigned long s
bool CDROM_Interface_Image::LoadUnloadMedia(bool unload)
{
(void)unload;
return true;
}

12
src/cdrom/cdrom_image.cc
View File

@@ -57,6 +57,8 @@ void cdrom_image_log(const char *format, ...)
va_end(ap);
fflush(stdout);
}
#else
(void)format;
#endif
}
@@ -211,7 +213,7 @@ static int image_ready(uint8_t id)
return 1;
}
static int image_get_last_block(uint8_t id, uint8_t starttrack, int msf, int maxlen, int single)
static int image_get_last_block(uint8_t id, UNUSED(uint8_t starttrack), UNUSED(int msf), UNUSED(int maxlen), UNUSED(int single))
{
int c;
uint32_t lb=0;
@@ -321,12 +323,12 @@ static uint8_t image_getcurrentsubchannel(uint8_t id, uint8_t *b, int msf)
return ret;
}
static void image_eject(uint8_t id)
static void image_eject(UNUSED(uint8_t id))
{
return;
}
static void image_load(uint8_t id)
static void image_load(UNUSED(uint8_t id))
{
return;
}
@@ -965,7 +967,7 @@ static int image_status(uint8_t id)
return CD_STATUS_DATA_ONLY;
}
void image_reset(uint8_t id)
void image_reset(UNUSED(uint8_t id))
{
return;
}
@@ -998,7 +1000,7 @@ int image_open(uint8_t id, wchar_t *fn)
swprintf(cdrom_image[id].image_path, sizeof(cdrom_image[id].image_path)/sizeof(wchar_t), L"%ls", fn);
}
if (! wcscasecmp(get_extension_w(fn), L"ISO"))
if (! wcscasecmp(plat_get_extension(fn), L"ISO"))
{
cdrom_image[id].image_is_iso = 1;
}

3
src/cdrom/cdrom_null.c
View File

@@ -9,7 +9,7 @@
* Implementation of the CD-ROM null interface for unmounted
* guest CD-ROM drives.
*
* Version: @(#)cdrom_null.c 1.0.4 2017/10/09
* Version: @(#)cdrom_null.c 1.0.5 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "cdrom.h"