folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

PDP11, VAX: Added ability to set the size of RAUSER devices to be n binary MB (1024*1024) with the -B switch. Added SHOW -B to display drive capacities in binary MB using the SHOW -B switch.

Browse source
This commit is contained in:
Mark Pizzolato 2014-05-16 15:13:56 -07:00
parent c0f9c2e86c
commit 2c0cedcc9c
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
PDP11/pdp11_rq.c
View file

@ -2782,7 +2782,7 @@ if (uptr->flags & UNIT_ATT)
if (cptr) { if (cptr) {
cap = (uint32) get_uint (cptr, 10, 0xFFFFFFFF, &r); cap = (uint32) get_uint (cptr, 10, 0xFFFFFFFF, &r);
if ((sim_switches & SWMASK ('L')) == 0) if ((sim_switches & SWMASK ('L')) == 0)
cap = cap * 1954; cap = cap * ((sim_switches & SWMASK ('B')) ? 2048 : 1954);
if ((r != SCPE_OK) || (cap < RA8U_MINC) || (cap > max)) if ((r != SCPE_OK) || (cap < RA8U_MINC) || (cap > max))
return SCPE_ARG; return SCPE_ARG;
drv_tab[val].lbn = cap; drv_tab[val].lbn = cap;
@ -3158,12 +3158,15 @@ fprintf (st, "include the ability to set units write enabled or write locked, an
fprintf (st, "the drive type to one of many disk types:\n"); fprintf (st, "the drive type to one of many disk types:\n");
fprint_set_help (st, dptr); fprint_set_help (st, dptr);
fprintf (st, "set RQn RAUSER{=n} Set disk type to RA82 with n MB's\n"); fprintf (st, "set RQn RAUSER{=n} Set disk type to RA82 with n MB's\n");
fprintf (st, " (1MB is 1000000 bytes)\n");
fprintf (st, "set -L RQn RAUSER{=n} Set disk type to RA82 with n LBN's\n\n"); fprintf (st, "set -L RQn RAUSER{=n} Set disk type to RA82 with n LBN's\n\n");
fprintf (st, "set -B RQn RAUSER{=n} Set disk type to RA82 with n MB's\n");
fprintf (st, " (1MB is 2048 512 byte sectors)\n\n");
fprintf (st, "The type options can be used only when a unit is not attached to a file.\n"); fprintf (st, "The type options can be used only when a unit is not attached to a file.\n");
fprintf (st, "RAUSER is a \"user specified\" disk; the user can specify the size of the\n"); fprintf (st, "RAUSER is a \"user specified\" disk; the user can specify the size of the\n");
fprintf (st, "disk in either MB (1000000 bytes) or logical block numbers (LBN's, 512 bytes\n"); fprintf (st, "disk in either MB (1000000 bytes) or logical block numbers (LBN's, 512 bytes\n");
fprintf (st, "each). The minimum size is 5MB; the maximum size is 2GB without extended\n"); fprintf (st, "each), or binary MB (1024*1024 bytes). The minimum size is 5MB; the maximum\n");
fprintf (st, "file support, 1TB with extended file support.\n\n"); fprintf (st, "size is 2GB without extended file support, 1TB with extended file support.\n\n");
fprintf (st, "The %s controllers support the BOOT command.\n\n", dptr->name); fprintf (st, "The %s controllers support the BOOT command.\n\n", dptr->name);
fprint_show_help (st, dptr); fprint_show_help (st, dptr);
fprint_reg_help (st, dptr); fprint_reg_help (st, dptr);

5
scp.c
View file

@ -3615,10 +3615,13 @@ return SCPE_OK;
void fprint_capac (FILE *st, DEVICE *dptr, UNIT *uptr) void fprint_capac (FILE *st, DEVICE *dptr, UNIT *uptr)
{ {
t_addr kval = (uptr->flags & UNIT_BINK)? 1024: 1000; t_addr kval = (uptr->flags & UNIT_BINK)? 1024: 1000;
t_addr mval = kval * kval; t_addr mval;
t_addr psize = uptr->capac; t_addr psize = uptr->capac;
char scale, width; char scale, width;
if (sim_switches & SWMASK ('B'))
kval = 1024;
mval = kval * kval;
if (dptr->flags & DEV_SECTORS) { if (dptr->flags & DEV_SECTORS) {
kval = kval / 512; kval = kval / 512;
mval = mval / 512; mval = mval / 512;