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

More sonarlint work

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-09 23:46:54 -04:00
parent 0d1d069af4
commit ee695e71f9
218 changed files with 6282 additions and 3845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/scsi/scsi_cdrom.c
View File

@@ -42,8 +42,7 @@
#include <86box/version.h>
#pragma pack(push, 1)
typedef struct
{
typedef struct gesn_cdb_t {
uint8_t opcode;
uint8_t polled;
uint8_t reserved2[2];
@@ -53,8 +52,7 @@ typedef struct
uint8_t control;
} gesn_cdb_t;
typedef struct
{
typedef struct gesn_event_header_t {
uint16_t len;
uint8_t notification_class;
uint8_t supported_events;
@@ -565,6 +563,9 @@ scsi_cdrom_atapi_phase_to_scsi(scsi_cdrom_t *dev)
return 1;
case 3:
return 7;
default:
break;
}
} else {
if ((dev->phase & 3) == 3)
@@ -577,9 +578,9 @@ scsi_cdrom_atapi_phase_to_scsi(scsi_cdrom_t *dev)
}
static uint32_t
scsi_cdrom_get_channel(void *p, int channel)
scsi_cdrom_get_channel(void *priv, int channel)
{
scsi_cdrom_t *dev = (scsi_cdrom_t *) p;
scsi_cdrom_t *dev = (scsi_cdrom_t *) priv;
if (!dev)
return channel + 1;
@@ -591,9 +592,9 @@ scsi_cdrom_get_channel(void *p, int channel)
}
static uint32_t
scsi_cdrom_get_volume(void *p, int channel)
scsi_cdrom_get_volume(void *priv, int channel)
{
scsi_cdrom_t *dev = (scsi_cdrom_t *) p;
scsi_cdrom_t *dev = (scsi_cdrom_t *) priv;
if (!dev)
return 255;
@@ -682,7 +683,7 @@ scsi_cdrom_drive_status_load(scsi_cdrom_t *dev)
}
static uint8_t
scsi_cdrom_drive_status_read(scsi_cdrom_t *dev, uint8_t page_control, uint8_t page, uint8_t pos)
scsi_cdrom_drive_status_read(scsi_cdrom_t *dev, UNUSED(uint8_t page_control), uint8_t page, uint8_t pos)
{
return dev->ms_drive_status_pages_saved.pages[page][pos];
}
@@ -735,12 +736,12 @@ scsi_cdrom_mode_sense_read(scsi_cdrom_t *dev, uint8_t page_control, uint8_t page
case 0:
case 3:
return dev->ms_pages_saved_sony.pages[page][pos];
break;
case 1:
return scsi_cdrom_mode_sense_pages_changeable_sony.pages[page][pos];
break;
case 2:
return scsi_cdrom_mode_sense_pages_default_sony_scsi.pages[page][pos];
default:
break;
}
} else {
@@ -748,16 +749,17 @@ scsi_cdrom_mode_sense_read(scsi_cdrom_t *dev, uint8_t page_control, uint8_t page
case 0:
case 3:
return dev->ms_pages_saved.pages[page][pos];
break;
case 1:
return scsi_cdrom_mode_sense_pages_changeable.pages[page][pos];
break;
case 2:
if (dev->drv->bus_type == CDROM_BUS_SCSI)
return scsi_cdrom_mode_sense_pages_default_scsi.pages[page][pos];
else
return scsi_cdrom_mode_sense_pages_default.pages[page][pos];
default:
break;
}
}
@@ -881,7 +883,7 @@ scsi_cdrom_update_request_length(scsi_cdrom_t *dev, int len, int block_len)
break;
}
}
/* FALLTHROUGH */
[[fallthrough]];
default:
dev->packet_len = len;
@@ -957,7 +959,7 @@ scsi_cdrom_command_common(scsi_cdrom_t *dev)
scsi_cdrom_log("CD-ROM %i: Seek period: %" PRIu64 " us\n",
dev->id, (uint64_t) period);
dev->callback += period;
/*FALLTHROUGH*/
[[fallthrough]];
case 0x25:
case 0x42:
case 0x43:
@@ -1116,7 +1118,7 @@ scsi_cdrom_data_command_finish(scsi_cdrom_t *dev, int len, int block_len, int al
}
static void
scsi_cdrom_sense_clear(scsi_cdrom_t *dev, int command)
scsi_cdrom_sense_clear(scsi_cdrom_t *dev, UNUSED(int command))
{
scsi_cdrom_sense_key = scsi_cdrom_asc = scsi_cdrom_ascq = 0;
}
@@ -1495,9 +1497,9 @@ scsi_cdrom_read_dvd_structure(scsi_cdrom_t *dev, int format, const uint8_t *pack
}
static void
scsi_cdrom_insert(void *p)
scsi_cdrom_insert(void *priv)
{
scsi_cdrom_t *dev = (scsi_cdrom_t *) p;
scsi_cdrom_t *dev = (scsi_cdrom_t *) priv;
if (!dev)
return;
@@ -1934,7 +1936,7 @@ begin:
/* IMPORTANT: Convert the command to new read CD
for pass through purposes. */
dev->current_cdb[0] = GPCMD_READ_CD;
/*FALLTHROUGH*/
[[fallthrough]];
case GPCMD_READ_6:
case GPCMD_READ_10:
@@ -2012,6 +2014,9 @@ begin:
return;
}
break;
default:
break;
}
if (!dev->sector_len) {
@@ -2549,6 +2554,9 @@ begin:
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
break;
default:
break;
}
if ((dev->drv->host_drive < 1) || (dev->drv->cd_status <= CD_STATUS_DATA_ONLY)) {
@@ -2767,6 +2775,9 @@ begin:
case 3: /* Load the disc (close tray). */
cdrom_reload(dev->id);
break;
default:
break;
}
scsi_cdrom_command_complete(dev);
@@ -3105,6 +3116,9 @@ atapi_out:
case GPCMD_SEEK_10:
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
break;
default:
break;
}
dev->drv->seek_diff = ABS((int) (pos - dev->drv->seek_pos));
if (cdb[0] == GPCMD_SEEK_10) {
@@ -3439,6 +3453,9 @@ scsi_cdrom_phase_data_out(scsi_common_t *sc)
}
}
break;
default:
break;
}
scsi_cdrom_command_stop((scsi_common_t *) dev);
@@ -3446,9 +3463,9 @@ scsi_cdrom_phase_data_out(scsi_common_t *sc)
}
static void
scsi_cdrom_close(void *p)
scsi_cdrom_close(void *priv)
{
scsi_cdrom_t *dev = (scsi_cdrom_t *) p;
scsi_cdrom_t *dev = (scsi_cdrom_t *) priv;
if (dev)
free(dev);