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

More linting in src/scsi

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-08-21 20:24:06 -04:00
parent 0ba8fd8972
commit d32a3914da
8 changed files with 105 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/scsi/scsi_cdrom.c
View File

@@ -608,7 +608,7 @@ scsi_cdrom_get_volume(void *priv, int channel)
static void
scsi_cdrom_mode_sense_load(scsi_cdrom_t *dev)
{
FILE *f;
FILE *fp;
char file_name[512];
if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
@@ -618,11 +618,11 @@ scsi_cdrom_mode_sense_load(scsi_cdrom_t *dev)
memset(file_name, 0, 512);
sprintf(file_name, "scsi_cdrom_%02i_mode_sense_sony_bin", dev->id);
f = plat_fopen(nvr_path(file_name), "rb");
if (f) {
if (fread(dev->ms_pages_saved_sony.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1, 0x10, f) != 0x10)
fp = plat_fopen(nvr_path(file_name), "rb");
if (fp) {
if (fread(dev->ms_pages_saved_sony.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1, 0x10, fp) != 0x10)
fatal("scsi_cdrom_mode_sense_load(): Error reading data\n");
fclose(f);
fclose(fp);
}
} else {
memset(&dev->ms_pages_saved, 0, sizeof(mode_sense_pages_t));
@@ -636,11 +636,11 @@ scsi_cdrom_mode_sense_load(scsi_cdrom_t *dev)
sprintf(file_name, "scsi_cdrom_%02i_mode_sense_bin", dev->id);
else
sprintf(file_name, "cdrom_%02i_mode_sense_bin", dev->id);
f = plat_fopen(nvr_path(file_name), "rb");
if (f) {
if (fread(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, f) != 0x10)
fp = plat_fopen(nvr_path(file_name), "rb");
if (fp) {
if (fread(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, fp) != 0x10)
fatal("scsi_cdrom_mode_sense_load(): Error reading data\n");
fclose(f);
fclose(fp);
}
}
}
@@ -648,7 +648,7 @@ scsi_cdrom_mode_sense_load(scsi_cdrom_t *dev)
static void
scsi_cdrom_mode_sense_save(scsi_cdrom_t *dev)
{
FILE *f;
FILE *fp;
char file_name[512];
memset(file_name, 0, 512);
@@ -656,20 +656,20 @@ scsi_cdrom_mode_sense_save(scsi_cdrom_t *dev)
if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-76S_1.00")) {
sprintf(file_name, "scsi_cdrom_%02i_mode_sense_sony_bin", dev->id);
f = plat_fopen(nvr_path(file_name), "wb");
if (f) {
fwrite(dev->ms_pages_saved_sony.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1, 0x10, f);
fclose(f);
fp = plat_fopen(nvr_path(file_name), "wb");
if (fp) {
fwrite(dev->ms_pages_saved_sony.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1, 0x10, fp);
fclose(fp);
}
} else {
if (dev->drv->bus_type == CDROM_BUS_SCSI)
sprintf(file_name, "scsi_cdrom_%02i_mode_sense_bin", dev->id);
else
sprintf(file_name, "cdrom_%02i_mode_sense_bin", dev->id);
f = plat_fopen(nvr_path(file_name), "wb");
if (f) {
fwrite(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, f);
fclose(f);
fp = plat_fopen(nvr_path(file_name), "wb");
if (fp) {
fwrite(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, fp);
fclose(fp);
}
}
}
@@ -1902,14 +1902,12 @@ begin:
cdb[0] = GPCMD_PLAY_AUDIO_MSF;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
} else if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-76S_1.00")) { /*GPCMD_PLAY_MSF_SONY*/
cdb[0] = GPCMD_PLAY_AUDIO_MSF;
dev->current_cdb[0] = cdb[0];
dev->sony_vendor = 1;
goto begin;
break;
} /*GPCMD_READ_DISC_INFORMATION_TOSHIBA*/
case 0xDE: /*GPCMD_READ_DISC_INFORMATION_NEC*/
scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
@@ -2788,7 +2786,6 @@ begin:
cdb[0] = GPCMD_READ_HEADER;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
} else if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-76S_1.00")) { /*GPCMD_PLAYBACK_STATUS_SONY*/
scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
@@ -3029,7 +3026,6 @@ atapi_out:
cdb[0] = GPCMD_READ_TOC_PMA_ATIP;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
} else if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-76S_1.00")) { /*GPCMD_READ_HEADER_SONY*/
scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_IN);
@@ -3064,7 +3060,6 @@ atapi_out:
cdb[0] = GPCMD_READ_SUBCHANNEL;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
} else if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-76S_1.00") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "PIONEER_CD-ROM_DRM-604X_2403")) { /*GPCMD_READ_SUBCHANNEL_SONY*/
@@ -3172,7 +3167,6 @@ atapi_out:
cdb[0] = GPCMD_PLAY_AUDIO_10;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
} else if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-76S_1.00")) { /*GPCMD_PAUSE_SONY*/
scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
@@ -3186,21 +3180,18 @@ atapi_out:
cdb[0] = GPCMD_PLAY_AUDIO_TRACK_INDEX;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
} else if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-76S_1.00")) { /*GPCMD_PLAY_AUDIO_SONY*/
cdb[0] = GPCMD_PLAY_AUDIO_10;
dev->current_cdb[0] = cdb[0];
dev->sony_vendor = 1;
goto begin;
break;
}
case 0xC9:
if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "MATSHITA_CD-ROM_CR-501_1.0b")) { /*GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10_MATSUSHITA*/
cdb[0] = GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
} else if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-541_1.0i") ||
!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "SONY_CD-ROM_CDU-76S_1.00")) { /*GPCMD_PLAYBACK_CONTROL_SONY*/
scsi_cdrom_set_phase(dev, SCSI_PHASE_DATA_OUT);
@@ -3225,7 +3216,6 @@ atapi_out:
cdb[0] = GPCMD_PAUSE_RESUME;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
}
case 0xCC:
if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "PIONEER_CD-ROM_DRM-604X_2403")) {
@@ -3295,15 +3285,14 @@ atapi_out:
cdb[0] = GPCMD_PLAY_AUDIO_12;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
}
case 0xE9:
if (!strcmp(cdrom_drive_types[dev->drv->type].internal_name, "MATSHITA_CD-ROM_CR-501_1.0b")) { /*GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12_MATSUSHITA*/
cdb[0] = GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12;
dev->current_cdb[0] = cdb[0];
goto begin;
break;
}
default:
scsi_cdrom_illegal_opcode(dev);
break;