Browse Source

Plan 9 from Bell Labs 2006-08-05

David du Colombier 14 years ago
parent
commit
1bd881bf31
5 changed files with 13 additions and 7 deletions
  1. 2 2
      dist/replica/_plan9.db
  2. 2 2
      dist/replica/plan9.db
  3. 2 0
      dist/replica/plan9.log
  4. 6 2
      sys/src/9/pc/usbuhci.c
  5. 1 1
      sys/src/cmd/ssh/util.c

+ 2 - 2
dist/replica/_plan9.db

@@ -8035,7 +8035,7 @@ sys/src/9/pc/uarti8250.c - 664 sys sys 1102820421 13958
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
 sys/src/9/pc/uartpci.c - 664 sys sys 1096379063 2891
 sys/src/9/pc/usb.h - 664 sys sys 1099760881 3650
-sys/src/9/pc/usbuhci.c - 664 sys sys 1152730364 30793
+sys/src/9/pc/usbuhci.c - 664 sys sys 1154725785 30910
 sys/src/9/pc/vga.c - 664 sys sys 1131290595 5148
 sys/src/9/pc/vga3dfx.c - 664 sys sys 1133218367 3833
 sys/src/9/pc/vgaark2000pv.c - 664 sys sys 1131290600 3422
@@ -13304,7 +13304,7 @@ sys/src/cmd/ssh/ssh.c - 664 sys sys 1133821217 9671
 sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086
 sys/src/cmd/ssh/sshnet.c - 664 sys sys 1078840016 17641
 sys/src/cmd/ssh/sshserve.c - 664 sys sys 1135487956 5772
-sys/src/cmd/ssh/util.c - 664 sys sys 1063858753 4478
+sys/src/cmd/ssh/util.c - 664 sys sys 1154722953 4522
 sys/src/cmd/stats.c - 664 sys sys 1127974208 28128
 sys/src/cmd/strings.c - 664 sys sys 1146317512 1231
 sys/src/cmd/strip.c - 664 sys sys 1131293244 2502

+ 2 - 2
dist/replica/plan9.db

@@ -8035,7 +8035,7 @@ sys/src/9/pc/uarti8250.c - 664 sys sys 1102820421 13958
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
 sys/src/9/pc/uartpci.c - 664 sys sys 1096379063 2891
 sys/src/9/pc/usb.h - 664 sys sys 1099760881 3650
-sys/src/9/pc/usbuhci.c - 664 sys sys 1152730364 30793
+sys/src/9/pc/usbuhci.c - 664 sys sys 1154725785 30910
 sys/src/9/pc/vga.c - 664 sys sys 1131290595 5148
 sys/src/9/pc/vga3dfx.c - 664 sys sys 1133218367 3833
 sys/src/9/pc/vgaark2000pv.c - 664 sys sys 1131290600 3422
@@ -13304,7 +13304,7 @@ sys/src/cmd/ssh/ssh.c - 664 sys sys 1133821217 9671
 sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086
 sys/src/cmd/ssh/sshnet.c - 664 sys sys 1078840016 17641
 sys/src/cmd/ssh/sshserve.c - 664 sys sys 1135487956 5772
-sys/src/cmd/ssh/util.c - 664 sys sys 1063858753 4478
+sys/src/cmd/ssh/util.c - 664 sys sys 1154722953 4522
 sys/src/cmd/stats.c - 664 sys sys 1127974208 28128
 sys/src/cmd/strings.c - 664 sys sys 1146317512 1231
 sys/src/cmd/strip.c - 664 sys sys 1131293244 2502

+ 2 - 0
dist/replica/plan9.log

@@ -30221,3 +30221,5 @@
 1153839605 0 c sys/games/lib/fortunes - 664 sys sys 1153838057 260146
 1154068205 0 c sys/src/fs/pc/ether82557.c - 664 sys sys 1154067789 30710
 1154460605 0 c sys/man/8/plan9.ini - 664 sys sys 1154459321 22479
+1154723405 0 c sys/src/cmd/ssh/util.c - 664 sys sys 1154722953 4522
+1154727005 0 c sys/src/9/pc/usbuhci.c - 664 sys sys 1154725785 30910

+ 6 - 2
sys/src/9/pc/usbuhci.c

@@ -1380,8 +1380,12 @@ scanpci(void)
 			io = p->mem[4].bar & ~0x0F;
 			break;
 		case 0x10:
-			print("usbohci: %x/%x port 0x%lux size 0x%x irq %d\n",
-				p->vid, p->did, p->mem[0].bar & ~0x0F, p->mem[0].size, p->intl);
+		case 0x20:
+			print("usb%chci: %x/%x %sport 0x%lux size 0x%x irq %d (ignored)\n",
+				(p->ccrp == 0x10? 'o': 'e'), p->vid, p->did,
+				(p->ccrp == 0x10? "": "USB 2 "),
+				p->mem[0].bar & ~0x0F, p->mem[0].size, p->intl);
+			/* fallthrough */
 		default:
 			continue;
 		}

+ 1 - 1
sys/src/cmd/ssh/util.c

@@ -259,7 +259,7 @@ privatefactotum(void)
 
 	if((user=getuser()) && (d=dirstat("/mnt/factotum/rpc")) && strcmp(user, d->uid)!=0){
 		/* grab the terminal's factotum */
-		rfork(RFNOTEG);
+		rfork(RFNAMEG);	/* was RFNOTEG, which makes little sense */
 		if(access("/mnt/term/mnt/factotum", AEXIST) >= 0){
 //			fprint(2, "binding terminal's factotum\n");
 			if(bind("/mnt/term/mnt/factotum", "/mnt/factotum", MREPL) < 0)