Browse Source

Plan 9 from Bell Labs 2004-11-04

David du Colombier 19 years ago
parent
commit
dfdc7851bc
6 changed files with 57 additions and 25 deletions
  1. 4 3
      dist/replica/_plan9.db
  2. 4 4
      dist/replica/plan9.db
  3. 4 0
      dist/replica/plan9.log
  4. 14 1
      sys/man/1/cpu
  5. 23 15
      sys/src/9/pc/sdata.c
  6. 8 2
      sys/src/cmd/acme/text.c

+ 4 - 3
dist/replica/_plan9.db

@@ -4671,7 +4671,7 @@ sys/man/1/comm - 664 sys sys 944959675 665
 sys/man/1/con - 664 sys sys 1071156278 4318
 sys/man/1/cp - 664 sys sys 1015024738 1390
 sys/man/1/cpp - 664 sys sys 944959674 2105
-sys/man/1/cpu - 664 sys sys 1079576028 3328
+sys/man/1/cpu - 664 sys sys 1099501544 3540
 sys/man/1/crop - 664 sys sys 984709627 2596
 sys/man/1/date - 664 sys sys 969499884 996
 sys/man/1/db - 664 sys sys 1015024738 17862
@@ -5426,7 +5426,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1086987325 52219
 sys/src/9/pc/sd53c8xx.i - 664 sys sys 1045063730 27355
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1032059019 12455
-sys/src/9/pc/sdata.c - 664 sys sys 1096467467 50899
+sys/src/9/pc/sdata.c - 664 sys sys 1099487462 50970
 sys/src/9/pc/sdmylex.c - 664 sys sys 1071245460 27812
 sys/src/9/pc/sdscsi.c - 664 sys sys 1077033661 7487
 sys/src/9/pc/trap.c - 664 sys sys 1092080705 20458
@@ -6803,7 +6803,7 @@ sys/src/cmd/acme/mkfile - 664 sys sys 1058463682 543
 sys/src/cmd/acme/regx.c - 664 sys sys 1014926094 16057
 sys/src/cmd/acme/rows.c - 664 sys sys 1084542482 14664
 sys/src/cmd/acme/scrl.c - 664 sys sys 1014926095 3072
-sys/src/cmd/acme/text.c - 664 sys sys 1098466676 27550
+sys/src/cmd/acme/text.c - 664 sys sys 1099500744 27642
 sys/src/cmd/acme/time.c - 664 sys sys 1014926095 1783
 sys/src/cmd/acme/util.c - 664 sys sys 1079102916 7412
 sys/src/cmd/acme/wind.c - 664 sys sys 1096388102 11187
@@ -12392,3 +12392,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/acme - 775 sys sys 1099541194 425223

+ 4 - 4
dist/replica/plan9.db

@@ -20,7 +20,7 @@
 386/bin/9660srv - 775 sys sys 1085076971 101995
 386/bin/aan - 775 sys sys 1085076971 128820
 386/bin/acid - 775 sys sys 1091936087 353717
-386/bin/acme - 775 sys sys 1099368725 425143
+386/bin/acme - 775 sys sys 1099541194 425223
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1087442501 132681
 386/bin/ape/cc - 775 sys sys 1085076973 68304
@@ -4671,7 +4671,7 @@ sys/man/1/comm - 664 sys sys 944959675 665
 sys/man/1/con - 664 sys sys 1071156278 4318
 sys/man/1/cp - 664 sys sys 1015024738 1390
 sys/man/1/cpp - 664 sys sys 944959674 2105
-sys/man/1/cpu - 664 sys sys 1079576028 3328
+sys/man/1/cpu - 664 sys sys 1099501544 3540
 sys/man/1/crop - 664 sys sys 984709627 2596
 sys/man/1/date - 664 sys sys 969499884 996
 sys/man/1/db - 664 sys sys 1015024738 17862
@@ -5426,7 +5426,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1086987325 52219
 sys/src/9/pc/sd53c8xx.i - 664 sys sys 1045063730 27355
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1032059019 12455
-sys/src/9/pc/sdata.c - 664 sys sys 1096467467 50899
+sys/src/9/pc/sdata.c - 664 sys sys 1099487462 50970
 sys/src/9/pc/sdmylex.c - 664 sys sys 1071245460 27812
 sys/src/9/pc/sdscsi.c - 664 sys sys 1077033661 7487
 sys/src/9/pc/trap.c - 664 sys sys 1092080705 20458
@@ -6803,7 +6803,7 @@ sys/src/cmd/acme/mkfile - 664 sys sys 1058463682 543
 sys/src/cmd/acme/regx.c - 664 sys sys 1014926094 16057
 sys/src/cmd/acme/rows.c - 664 sys sys 1084542482 14664
 sys/src/cmd/acme/scrl.c - 664 sys sys 1014926095 3072
-sys/src/cmd/acme/text.c - 664 sys sys 1098466676 27550
+sys/src/cmd/acme/text.c - 664 sys sys 1099500744 27642
 sys/src/cmd/acme/time.c - 664 sys sys 1014926095 1783
 sys/src/cmd/acme/util.c - 664 sys sys 1079102916 7412
 sys/src/cmd/acme/wind.c - 664 sys sys 1096388102 11187

+ 4 - 0
dist/replica/plan9.log

@@ -16963,3 +16963,7 @@
 1099193465 3 c 386/bin/auth/factotum - 775 sys sys 1099192345 312170
 1099330291 0 c sys/src/cmd/acme/exec.c - 664 sys sys 1099329953 28183
 1099369899 0 c 386/bin/acme - 775 sys sys 1099368725 425143
+1099488721 0 c sys/src/9/pc/sdata.c - 664 sys sys 1099487462 50970
+1099501324 0 c sys/src/cmd/acme/text.c - 664 sys sys 1099500744 27642
+1099503004 0 c sys/man/1/cpu - 664 sys sys 1099501544 3540
+1099542611 0 c 386/bin/acme - 775 sys sys 1099541194 425223

+ 14 - 1
sys/man/1/cpu

@@ -13,6 +13,9 @@ cpu \- connection to cpu server
 .B -a
 .I auth-method
 ] [
+.B -P
+.I patternfile
+] [
 .B -e
 .I encryption-hash-algs
 ] [
@@ -76,6 +79,15 @@ on the server, and then
 .I cpu
 exits.
 .PP
+If a
+.B -P
+argument is present, the
+.I patternfile
+is passed to
+.IR exportfs (1)
+to control how much of the local name space will be exported to
+the remote system.
+.PP
 The
 .B -a
 command allows the user to specify the authentication mechanism used
@@ -157,7 +169,8 @@ are bound to their standard locations from there.
 .B /sys/src/cmd/cpu.c
 .SH SEE ALSO
 .IR rc (1) ,
-.IR rio (1)
+.IR rio (1) ,
+.IR exportfs (1)
 .SH BUGS
 Binds and mounts done after the terminal
 .B lib/profile

+ 23 - 15
sys/src/9/pc/sdata.c

@@ -76,11 +76,6 @@ enum {					/* Device/Head */
 	Lba		= 0x40,		/* LBA mode */
 };
 
-enum {					/* internal flags */
-	Lba48		= 0x1,		/* LBA48 mode */
-	Lba48always	= 0x2,		/* ... */
-};
-
 enum {					/* Status, Alternate Status */
 	Err		= 0x01,		/* Error */
 	Chk		= 0x01,		/* Check error (PACKET) */
@@ -330,6 +325,11 @@ typedef struct Drive {
 	int	flags;			/* internal flags */
 } Drive;
 
+enum {					/* internal flags */
+	Lba48		= 0x1,		/* LBA48 mode */
+	Lba48always	= 0x2,		/* ... */
+};
+
 static void
 pc87415ienable(Ctlr* ctlr)
 {
@@ -671,7 +671,8 @@ retry:
 			drive->c = drive->info[Iccyl];
 			drive->h = drive->info[Ichead];
 			drive->s = drive->info[Icsec];
-		}else{
+		}
+		else{
 			drive->c = drive->info[Ilcyl];
 			drive->h = drive->info[Ilhead];
 			drive->s = drive->info[Ilsec];
@@ -682,12 +683,14 @@ retry:
 					| (drive->info[Ilba48+1]<<16)
 					| ((vlong)drive->info[Ilba48+2]<<32);
 				drive->flags |= Lba48;
-			}else{
+			}
+			else{
 				drive->sectors = (drive->info[Ilba+1]<<16)
 					 |drive->info[Ilba];
 			}
 			drive->dev |= Lba;
-		}else
+		}
+		else
 			drive->sectors = drive->c*drive->h*drive->s;
 		atarwmmode(drive, cmdport, ctlport, dev);
 	}
@@ -699,9 +702,10 @@ retry:
 		print(" mwdma %4.4uX", drive->info[Imwdma]);
 		if(drive->info[Ivalid] & 0x04)
 			print(" udma %4.4uX", drive->info[Iudma]);
-		print(" dma %8.8uX rwm %ud\n", drive->dma, drive->rwm);
+		print(" dma %8.8uX rwm %ud", drive->dma, drive->rwm);
 		if(drive->flags&Lba48)
-			print("\tLLBA sectors %lld\n", drive->sectors);
+			print("\tLLBA sectors %lld", drive->sectors);
+		print("\n");
 	}
 
 	return drive;
@@ -1310,11 +1314,13 @@ atageniostart(Drive* drive, vlong lba)
 			return -1;
 		use48 = 1;
 		c = h = s = 0;
-	}else if(drive->dev & Lba){
+	}
+	else if(drive->dev & Lba){
 		c = (lba>>8) & 0xFFFF;
 		h = (lba>>24) & 0x0F;
 		s = lba & 0xFF;
-	}else{
+	}
+	else{
 		c = lba/(drive->s*drive->h);
 		h = ((lba/drive->s) % drive->h);
 		s = (lba % drive->s) + 1;
@@ -1363,7 +1369,8 @@ atageniostart(Drive* drive, vlong lba)
 
 		if(DEBUG & Dbg48BIT)
 			print("using 48-bit commands\n");
-	}else{
+	}
+	else{
 		outb(cmdport+Count, drive->count);
 		outb(cmdport+Sector, s);
 		outb(cmdport+Cyllo, c);
@@ -1903,6 +1910,7 @@ atapnp(void)
 			 * address for the registers (0x50?).
 			 */
 			break;
+		case (0x5513<<16)|0x1039:	/* SiS 962 */
 		case (0x0646<<16)|0x1095:	/* CMD 646 */
 		case (0x0571<<16)|0x1106:	/* VIA 82C686 */
 		case (0x0211<<16)|0x1166:	/* ServerWorks IB6566 */
@@ -2203,7 +2211,7 @@ SDifc sdataifc = {
 	atalegacy,			/* legacy */
 	ataid,				/* id */
 	ataenable,			/* enable */
-	atadisable,		/* disable */
+	atadisable,			/* disable */
 
 	scsiverify,			/* verify */
 	scsionline,			/* online */
@@ -2212,7 +2220,7 @@ SDifc sdataifc = {
 	atawctl,			/* wctl */
 
 	scsibio,			/* bio */
-	ataprobew,		/* probe */
+	ataprobew,			/* probe */
 	ataclear,			/* clear */
 	atastat,			/* stat */
 };

+ 8 - 2
sys/src/cmd/acme/text.c

@@ -646,13 +646,19 @@ texttype(Text *t, Rune r)
 	switch(r){
 	case Kleft:
 		if(t->q0 > 0){
-			wincommit(t->w, t);
+			if(t->w)
+				wincommit(t->w, t);
+			else
+				textcommit(t, TRUE);
 			textshow(t, t->q0-1, t->q0-1, TRUE);
 		}
 		return;
 	case Kright:
 		if(t->q1 < t->file->nc){
-			wincommit(t->w, t);
+			if(t->w)
+				wincommit(t->w, t);
+			else
+				textcommit(t, TRUE);
 			textshow(t, t->q1+1, t->q1+1, TRUE);
 		}
 		return;