Fix up some warnings and silly errors.
This commit is contained in:
@@ -67,6 +67,10 @@ enum {
|
|||||||
#define CDROM_BUS_MAX (CDROM_BUS_USB) /* USB exclusive */
|
#define CDROM_BUS_MAX (CDROM_BUS_USB) /* USB exclusive */
|
||||||
|
|
||||||
|
|
||||||
|
/* To shut up the GCC compilers. */
|
||||||
|
struct cdrom;
|
||||||
|
|
||||||
|
|
||||||
/* Define the various CD-ROM drive operations (ops). */
|
/* Define the various CD-ROM drive operations (ops). */
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int (*ready)(struct cdrom *dev);
|
int (*ready)(struct cdrom *dev);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
* CD-ROM image support.
|
* CD-ROM image support.
|
||||||
*
|
*
|
||||||
* Version: @(#)cdrom_image.cpp 1.0.11 2018/10/15
|
* Version: @(#)cdrom_image.cpp 1.0.12 2018/10/16
|
||||||
*
|
*
|
||||||
* 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>
|
||||||
@@ -60,7 +60,7 @@ int cdrom_image_do_log = ENABLE_CDROM_IMAGE_LOG;
|
|||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
cdrom_image_log(int level, const char *fmt, ...)
|
cdrom_image_log(UNUSED(int level), UNUSED(const char *fmt), ...)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_CDROM_IMAGE_LOG
|
#ifdef ENABLE_CDROM_IMAGE_LOG
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
* Definitions for the CD-ROM image file handlers.
|
* Definitions for the CD-ROM image file handlers.
|
||||||
*
|
*
|
||||||
* Version: @(#)cdrom_image.h 1.0.6 2018/10/14
|
* Version: @(#)cdrom_image.h 1.0.7 2018/10/16
|
||||||
*
|
*
|
||||||
* Authors: Miran Grca, <mgrca8@gmail.com>
|
* Authors: Miran Grca, <mgrca8@gmail.com>
|
||||||
* RichardG, <richardg867@gmail.com>
|
* RichardG, <richardg867@gmail.com>
|
||||||
@@ -43,7 +43,6 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern int cdrom_image_do_log;
|
extern int cdrom_image_do_log;
|
||||||
extern const cdrom_ops_t cdrom_image_ops;
|
|
||||||
|
|
||||||
|
|
||||||
extern void cdrom_image_log(int level, const char *fmt, ...);
|
extern void cdrom_image_log(int level, const char *fmt, ...);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
* Emulation of SCSI (and ATAPI) CD-ROM drives.
|
* Emulation of SCSI (and ATAPI) CD-ROM drives.
|
||||||
*
|
*
|
||||||
* Version: @(#)scsi_cdrom.c 1.0.1 2018/10/15
|
* Version: @(#)scsi_cdrom.c 1.0.2 2018/10/16
|
||||||
*
|
*
|
||||||
* 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>
|
||||||
@@ -354,7 +354,7 @@ int scsi_cdrom_do_log = ENABLE_SCSI_CDROM_LOG;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static void
|
void
|
||||||
scsi_cdrom_log(int level, const char *fmt, ...)
|
scsi_cdrom_log(int level, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_SCSI_CDROM_LOG
|
#ifdef ENABLE_SCSI_CDROM_LOG
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
* Emulation of SCSI fixed disks.
|
* Emulation of SCSI fixed disks.
|
||||||
*
|
*
|
||||||
* Version: @(#)scsi_disk.c 1.0.14 2018/10/15
|
* Version: @(#)scsi_disk.c 1.0.15 2018/10/16
|
||||||
*
|
*
|
||||||
* 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>
|
||||||
@@ -171,7 +171,7 @@ int scsi_disk_do_log = ENABLE_SCSI_DISK_LOG;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static void
|
void
|
||||||
scsi_disk_log(int level, const char *fmt, ...)
|
scsi_disk_log(int level, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_SCSI_DISK_LOG
|
#ifdef ENABLE_SCSI_DISK_LOG
|
||||||
|
|||||||
@@ -537,7 +537,7 @@ x54x_bios_command(x54x_t *x54x, uint8_t max_id, BIOSCMD *cmd, int8_t islba)
|
|||||||
case 0x11: /* Recalibrate */
|
case 0x11: /* Recalibrate */
|
||||||
target_check(cmd->id, cmd->lun);
|
target_check(cmd->id, cmd->lun);
|
||||||
|
|
||||||
cdb[0] = cdb[0] = bios_cmd_to_scsi[cmd->command];
|
cdb[0] = bios_cmd_to_scsi[cmd->command];
|
||||||
cdb[1] = (cmd->lun & 7) << 5;
|
cdb[1] = (cmd->lun & 7) << 5;
|
||||||
|
|
||||||
ret = x54x_bios_scsi_command(dev, cdb, NULL, sector_len, dma_address);
|
ret = x54x_bios_scsi_command(dev, cdb, NULL, sector_len, dma_address);
|
||||||
|
|||||||
Reference in New Issue
Block a user