github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-02-27 17:13:44 +00:00
Code Releases Activity

DISK: Fix read only container v0 attach logic SCSI<->MSCP size adjustment

Browse Source
This commit is contained in:
Mark Pizzolato
2023-02-04 20:21:20 -10:00
parent 2e50ada71f
commit be4552c509
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sim_disk.c
View File

@@ -2918,12 +2918,14 @@ if (f) {
}
else {
/* We've got a valid footer, but it may need to be corrected */
if ((uptr->flags & UNIT_RO) == 0) {
if ((NtoHl (f->ElementEncodingSize) == 1) &&
(0 == memcmp (f->DriveType, "RZ", 2))) {
f->ElementEncodingSize = NtoHl (2);
if ((NtoHl (f->ElementEncodingSize) == 1) &&
((0 == memcmp (f->DriveType, "RZ", 2)) ||
(0 == memcmp (f->DriveType, "RR", 2)))) {
f->ElementEncodingSize = NtoHl (2);
if ((uptr->flags & UNIT_RO) == 0)
store_disk_footer (uptr, (char *)f->DriveType);
}
}
if ((uptr->flags & UNIT_RO) == 0) {
if ((NtoHl (f->SectorSize) != 512) &&
(f->FooterVersion == 0)) {
/* remove and rebuild early version original footer for non 512 byte sector containers */
@@ -3548,9 +3550,10 @@ if ((DK_GET_FMT (uptr) == DKUF_F_VHD) || (ctx->footer)) {
sim_show_message = saved_show_message;
if (r != SCPE_OK) {
if (size_settable_drive_type != NULL) {
sim_switches |= SWMASK ('L'); /* LBN size */
sim_switches |= SWMASK ('L'); /* LBN size */
snprintf (cmd, sizeof (cmd), "%s %s=%u", sim_uname (uptr), size_settable_drive_type->name, (uint32)(ctx->container_size / ctx->sector_size));
r = set_cmd (0, cmd);
uptr->flags |= saved_RO_flags; /* restore unit Read Only state after size adjustment */
}
else
r = sim_messagef (SCPE_INCOMPDSK, "%s: Cannot set to drive type %s\n", sim_uname (uptr), container_dtype);