Plan 9 from Bell Labs 2003-05-20

dist/replica/plan9.db

@@ -3207,7 +3207,7 @@ sys/doc/venti/venti.pdf - 755 sys sys 1020384352 139090
 sys/doc/venti/venti.ps - 664 sys sys 1019852320 2012620
 sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
-sys/games/lib/fortunes - 664 sys sys 1052019992 242846
+sys/games/lib/fortunes - 664 sys sys 1053400198 243227
 sys/include - 20000000775 sys sys 1016902416 0
 sys/include/9p.h - 664 sys sys 1044836327 4309
 sys/include/String.h - 664 sys sys 1014929061 1133
@@ -4970,7 +4970,7 @@ sys/src/9/alphapc/vgasavage.c - 664 sys sys 1015012788 29
 sys/src/9/alphapc/vgatvp3026.c - 664 sys sys 1015012788 30
 sys/src/9/alphapc/vgax.c - 664 sys sys 1015012788 24
 sys/src/9/bitsy - 20000000775 sys sys 1018721429 0
-sys/src/9/bitsy/Booting101 - 664 sys sys 1053021020 6879
+sys/src/9/bitsy/Booting101 - 664 sys sys 1053341743 7306
 sys/src/9/bitsy/bitsy - 664 sys sys 1043922351 450
 sys/src/9/bitsy/bitsyreset.s - 664 sys sys 1017695510 2352
 sys/src/9/bitsy/clock.c - 664 sys sys 1037028998 4835
@@ -5012,14 +5012,14 @@ sys/src/9/bitsy/power.c - 664 sys sys 1037812174 7375
 sys/src/9/bitsy/random.c - 664 sys sys 1036813517 1982
 sys/src/9/bitsy/sa1110dma.c - 664 sys sys 1017695520 4666
 sys/src/9/bitsy/sa1110dma.h - 664 sys sys 1017695520 381
-sys/src/9/bitsy/screen.c - 664 sys sys 1039753380 10145
+sys/src/9/bitsy/screen.c - 664 sys sys 1053340962 10145
 sys/src/9/bitsy/screen.h - 664 sys sys 1017695520 260
 sys/src/9/bitsy/sd.h - 664 sys sys 1037029038 0
 sys/src/9/bitsy/sdata.c - 664 sys sys 1037029041 44666
 sys/src/9/bitsy/tar.c - 664 sys sys 1017695521 1375
 sys/src/9/bitsy/trap.c - 664 sys sys 1037029044 18951
 sys/src/9/bitsy/uartsa1110.c - 664 sys sys 1037029045 8530
-sys/src/9/bitsy/wavelan.c - 664 sys sys 1053021020 27267
+sys/src/9/bitsy/wavelan.c - 664 sys sys 1053340976 27266
 sys/src/9/bitsy/wavelan.h - 664 sys sys 1037029076 27
 sys/src/9/boot - 20000000775 sys sys 1018556557 0
 sys/src/9/boot/aux.c - 664 sys sys 1015012529 2520

dist/replica/plan9.log

@@ -12021,3 +12021,7 @@
 1053223268 0 c sys/src/cmd/rx.c - 664 sys sys 1053223080 3374
 1053226869 0 c sys/src/cmd/unix/u9fs/u9fs.c - 664 sys sys 1053226064 30784
 1053277372 0 a mail/lib/pipeto.lib - 664 upas upas 1053275597 2715
+1053342129 0 c sys/src/9/bitsy/Booting101 - 664 sys sys 1053341743 7306
+1053342129 1 c sys/src/9/bitsy/screen.c - 664 sys sys 1053340962 10145
+1053342129 2 c sys/src/9/bitsy/wavelan.c - 664 sys sys 1053340976 27266
+1053401563 0 c sys/games/lib/fortunes - 664 sys sys 1053400198 243227

sys/games/lib/fortunes

@@ -3959,3 +3959,7 @@ To craunch the marmoset.
 IF YOU THINK THIS IS SPAM PLEASE REMOVE YOUR EMAIL OUR LIST
 Linux programmer's mind: don't invalidate the D-cache unless it wasn't enabled
 You should be automatically redirected to the new page in 0 seconds.
+`An improvement is something your program will not work with and a bug fix is something it will not work without' -- Roger Needham
+PLEASE! Don't urinate on the specimen.
+For those who only have time to read Slashdot, may God protect you on your journey towards technical obsolescence.  - David Patterson, on Slashdot
+Homeland security begins at home.  - Seattle mayor Greg Nickels

sys/src/9/bitsy/Booting101

@@ -57,16 +57,46 @@ the con program:
 	partition define params 0x040000 0x040000 0
 	partition define kernel 0x080000 0x0c0000 0
 	partition define user 0x140000 0x0c0000 0
-	partition define ramdisk 0x200000 0xa00000 0
-	partition define fs 0xc00000 0x400000 0
+	partition define ramdisk 0x200000 0x600000 0
+	partition define fs 0x800000 0x800000 0
 	params save
+
+These are the partitions as shown by partition show:
+	boot> partition show
+	argv[1]=partition
+	npartitions=00000006
+	bootldr
+	  base: 00000000
+	  size: 00040000
+	 flags: 00000002
+	params
+	  base: 00040000
+	  size: 00040000
+	 flags: 00000000
+	kernel
+	  base: 00080000
+	  size: 000C0000
+	 flags: 00000000
+	user
+	  base: 00140000
+	  size: 000C0000
+	 flags: 00000000
+	ramdisk
+	  base: 00200000
+	  size: 00600000
+	 flags: 00000000
+	fs
+	  base: 00800000
+	  size: 00800000
+	 flags: 00000000
+
 After each line you'll get a message like `defining partition: params'.
 Different versions of the bootloader predefine different partitions.
 The bootldr partitions is usually predefined, so you don't have to remake
 that.  You may have to delete one or two partitions.  The command is
 	partition delete <name>
 Make sure the partition layout is as given above; some of this knowledge is
-built into the kernel (/sys/src/9/boot/paq.c and /sys/src/9/bitsy/paqfiles/cpurc).
+built into the kernel.
 
 10. Before you can fill the new partitions with a kernel and a read-only
 file system, you'll have to make them.  In the directory /sys/src/9/bitsy,
@@ -99,7 +129,7 @@ Just wait a while or hit enter in the con window and it'll continue.
 14.  The bitsy will now want to calibrate the screen.  It'll put up a
 series of crosses that you should press the center of.  Hold the pen
 down over each cross for a second or so; aim carefully.  Hold the
-machine in your hand the way you'd normally use it or the calibration
+machine in your hand the way you'ld normally use it or the calibration
 could be off since there is depth to the glass in the screen.
 
 15.  You'll get a new screen with a single line at the top and a

sys/src/9/bitsy/screen.c

@@ -16,7 +16,7 @@
 
 #define	MINX	8
 
-int landscape = 1;	/* orientation of the screen, default is 0: portait */
+int landscape = 0;	/* orientation of the screen, default is 0: portait */
 
 enum {
 	Wid		= 240,

sys/src/9/bitsy/wavelan.c

@@ -562,7 +562,6 @@ w_scaninfo(Ether* ether, Ctlr *ctlr, int len)
 	scanbuf = malloc(len*2);
 	if(scanbuf == nil)
 		return;
-	
 	for (i = 0; i < len ; i++)
 		scanbuf[i] = csr_ins(ctlr, WR_Data1);
 
@@ -690,7 +689,7 @@ w_timer(void* arg)
 
 	ctlr->timerproc = up;
 	for(;;){
-		tsleep(&up->sleep, return0, 0, MSperTick);
+		tsleep(&ctlr->timer, return0, 0, MSperTick);
 		ctlr = (Ctlr*)ether->ctlr;
 		if(ctlr == 0)
 			break;
@@ -1208,7 +1207,7 @@ wavelanreset(Ether* ether, Ctlr *ctlr)
 	ether->scanbs = w_scanbs;
 	ether->arg = ether;
 
-	DEBUG("#l%d: irq %lud port %lx type %s",
+	DEBUG("#l%d: irq %ld port %lx type %s",
 		ether->ctlrno, ether->intnum, ether->ports[0].port,	ether->type);
 	DEBUG(" %2.2uX%2.2uX%2.2uX%2.2uX%2.2uX%2.2uX\n",
 		ether->ea[0], ether->ea[1], ether->ea[2],