6 files changed, 19 insertions(+), 15 deletions(-)

M pc/clock.c
M pc/devrtc.c
M port/devbit.c
M ss/clock.c
M ss/main.c
M ss/scsi.c

@@ 87,12 87,10 @@ clock(Ureg *ur)
 			else
 				sched();
 		}
-#ifdef asdf
 		if((ur->cs&0xffff) == UESEL){
 			spllo();		/* in case we fault */
 			(*(ulong*)(USTKTOP-BY2WD)) += TK2MS(1);	/* profiling clock */
 			splhi();
 		}
-#endif asdf
 	}
 }

@@ 38,9 38,14 @@ struct Rtc
 
 QLock rtclock;	/* mutex on clock operations */
 
+enum{
+	Qrtc = 1,
+	Qnvram,
+};
+
 #define	NRTC	1
 Dirtab rtcdir[]={
-	"rtc",		{1, 0},	0,	0666,
+	"rtc",		{Qrtc, 0},	0,	0666,
 };
 
 ulong rtc2sec(Rtc*);

@@ 215,12 215,12 @@ bitdebug(void)
 		a = &bit.arena[i];
 		if(a->words){
 			l += a->nwords;
-			print("%d: %ld used; %ld total\n", i,
+			print("%d: %ld bytes used; %ld total\n", i,
 				(a->wfree-a->words)*sizeof(ulong),
 				a->nwords*sizeof(ulong));
 		}
 	}
-	print("arena: %ld words\n", l*sizeof(ulong));
+	print("arena: %ld bytes\n", l*sizeof(ulong));
 	l = 0;
 	for(i=0; i<bit.nmap; i++)
 		if(bit.map[i])

@@ 12,7 12,9 @@ delay(int ms)
 {
 	int i;
 
-	ms *= 3000;	/* experimentally determined */
+	ms *= 6666;		/* experimentally determined */
+	if(conf.ss2)
+		ms *= 2;
 	for(i=0; i<ms; i++)
 		;
 }

@@ 140,8 140,8 @@ init0(void)
 	print("bank 0: %dM  1: %dM\n", bank[0], bank[1]);
 	print("frame buffer id %lux %s\n", conf.monitor, fbstr);
 	print("NKLUDGE %d\n", NKLUDGE);
-
-mapdump();
+	if(conf.npage1 != conf.base1)
+		print("kernel mem from second bank: reboot and fix!\n");
 
 	u->slash = (*devtab[0].attach)(0);
 	u->dot = clone(u->slash, 0);


@@ 401,12 401,12 @@ confinit(void)
 		 * it has only a 24bit address counter.
 		 * NB. Suns must have at LEAST 8Mbytes.
 		 */
-		conf.npage1 = conf.npage0 - (4*MB)/BY2PG;
-		conf.base1 = 4*MB;
-		conf.npage0 = (4*MB)/BY2PG;
+		conf.npage1 = conf.npage0 - (8*MB)/BY2PG;
+		conf.base1 = 8*MB;
+		conf.npage0 = (8*MB)/BY2PG;
 		conf.base0 = 0;
-		bank[1] = bank[0]-4;
-		bank[0] = 4;
+		bank[1] = bank[0]-8;
+		bank[0] = 8;
 	}
 
 	conf.npage = conf.npage0+conf.npage1;

@@ 48,7 48,7 @@ scsialloc(ulong n)
 }
 
 enum {
-	ResetIntDis	= 0x40,		/* config regsiter */
+	ResetIntDis	= 0x40,		/* config register */
 	Penable		= 0x10,
 
 	Dma		= 0x80,		/* NCR 53C90 commands */


@@ 295,7 295,6 @@ scsiintr(void)
 			}
 		}
 
-
 		dev->cmd = Cmdcomplete;
 		return;