From a10b8969cded47ed1bb5a11bddc7de397dabf61c Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 21 Oct 2020 04:25:00 -0700 Subject: [PATCH] MicroVAX2000, VAXStation2000: Properly describe 16MB of memory in CFGTST reg The CFGTST register MTYPE subfield should describe the additional memory beyond 2MB on the processor board. Previous logic attempted to describe the total system memory and the net result didn't fit into the 3 bit field and thus said no additional memory is present. The consequence of this new amount of memory is that ALL of it is tested during the power on self test and thus it takes significantly longer to get to the >>> prompt. As reported in #944 --- VAX/vax410_sysdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VAX/vax410_sysdev.c b/VAX/vax410_sysdev.c index b07c67a1..98a3dc82 100644 --- a/VAX/vax410_sysdev.c +++ b/VAX/vax410_sysdev.c @@ -891,7 +891,7 @@ ka_mser = 0; ka_mear = 0; ka_cfgtst = (CFGT_TYP | CFGT_CUR); if (MEMSIZE > (1u << 21)) /* more than 2MB? */ - ka_cfgtst |= ((MEMSIZE >> 21) & CFGT_MEM); + ka_cfgtst |= (((MEMSIZE - (1u << 21)) >> 21) & CFGT_MEM); if ((vc_dev.flags & DEV_DIS) == 0) /* mono video enabled? */ ka_cfgtst &= ~CFGT_TYP; if ((va_dev.flags & DEV_DIS) == 0) { /* video option present? */