Browse Source

Plan 9 from Bell Labs 2003-05-28

David du Colombier 21 years ago
parent
commit
9bd22ef33f
4 changed files with 14 additions and 28 deletions
  1. 5 5
      dist/replica/plan9.db
  2. 5 0
      dist/replica/plan9.log
  3. 2 0
      sys/games/lib/fortunes
  4. 2 23
      sys/src/9/pc/sdata.c

+ 5 - 5
dist/replica/plan9.db

@@ -140,7 +140,7 @@
 386/bin/aux/stub - 775 sys sys 1053200910 136360
 386/bin/aux/tcpostio - 775 sys sys 1048745028 196997
 386/bin/aux/text2post - 775 sys sys 1039758546 77253
-386/bin/aux/timesync - 775 sys sys 1053200911 127815
+386/bin/aux/timesync - 775 sys sys 1054017074 127890
 386/bin/aux/tr2post - 775 sys sys 1045537960 175522
 386/bin/aux/trampoline - 775 sys sys 1045537960 81157
 386/bin/aux/typepasswd - 775 sys sys 1045537960 68154
@@ -338,7 +338,7 @@
 386/bin/read - 775 sys sys 1039758585 56544
 386/bin/replica - 20000000775 sys sys 1018321168 0
 386/bin/replica/applychanges - 775 sys sys 1045538045 99047
-386/bin/replica/applylog - 775 sys sys 1045538046 99757
+386/bin/replica/applylog - 775 sys sys 1054017074 99904
 386/bin/replica/changes - 775 sys sys 1020319082 42
 386/bin/replica/compactdb - 775 sys sys 1039758586 77913
 386/bin/replica/pull - 775 sys sys 1020319083 39
@@ -350,7 +350,7 @@
 386/bin/rio - 775 sys sys 1046368790 302875
 386/bin/rm - 775 sys sys 1045538047 60036
 386/bin/rtstats - 775 sys sys 1048745063 177363
-386/bin/rx - 775 sys sys 1053200931 79568
+386/bin/rx - 775 sys sys 1054017075 79737
 386/bin/sam - 775 sys sys 1045538049 156896
 386/bin/scat - 775 sys sys 1045538050 282041
 386/bin/scp - 775 sys sys 1053200932 150552
@@ -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 1053573344 243317
+sys/games/lib/fortunes - 664 sys sys 1054049159 243650
 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
@@ -5186,7 +5186,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1048644129 3760
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1033134905 51568
 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 1053837290 46979
+sys/src/9/pc/sdata.c - 664 sys sys 1054088388 46387
 sys/src/9/pc/sdmylex.c - 664 sys sys 1015014523 27750
 sys/src/9/pc/sdscsi.c - 664 sys sys 1015014523 7412
 sys/src/9/pc/trap.c - 664 sys sys 1047261661 18991

+ 5 - 0
dist/replica/plan9.log

@@ -12028,3 +12028,8 @@
 1053574342 0 c sys/games/lib/fortunes - 664 sys sys 1053573344 243317
 1053577945 0 c sys/man/8/plan9.ini - 664 sys sys 1053576234 20536
 1053838936 0 c sys/src/9/pc/sdata.c - 664 sys sys 1053837290 46979
+1054017174 0 c 386/bin/replica/applylog - 775 sys sys 1054017074 99904
+1054017174 1 c 386/bin/rx - 775 sys sys 1054017075 79737
+1054017174 2 c 386/bin/aux/timesync - 775 sys sys 1054017074 127890
+1054049560 0 c sys/games/lib/fortunes - 664 sys sys 1054049159 243650
+1054089063 0 c sys/src/9/pc/sdata.c - 664 sys sys 1054088388 46387

+ 2 - 0
sys/games/lib/fortunes

@@ -3965,3 +3965,5 @@ For those who only have time to read Slashdot, may God protect you on your journ
 Homeland security begins at home.  - Seattle mayor Greg Nickels
                1 Dir(s)  70,368,744,161,280 bytes free
 Has Your Life Been Ruined by Evil?
+smtpdaemon is needed by diskcheck-1.4.2 	- Red Hat Linux
+You want to make your way in the CS field? Simple. Calculate rough time of amnesia (hell, 10 years is plenty, probably 10 months is plenty), go to the dusty archives, dig out something fun, and go for it.   It's worked for many people, and it can work for you.  - Ron Minnich

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

@@ -73,7 +73,6 @@ enum {					/* Device/Head */
 	Dev1		= 0xB0,		/* Slave */
 	Lba		= 0x40,		/* LBA mode */
 	Lba48	= 0x100,		/* LBA48 mode (internal use only) */
-	Lba48always	= 0x200,	/* LBA48 mode always (internal use only) */
 };
 
 enum {					/* Status, Alternate Status */
@@ -608,17 +607,11 @@ retry:
 			drive->sectors = (drive->info[Ilba1]<<16)
 					 |drive->info[Ilba0];
 			drive->dev |= Lba;
+			print("LBA %llux\n", drive->sectors);
 			if(drive->info[Icapabilities] & 0x0400){
 				sectors = drive->info[Ilba48]
 					| (drive->info[Ilba48+1]<<16)
 					| ((vlong)drive->info[Ilba48+2]<<32);
-				/*
-				 * BUG: I'm not convinced that Icap & 0x0400
-				 * is the right bit to check for Lba48, because
-				 * most drives seem to have it set, and the ones
-				 * that are smaller than 137GB have sectors == 0.
-				 * Let's ignore those.
-				 */
 				if(sectors){
 					drive->sectors = sectors;
 					drive->dev |= Lba48|Lba;
@@ -1231,7 +1224,7 @@ atageniostart(Drive* drive, ulong lba)
 	int as, c, cmdport, ctlport, h, len, s, use48;
 
 	use48 = 0;
-	if((drive->dev&Lba48always) || (lba>>28)){
+	if(lba>>28){
 		if(!(drive->dev & Lba48))
 			return -1;
 		use48 = 1;
@@ -2037,20 +2030,6 @@ atawctl(SDunit* unit, Cmdbuf* cb)
 		if(atastandby(drive, period) != SDok)
 			error(Ebadctl);
 	}
-	else if(strcmp(cb->f[0], "48always") == 0){
-		switch(cb->nf){
-		default:
-			error(Ebadctl);
-		case 2:
-			if(strcmp(cb->f[1], "on") == 0)
-				drive->dev |= Lba48always;
-			else if(strcmp(cb->f[1], "off") == 0)
-				drive->dev &= ~Lba48always;
-			else
-				error(Ebadctl);
-			break;
-		}
-	}
 	else
 		error(Ebadctl);
 	qunlock(drive);