Plan 9 from Bell Labs 2006-03-08

dist/replica/_plan9.db

@@ -5457,7 +5457,7 @@ rc/bin/nroff - 775 sys sys 945617208 27
 rc/bin/patch - 20000000775 sys sys 1067803227 0
 rc/bin/patch/applied - 775 sys sys 1115941614 111
 rc/bin/patch/apply - 775 sys sys 1109511606 1285
-rc/bin/patch/create - 775 sys sys 1127761278 1457
+rc/bin/patch/create - 775 sys sys 1141738939 1509
 rc/bin/patch/diff - 775 sys sys 1109511606 474
 rc/bin/patch/email - 775 sys sys 1109511607 409
 rc/bin/patch/list - 775 sys sys 1115941576 749
@@ -7334,7 +7334,7 @@ sys/man/1/ns - 664 sys sys 944959677 893
 sys/man/1/p - 664 sys sys 944959673 504
 sys/man/1/page - 664 sys sys 1087829646 5839
 sys/man/1/passwd - 664 sys sys 1113743327 1382
-sys/man/1/patch - 664 sys sys 1127761213 2237
+sys/man/1/patch - 664 sys sys 1141738937 2361
 sys/man/1/pcc - 664 sys sys 1015024740 3478
 sys/man/1/pic - 664 sys sys 1022625353 8229
 sys/man/1/pipefile - 664 sys sys 984709628 1861

dist/replica/plan9.db

@@ -5457,7 +5457,7 @@ rc/bin/nroff - 775 sys sys 945617208 27
 rc/bin/patch - 20000000775 sys sys 1067803227 0
 rc/bin/patch/applied - 775 sys sys 1115941614 111
 rc/bin/patch/apply - 775 sys sys 1109511606 1285
-rc/bin/patch/create - 775 sys sys 1127761278 1457
+rc/bin/patch/create - 775 sys sys 1141738939 1509
 rc/bin/patch/diff - 775 sys sys 1109511606 474
 rc/bin/patch/email - 775 sys sys 1109511607 409
 rc/bin/patch/list - 775 sys sys 1115941576 749
@@ -7334,7 +7334,7 @@ sys/man/1/ns - 664 sys sys 944959677 893
 sys/man/1/p - 664 sys sys 944959673 504
 sys/man/1/page - 664 sys sys 1087829646 5839
 sys/man/1/passwd - 664 sys sys 1113743327 1382
-sys/man/1/patch - 664 sys sys 1127761213 2237
+sys/man/1/patch - 664 sys sys 1141738937 2361
 sys/man/1/pcc - 664 sys sys 1015024740 3478
 sys/man/1/pic - 664 sys sys 1022625353 8229
 sys/man/1/pipefile - 664 sys sys 984709628 1861

dist/replica/plan9.log

@@ -27952,3 +27952,5 @@
 1141662642 3 c sys/src/cmd/webfs/http.c - 664 sys sys 1141662357 9487
 1141662642 4 c sys/src/cmd/unix/drawterm/Make.win32 - 664 sys sys 1141662620 826
 1141662642 5 c sys/src/cmd/unix/drawterm/gui-win32/screen.c - 664 sys sys 1141662620 11653
+1141740066 0 c rc/bin/patch/create - 775 sys sys 1141738939 1509
+1141740066 1 c sys/man/1/patch - 664 sys sys 1141738937 2361

rc/bin/patch/create

@@ -1,7 +1,12 @@
 #!/bin/rc
 rfork e
-if(~ $#* 0 1){
-	echo 'usage: patch/create name file... [< description]' >[1=2]
+
+fn xchmod { 
+	chmod $* >[2]/dev/null
+}
+
+if(~ $#* 0 1 2){
+	echo 'usage: patch/create name email file... [< description]' >[1=2]
 	exit usage
 }
 
@@ -9,6 +14,10 @@ if(! echo $1 | grep -s '^[a-z_0-9.\-]+$'){
 	echo 'bad name: [a-z0-9._\-]+ only' >[1=2]
 	exit usage
 }
+if(! echo $2 | grep -s '^(-|[A-Za-z0-9.\-+]+@[A-Za-z0-9.\-+]+)$'){
+	echo 'bad email: [a-z0-9.-+] only; use ''-'' to not leave an email address.' >[1=2]
+	exit usage
+}
 
 if(! test -d /n/sources/patch){
 	rfork n
@@ -16,17 +25,22 @@ if(! test -d /n/sources/patch){
 }
 
 patch=$1
+email=$2
+shift
+shift
 d=/n/sources/patch/$patch
 if(! mkdir $d){
 	echo mkdir $d failed >[1=2]
 	exit mkdir
 }
+if(! ~ $email -){
+	echo $email >$d/email
+}
 
-chmod o-w $d
+xchmod o-w $d
 >$d/readme
 >$d/files
 >$d/notes
-shift
 for(i in $*){
 	i=`{cleanname -d `{pwd} $i}
 	if(! test -f $i){
@@ -50,8 +64,8 @@ for(i in $*){
 	if not
 		echo warning: new file $i not on sources >[1=2]
 	echo $i $uniq >>$d/files
-	chmod ug+rw $d/*
-	chmod a+r $d/*
+	xchmod ug+rw $d/*
+	xchmod a+r $d/*
 }
 
 if(~ `{cat /proc/$pid/fd | awk 'NR==2{print $NF}'} */dev/cons && test -w /dev/consctl){
@@ -69,9 +83,4 @@ if(! test -s $d/readme){
 	exit oops
 }
 
-
-echo >[1=2] please run patch/email $patch your-email-address
-echo >[1=2] so that 9trouble can mail you if there are questions.  thanks.
-echo >[1=2] the email address will not be readable by other sources users.
-echo >[1=2]
 echo $d

sys/man/1/patch

@@ -4,6 +4,7 @@ patch \- simple patch creation and tracking system
 .SH SYNOPSIS
 .B patch/create
 .I name
+.I email
 .I files ...
 [
 .B < 
@@ -43,6 +44,12 @@ and is stored in
 creates a new patch consisting of the changes to
 the listed files, reading
 a description of the patch from standard input.
+The
+.I email
+address, if not
+.LR - ,
+will be sent notification messages when the patch is applied
+or commented on.
 .PP
 .I Patch/list
 displays information about the named patches,

sys/src/9/pc/devpccard.c

@@ -24,6 +24,9 @@ enum {
 	Ricoh_476_did = 0x0476,
 	Ricoh_478_did = 0x0478,
 
+	O2_vid = 0x1217,
+	O2_OZ711M3_did = 0x7134,
+
 	Nslots = 4,		/* Maximum number of CardBus slots to use */
 
 	K = 1024,
@@ -62,6 +65,7 @@ static Variant variant[] = {
 {	TI_vid,		TI_1450_did,	"TI PCI-1450 Cardbus Controller", },
 {	TI_vid,		TI_1251A_did,	"TI PCI-1251A Cardbus Controller", },
 {	TI_vid,		TI_1420_did,	"TI PCI-1420 Cardbus Controller", },
+{	O2_vid,		O2_OZ711M3_did,	"O2Micro OZ711M3 MemoryCardBus", },
 };
 
 /* Cardbus registers */
@@ -107,13 +111,6 @@ enum {
 	Tvg46x,
 };
 
-static char *chipname[] = {
-[Ti82365]		"Intel 82365SL",
-[Tpd6710]	"Cirrus Logic PD6710",
-[Tpd6720]	"Cirrus Logic PD6720",
-[Tvg46x]		"Vadem VG-46x",
-};
-
 /*
  *  Intel 82365SL PCIC controller for the PCMCIA or
  *  Cirrus Logic PD6710/PD6720 which is mostly register compatible

sys/src/9/pc/pci.c

@@ -651,6 +651,7 @@ static Bridge southbridges[] = {
 	{ 0x1022, 0x746B, nil, nil },		// AMD 8111
 	{ 0x10DE, 0x00D1, nil, nil },		// NVIDIA nForce 3
 	{ 0x1166, 0x0200, nil, nil },		// ServerWorks ServerSet III LE
+	{ 0x1002, 0x4377, nil, nil },		// ATI Radeon Xpress 200M
 };
 
 typedef struct Slot Slot;

sys/src/9/pc/sdata.c

@@ -1970,6 +1970,8 @@ atapnp(void)
 			 * Ditto, although it may have a different base
 			 * address for the registers (0x50?).
 			 */
+			/*FALLTHROUGH*/
+		case (0x4376<<16)|0x1002:	/* ATI Radeon Xpress 200M */
 			break;
 		case (0x0211<<16)|0x1166:	/* ServerWorks IB6566 */
 			{