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

SCP: Add option to display fractional unit capacity

Browse source
This commit is contained in:
Mark Pizzolato 2019-11-16 20:59:37 -08:00
parent 4e5780e15e
commit 4cbd8401f7
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scp.c
View file

@ -5714,9 +5714,10 @@ return SCPE_OK;
const char *sprint_capac (DEVICE *dptr, UNIT *uptr) const char *sprint_capac (DEVICE *dptr, UNIT *uptr)
{ {
static char capac_buf[((CHAR_BIT * sizeof (t_value) * 4 + 3)/3) + 8]; static char capac_buf[((CHAR_BIT * sizeof (t_value) * 4 + 3)/3) + 12];
t_addr kval = (uptr->flags & UNIT_BINK)? 1024: 1000; t_addr kval = (uptr->flags & UNIT_BINK)? 1024: 1000;
t_addr mval; t_addr mval;
double remfrac;
t_addr psize = uptr->capac; t_addr psize = uptr->capac;
const char *scale, *width; const char *scale, *width;
@ -5731,18 +5732,28 @@ else
width = "B"; width = "B";
if ((psize < (kval * 10)) && if ((psize < (kval * 10)) &&
(0 != (psize % kval))) { (0 != (psize % kval))) {
remfrac = 0.0;
scale = ""; scale = "";
} }
else if ((psize < (mval * 10)) && else if ((psize < (mval * 10)) &&
(0 != (psize % mval))){ (0 != (psize % mval))){
scale = "K"; scale = "K";
remfrac = ((double)(psize % kval))/kval;
psize = psize / kval; psize = psize / kval;
} }
else { else {
scale = "M"; scale = "M";
remfrac = ((double)(psize % mval))/mval;
psize = psize / mval; psize = psize / mval;
} }
sprint_val (capac_buf, (t_value) psize, 10, T_ADDR_W, PV_LEFT); sprint_val (capac_buf, (t_value) psize, 10, T_ADDR_W, PV_LEFT);
if ((remfrac != 0.0) && (sim_switches & SWMASK ('R'))) {
char *plast_char = &capac_buf[strlen (capac_buf) - 1];
char save_char = *plast_char;
sprintf (plast_char, "%0.3f", remfrac);
*plast_char = save_char;
}
sprintf (&capac_buf[strlen (capac_buf)], "%s%s", scale, width); sprintf (&capac_buf[strlen (capac_buf)], "%s%s", scale, width);
return capac_buf; return capac_buf;
} }