Browse Source

Plan 9 from Bell Labs 2006-11-07

David du Colombier 14 years ago
parent
commit
9d724cc8f7

+ 3 - 3
dist/replica/_plan9.db

@@ -46,7 +46,7 @@
 386/bin/auth/aescbc - 775 sys sys 1158607303 140962
 386/bin/auth/asn12rsa - 775 sys sys 1162241032 120927
 386/bin/auth/authsrv - 775 sys sys 1162241033 166705
-386/bin/auth/changeuser - 775 sys sys 1148500575 97390
+386/bin/auth/changeuser - 775 sys sys 1162871997 97582
 386/bin/auth/convkeys - 775 sys sys 1158607304 88100
 386/bin/auth/convkeys2 - 775 sys sys 1158607304 88159
 386/bin/auth/cron - 775 sys sys 1152291495 144824
@@ -8047,7 +8047,7 @@ sys/src/9/pc/trap.c - 664 sys sys 1135487942 21257
 sys/src/9/pc/uartaxp.c - 664 sys sys 1158803840 18862
 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 1155995486 3109
+sys/src/9/pc/uartpci.c - 664 sys sys 1162859151 3617
 sys/src/9/pc/usb.h - 664 sys sys 1099760881 3650
 sys/src/9/pc/usbuhci.c - 664 sys sys 1154725785 30910
 sys/src/9/pc/vga.c - 664 sys sys 1131290595 5148
@@ -9503,7 +9503,7 @@ sys/src/cmd/auth/lib - 20000000775 sys sys 1015008430 0
 sys/src/cmd/auth/lib/error.c - 664 sys sys 1155994850 318
 sys/src/cmd/auth/lib/fs.c - 664 sys sys 1015008430 228
 sys/src/cmd/auth/lib/getauthkey.c - 664 sys sys 1155994850 451
-sys/src/cmd/auth/lib/getexpiration.c - 664 sys sys 1155994850 1574
+sys/src/cmd/auth/lib/getexpiration.c - 664 sys sys 1162844529 1574
 sys/src/cmd/auth/lib/keyfmt.c - 664 sys sys 1155994850 508
 sys/src/cmd/auth/lib/log.c - 664 sys sys 1155994850 618
 sys/src/cmd/auth/lib/mkfile - 664 sys sys 1152223363 386

+ 3 - 3
dist/replica/plan9.db

@@ -46,7 +46,7 @@
 386/bin/auth/aescbc - 775 sys sys 1158607303 140962
 386/bin/auth/asn12rsa - 775 sys sys 1162241032 120927
 386/bin/auth/authsrv - 775 sys sys 1162241033 166705
-386/bin/auth/changeuser - 775 sys sys 1148500575 97390
+386/bin/auth/changeuser - 775 sys sys 1162871997 97582
 386/bin/auth/convkeys - 775 sys sys 1158607304 88100
 386/bin/auth/convkeys2 - 775 sys sys 1158607304 88159
 386/bin/auth/cron - 775 sys sys 1152291495 144824
@@ -8047,7 +8047,7 @@ sys/src/9/pc/trap.c - 664 sys sys 1135487942 21257
 sys/src/9/pc/uartaxp.c - 664 sys sys 1158803840 18862
 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 1155995486 3109
+sys/src/9/pc/uartpci.c - 664 sys sys 1162859151 3617
 sys/src/9/pc/usb.h - 664 sys sys 1099760881 3650
 sys/src/9/pc/usbuhci.c - 664 sys sys 1154725785 30910
 sys/src/9/pc/vga.c - 664 sys sys 1131290595 5148
@@ -9503,7 +9503,7 @@ sys/src/cmd/auth/lib - 20000000775 sys sys 1015008430 0
 sys/src/cmd/auth/lib/error.c - 664 sys sys 1155994850 318
 sys/src/cmd/auth/lib/fs.c - 664 sys sys 1015008430 228
 sys/src/cmd/auth/lib/getauthkey.c - 664 sys sys 1155994850 451
-sys/src/cmd/auth/lib/getexpiration.c - 664 sys sys 1155994850 1574
+sys/src/cmd/auth/lib/getexpiration.c - 664 sys sys 1162844529 1574
 sys/src/cmd/auth/lib/keyfmt.c - 664 sys sys 1155994850 508
 sys/src/cmd/auth/lib/log.c - 664 sys sys 1155994850 618
 sys/src/cmd/auth/lib/mkfile - 664 sys sys 1152223363 386

+ 3 - 0
dist/replica/plan9.log

@@ -31698,3 +31698,6 @@
 1162423806 0 c sys/man/8/reboot - 664 sys sys 1162423006 443
 1162441806 0 c 386/bin/aux/reboot - 775 sys sys 1162440193 62256
 1162441806 1 c 386/bin/telnet - 775 sys sys 1162440194 80751
+1162845005 0 c sys/src/cmd/auth/lib/getexpiration.c - 664 sys sys 1162844529 1574
+1162859406 0 c sys/src/9/pc/uartpci.c - 664 sys sys 1162859151 3617
+1162872004 0 c 386/bin/auth/changeuser - 775 sys sys 1162871997 97582

+ 19 - 0
sys/src/9/pc/uartpci.c

@@ -75,6 +75,25 @@ uartpcipnp(void)
 				continue;
 			uart->next = uartpci(ctlrno, p, 1, 1, 1843200, "PCI2S550-1");
 			break;
+		case (0x950A<<16)|0x1415:	/* Oxford Semi OX16PCI954 */
+			/*
+			 * These are common devices used by 3rd-party
+			 * manufacturers.
+			 * Must check the subsystem VID and DID for correct
+			 * match.
+			 */
+			subid = pcicfgr16(p, PciSVID);
+			subid |= pcicfgr16(p, PciSID)<<16;
+			switch(subid){
+			default:
+				continue;
+			case (0x2000<<16)|0x131F:/* SIIG CyberSerial PCIe */
+				uart = uartpci(ctlrno, p, 0, 1, 18432000, "CyberSerial-1S");
+					if(uart == nil)
+						continue;
+				break;
+			}
+			break;
 		case (0x9050<<16)|0x10B5:	/* Perle PCI-Fast4 series */
 		case (0x9030<<16)|0x10B5:	/* Perle Ultraport series */
 			/*

+ 2 - 2
sys/src/cmd/auth/lib/getexpiration.c

@@ -35,8 +35,8 @@ getexpiration(char *db, char *u)
 	char prompt[128];
 	char cdate[32];
 	Tm date;
-	ulong secs, now, fd;
-	int n;
+	ulong secs, now;
+	int n, fd;
 
 	/* read current expiration (if any) */
 	snprint(buf, sizeof buf, "%s/%s/expire", db, u);