github.com/rcornwell.sims
1
0
Fork 0
mirror of https://github.com/rcornwell/sims.git synced 2026-02-27 00:59:57 +00:00
Code Releases Activity

SCP: Updated to current.

Browse Source
This commit is contained in:
Richard Cornwell
2021-01-03 21:26:33 -05:00
parent 3749a771a8
commit 542d1bdbf4
4 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scp.h
View File

@@ -342,7 +342,7 @@ void sim_debug_unit (uint32 dbits, UNIT* uptr, const char *fmt, ...) GCC_FMT_ATT
void _sim_debug_unit (uint32 dbits, UNIT *uptr, const char* fmt, ...) GCC_FMT_ATTR(3, 4);
void _sim_debug_device (uint32 dbits, DEVICE* dptr, const char* fmt, ...) GCC_FMT_ATTR(3, 4);
#define sim_debug(dbits, dptr, ...) do { if ((sim_deb != NULL) && ((dptr) != NULL) && ((dptr)->dctrl & (dbits))) _sim_debug_device (dbits, dptr, __VA_ARGS__);} while (0)
#define sim_debug_unit(dbits, uptr, ...) do { if ((sim_deb != NULL) && ((uptr) != NULL) && (((uptr)->dctrl | (uptr)->dptr->dctrl) & (dbits))) _sim_debug_unit (dbits, uptr, __VA_ARGS__);} while (0)
#define sim_debug_unit(dbits, uptr, ...) do { if ((sim_deb != NULL) && ((uptr) != NULL) && (uptr->dptr != NULL) && (((uptr)->dctrl | (uptr)->dptr->dctrl) & (dbits))) _sim_debug_unit (dbits, uptr, __VA_ARGS__);} while (0)
#endif
void sim_flush_buffered_files (void);

31
sim_disk.c
View File

@@ -2043,6 +2043,8 @@ for (i = 0; checks[i] != NULL; i++) {
return ret_val;
}
static t_stat store_disk_footer (UNIT *uptr, const char *dtype);
static t_stat get_disk_footer (UNIT *uptr)
{
struct disk_context *ctx = (struct disk_context *)uptr->disk_ctx;
@@ -2109,6 +2111,13 @@ if (f) {
f = NULL;
}
else {
/* We've got a valid footer, but it may need to be corrected */
if ((NtoHl (f->TransferElementSize) == 1) &&
(0 == memcmp (f->DriveType, "RZ", 2))) {
f->TransferElementSize = NtoHl (2);
f->Checksum = NtoHl (eth_crc32 (0, f, sizeof (*f) - sizeof (f->Checksum)));
store_disk_footer (uptr, (char *)f->DriveType);
}
free (ctx->footer);
ctx->footer = f;
container_size -= sizeof (*f);
@@ -2161,8 +2170,10 @@ free (ctx->footer);
ctx->footer = f;
switch (f->AccessFormat) {
case DKUF_F_STD: /* SIMH format */
if (sim_fseeko ((FILE *)uptr->fileref, total_sectors * ctx->sector_size, SEEK_SET) == 0)
if (sim_fseeko ((FILE *)uptr->fileref, total_sectors * ctx->sector_size, SEEK_SET) == 0) {
sim_fwrite (f, sizeof (*f), 1, (FILE *)uptr->fileref);
fflush ((FILE *)uptr->fileref);
}
break;
case DKUF_F_VHD: /* VHD format */
break;
@@ -2189,7 +2200,6 @@ DEVICE *dptr;
char tbuf[4*CBUFSIZE];
FILE *(*open_function)(const char *filename, const char *mode) = sim_fopen;
FILE *(*create_function)(const char *filename, t_offset desiredsize) = NULL;
t_offset (*size_function)(FILE *file);
t_stat (*storage_function)(FILE *file, uint32 *sector_size, uint32 *removable, uint32 *is_cdrom) = NULL;
t_bool created = FALSE, copied = FALSE;
t_bool auto_format = FALSE;
@@ -2416,7 +2426,6 @@ switch (DK_GET_FMT (uptr)) { /* case on format */
sim_vhd_disk_close (uptr->fileref); /* close vhd file*/
uptr->fileref = NULL;
open_function = sim_vhd_disk_open;
size_function = sim_vhd_disk_size;
break;
}
while (tmp_size < sector_size)
@@ -2426,7 +2435,6 @@ switch (DK_GET_FMT (uptr)) { /* case on format */
sim_disk_set_fmt (uptr, 0, "RAW", NULL); /* set file format to RAW */
sim_os_disk_close_raw (uptr->fileref); /* close raw file*/
open_function = sim_os_disk_open_raw;
size_function = sim_os_disk_size_raw;
storage_function = sim_os_disk_info_raw;
uptr->fileref = NULL;
break;
@@ -2434,7 +2442,6 @@ switch (DK_GET_FMT (uptr)) { /* case on format */
}
sim_disk_set_fmt (uptr, 0, "SIMH", NULL); /* set file format to SIMH */
open_function = sim_fopen;
size_function = sim_fsize_ex;
break;
case DKUF_F_STD: /* SIMH format */
if (NULL != (uptr->fileref = sim_vhd_disk_open (cptr, "rb"))) { /* Try VHD first */
@@ -2442,17 +2449,14 @@ switch (DK_GET_FMT (uptr)) { /* case on format */
sim_vhd_disk_close (uptr->fileref); /* close vhd file*/
uptr->fileref = NULL;
open_function = sim_vhd_disk_open;
size_function = sim_vhd_disk_size;
auto_format = TRUE;
break;
}
open_function = sim_fopen;
size_function = sim_fsize_ex;
break;
case DKUF_F_VHD: /* VHD format */
open_function = sim_vhd_disk_open;
create_function = sim_vhd_disk_create;
size_function = sim_vhd_disk_size;
storage_function = sim_os_disk_info_raw;
break;
case DKUF_F_RAW: /* Raw Physical Disk Access */
@@ -2461,12 +2465,10 @@ switch (DK_GET_FMT (uptr)) { /* case on format */
sim_vhd_disk_close (uptr->fileref); /* close vhd file*/
uptr->fileref = NULL;
open_function = sim_vhd_disk_open;
size_function = sim_vhd_disk_size;
auto_format = TRUE;
break;
}
open_function = sim_os_disk_open_raw;
size_function = sim_os_disk_size_raw;
storage_function = sim_os_disk_info_raw;
break;
default:
@@ -2552,8 +2554,13 @@ if ((DK_GET_FMT (uptr) == DKUF_F_VHD) || (ctx->footer)) {
cmd[sizeof (cmd) - 1] = '\0';
snprintf (cmd, sizeof (cmd) - 1, "%s %s", sim_uname (uptr), container_dtype);
r = set_cmd (0, cmd);
if (r != SCPE_OK)
r = sim_messagef (r, "Can't set %s to drive type %s\n", sim_uname (uptr), container_dtype);
if (r != SCPE_OK) {
r = sim_messagef (r, "%s: Can't set to drive type %s\n", sim_uname (uptr), container_dtype);
if ((uptr->flags & UNIT_RO) != 0) /* Not Opening read only? */
r = sim_messagef (SCPE_OK, "%s: Read Only access to inconsistent drive type allowed\n", sim_uname (uptr));
else
sim_messagef (SCPE_OK, "'%s' can only be attached Read Only to %s\n", cptr, sim_uname (uptr));
}
}
}
}

9
sim_scsi.c
View File

@@ -1689,7 +1689,7 @@ return SCPE_OK;
/* Attach device */
t_stat scsi_attach (UNIT *uptr, CONST char *cptr)
t_stat scsi_attach_ex (UNIT *uptr, CONST char *cptr, const char **drivetypes)
{
SCSI_DEV *dev = (SCSI_DEV *)uptr->up7;
@@ -1700,7 +1700,7 @@ switch (dev->devtype) {
case SCSI_DISK:
case SCSI_WORM:
case SCSI_CDROM:
return sim_disk_attach (uptr, cptr, dev->block_size, sizeof (uint8), (uptr->flags & SCSI_NOAUTO), SCSI_DBG_DSK, dev->name, 0, 0);
return sim_disk_attach_ex (uptr, cptr, dev->block_size, sizeof (uint16), (uptr->flags & SCSI_NOAUTO), SCSI_DBG_DSK, dev->name, 0, 0, drivetypes);
case SCSI_TAPE:
return sim_tape_attach (uptr, cptr);
default:
@@ -1708,6 +1708,11 @@ switch (dev->devtype) {
}
}
t_stat scsi_attach (UNIT *uptr, CONST char *cptr)
{
return scsi_attach_ex (uptr, cptr, NULL);
}
/* Dettach device */
t_stat scsi_detach (UNIT *uptr)

1
sim_scsi.h
View File

@@ -129,6 +129,7 @@ t_stat scsi_set_wlk (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat scsi_show_fmt (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat scsi_show_wlk (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat scsi_attach (UNIT *uptr, CONST char *cptr);
t_stat scsi_attach_ex (UNIT *uptr, CONST char *cptr, const char **drivetypes);
t_stat scsi_detach (UNIT *uptr);
t_stat scsi_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);