Browse Source

Plan 9 from Bell Labs 2008-07-09

David du Colombier 12 years ago
parent
commit
c3adb85a56
4 changed files with 15 additions and 11 deletions
  1. 11 9
      386/bin/aux/vmware
  2. 1 1
      dist/replica/_plan9.db
  3. 1 1
      dist/replica/plan9.db
  4. 2 0
      dist/replica/plan9.log

+ 11 - 9
386/bin/aux/vmware

@@ -1,22 +1,24 @@
 #!/bin/rc
-
+# vmware - if we're running in a vmware virtual machine, tweak set up
 if(aux/isvmware -s){
+	echo hwaccel off >'#v/vgactl'
+
 	if(test -f '#P/pge'){
 		echo -n on >'#P/pge'	# default, but set anyway.
 		echo -n off >'#P/i8253timerset'
 	}
-	if(test -f /dev/archctl){
-		echo pge on >/dev/archctl
-		echo coherence nop >/dev/archctl
-		echo i8253set off >/dev/archctl
+	if(test -f '#P/archctl'){
+		echo pge on	>'#P/archctl'
+		echo coherence nop >'#P/archctl'
+		echo i8253set off  >'#P/archctl'
 	}
-	for(i in '#S'/sd??)
-		if(test -f $i/ctl)
-			echo dma on >$i/ctl
+
+	dmaon
+	echo -n hwaccel off >/dev/vgactl
 	aux/vmwarefs
+
 	if(! test -f /dev/snarf)
 		aux/stub /dev/snarf
 	bind /mnt/vmware/snarf /dev/snarf
 	aux/vmmousepoll &
 }
-

+ 1 - 1
dist/replica/_plan9.db

@@ -153,7 +153,7 @@
 386/bin/aux/usage - 775 sys sys 1168402288 59809
 386/bin/aux/vga - 775 sys sys 1210392593 334946
 386/bin/aux/vmmousepoll - 775 sys sys 1032480572 41434
-386/bin/aux/vmware - 775 sys sys 1049428256 453
+386/bin/aux/vmware - 775 sys sys 1215545344 532
 386/bin/aux/vmwarefs - 775 sys sys 1095563640 99117
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1108268388 3891

+ 1 - 1
dist/replica/plan9.db

@@ -153,7 +153,7 @@
 386/bin/aux/usage - 775 sys sys 1168402288 59809
 386/bin/aux/vga - 775 sys sys 1210392593 334946
 386/bin/aux/vmmousepoll - 775 sys sys 1032480572 41434
-386/bin/aux/vmware - 775 sys sys 1049428256 453
+386/bin/aux/vmware - 775 sys sys 1215545344 532
 386/bin/aux/vmwarefs - 775 sys sys 1095563640 99117
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1108268388 3891

+ 2 - 0
dist/replica/plan9.log

@@ -20040,3 +20040,5 @@
 1215403204 14 c acme/bin/386/Mail - 775 sys sys 1215402288 178813
 1215468004 0 c sys/src/libc/port/strdup.c - 664 sys sys 1215467473 188
 1215486004 0 c sys/src/libc/port/strdup.c - 664 sys sys 1014927404 153
+1215540005 0 c 386/bin/aux/vmware - 775 sys sys 1215538601 532
+1215545404 0 c 386/bin/aux/vmware - 775 sys sys 1215545344 532