claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to the SCSI module (scsi_disk.c), just a tiny cleanup.

Browse Source
This commit is contained in:
waltje
2019-04-23 19:19:03 -05:00
parent 3a3bed7f96
commit b9785f9d72
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/devices/scsi/scsi_disk.c
View File

@@ -8,12 +8,12 @@
* *
* Emulation of SCSI fixed disks. * Emulation of SCSI fixed disks.
* *
* Version: @(#)scsi_disk.c 1.0.22 2018/11/02 * Version: @(#)scsi_disk.c 1.0.23 2019/04/23
* *
* 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>
* *
* Copyright 2017,2018 Fred N. van Kempen. * Copyright 2017-2019 Fred N. van Kempen.
* Copyright 2016-2018 Miran Grca. * Copyright 2016-2018 Miran Grca.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@@ -196,13 +196,13 @@ static void
mode_sense_load(scsi_disk_t *dev) mode_sense_load(scsi_disk_t *dev)
{ {
wchar_t temp[512]; wchar_t temp[512];
const mode_sense_pages_t *ptr;
FILE *fp; FILE *fp;
ptr = &mode_sense_pages_default; /* Start out with a default set of pages. */
memcpy(&dev->ms_pages_saved, ptr, sizeof(mode_sense_pages_t)); memcpy(&dev->ms_pages_saved,
&mode_sense_pages_default, sizeof(mode_sense_pages_t));
memset(temp, 0, sizeof(temp)); /* Create the pathname for this data. */
swprintf(temp, sizeof_w(temp), swprintf(temp, sizeof_w(temp),
L"scsi_disk_%02i_mode_sense.bin", dev->id); L"scsi_disk_%02i_mode_sense.bin", dev->id);
@@ -220,7 +220,7 @@ mode_sense_save(scsi_disk_t *dev)
wchar_t temp[512]; wchar_t temp[512];
FILE *fp; FILE *fp;
memset(temp, 0, sizeof(temp)); /* Create the pathname for this data. */
swprintf(temp, sizeof_w(temp), swprintf(temp, sizeof_w(temp),
L"scsi_disk_%02i_mode_sense.bin", dev->id); L"scsi_disk_%02i_mode_sense.bin", dev->id);
@@ -257,22 +257,24 @@ read_capcity(void *p, uint8_t *cdb, uint8_t *buffer, uint32_t *len)
static uint8_t static uint8_t
mode_sense_read(scsi_disk_t *dev, uint8_t page_control, uint8_t page, uint8_t pos) mode_sense_read(scsi_disk_t *dev, uint8_t page_control, uint8_t page, uint8_t pos)
{ {
uint8_t ret = 0x00;
switch (page_control) { switch (page_control) {
case 0: case 0:
case 3: case 3:
return dev->ms_pages_saved.pages[page][pos]; ret = dev->ms_pages_saved.pages[page][pos];
break; break;
case 1: case 1:
return mode_sense_pages_changeable.pages[page][pos]; ret = mode_sense_pages_changeable.pages[page][pos];
break; break;
case 2: case 2:
return mode_sense_pages_default.pages[page][pos]; ret = mode_sense_pages_default.pages[page][pos];
break; break;
} }
return 0; return ret;
} }