Browse Source

Plan 9 from Bell Labs 2013-02-19

David du Colombier 6 years ago
parent
commit
dece86fc76
5 changed files with 21 additions and 4 deletions
  1. 6 0
      lib/constitution
  2. 1 0
      sys/man/4/fossil
  3. 1 0
      sys/man/8/venti
  4. 4 3
      sys/src/cmd/cdfs/mmc.c
  5. 9 1
      sys/src/cmd/ql/obj.c

+ 6 - 0
lib/constitution

@@ -1067,3 +1067,9 @@ account of age.
 
 Section 2.  The Congress shall have power to enforce this
 article by appropriate legislation.
+
+Article XXVII.
+
+No law, varying the compensation for the services of the
+Senators and Representatives, shall take effect, until an
+election of representatives shall have intervened.

+ 1 - 0
sys/man/4/fossil

@@ -258,6 +258,7 @@ notably the
 .B -c
 option to
 .BR open .
+30% is a reasonable choice.
 .PD
 .PP
 .I Flchk

+ 1 - 0
sys/man/8/venti

@@ -452,6 +452,7 @@ subsection.
 This percentage should be large enough to include the entire bloom filter.
 This overrides all other memory sizing parameters,
 including those on the command line and in the configuration file.
+25% is a reasonable choice.
 .TP
 .B -r
 Allow only read access to the venti data.

+ 4 - 3
sys/src/cmd/cdfs/mmc.c

@@ -1247,11 +1247,15 @@ alltrackinfo(Drive *drive, int first, int last)
 		if (osfx == nil || strcmp(osfx, drive->laysfx) != 0)
 			drive->relearn = 1;
 	}
+	if (drive->mmctype == Mmcnone)
+		return last;				/* no disc */
 	nwa = computenwa(drive, first, last);
 	aux = drive->aux;
 	if (vflag)
 		fprint(2, "nwa from drive %,ld; computed nwa %,ld\n",
 			aux->mmcnwa, nwa);
+	if (aux->mmcnwa == -1 && nwa == 0)
+		return last;			/* probably a blank disc */
 	if (aux->mmcnwa == -1)
 		fprint(2, "%s: disc is full\n", argv0);
 	/* reconcile differing nwas */
@@ -1701,9 +1705,6 @@ mmcxwrite(Otrack *o, void *v, long nblk)
 	aux->ntotby += nblk * bs;
 	aux->ntotbk += nblk;
 
-	while (scsiready(drive) < 0)		/* paranoia */
-		sleep(0);
-
 	/*
 	 * "write and verify" (ScmdExtwritever) only works on write-once media
 	 * and not on CDs (mmc-6 §6.48.1).

+ 9 - 1
sys/src/cmd/ql/obj.c

@@ -203,7 +203,6 @@ main(int argc, char *argv[])
 			INITRND = 0;
 		break;
 	case 5:	/* elf executable */
-	case 6:	/* elf for virtex 4 */
 		HEADR = rnd(52L+3*32L, 16);
 		if(INITTEXT == -1)
 			INITTEXT = 0x00400000L+HEADR;
@@ -212,6 +211,15 @@ main(int argc, char *argv[])
 		if(INITRND == -1)
 			INITRND = 0;
 		break;
+	case 6:	/* elf for virtex 4 */
+		HEADR = rnd(52L+4*32L, 16);
+		if(INITTEXT == -1)
+			INITTEXT = 0x00400000L+HEADR;
+		if(INITDAT == -1)
+			INITDAT = 0x10000000;
+		if(INITRND == -1)
+			INITRND = 0;
+		break;
 	}
 	if(INITDAT != 0 && INITRND != 0)
 		print("warning: -D0x%lux is ignored because of -R0x%lux\n",