From 4efbe6d4f2e02bc39ede3388fd65c4d08a6c56ad Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sun, 16 Jul 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-07-16

---
 pc/devlml.c     | 8 ++++----
 pc/mouse.c      | 2 +-
 pc/sdmylex.c    | 8 ++++----
 port/dev.c      | 2 +-
 port/devmouse.c | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pc/devlml.c b/pc/devlml.c
index 604f184336c4106c70d4c7bd22a5047b177d66bb..0d604c0c77a1ab08fed826441d32020a442f16e0 100644
--- a/pc/devlml.c
+++ b/pc/devlml.c
@@ -17,7 +17,7 @@ static Pcidev *		pcidev;
 #define DBGINTR	0x04
 #define DBGINTS	0x08
 
-int debug = 0;
+int debug = -1;
 
 // Lml 22 driver
 
@@ -328,15 +328,15 @@ lmlintr(Ureg *, void *) {
 	ulong fstart, fno;
 	ulong flags = readl(pciBaseAddr+INTR_STAT);
 	
-	if(debug&(DBGINTR))
-		print("MjpgDrv_intrHandler stat=0x%.8lux\n", flags);
-
 	// Reset all interrupts from 067
 	writel(0xff000000, pciBaseAddr + INTR_STAT);
 
 	if(flags & INTR_JPEGREP) {
 		vlong thetime;
 
+		if(debug&(DBGINTR))
+			print("MjpgDrv_intrHandler stat=0x%.8lux\n", flags);
+
 		fstart = jpgframeno & 0x00000003;
 		for (;;) {
 			jpgframeno++;
diff --git a/pc/mouse.c b/pc/mouse.c
index a5aec038466ef7b9b860529a3e96c6488e79778a..cef043819ecea09c321d3aca9e05785f80500845 100644
--- a/pc/mouse.c
+++ b/pc/mouse.c
@@ -59,7 +59,7 @@ ps2mouseputc(int c, int shift)
 {
 	static short msg[3];
 	static int nb;
-	static uchar b[] = {0, 1, 4, 5, 2, 3, 6, 7, 0, 1, 2, 5, 2, 3, 6, 7 };
+	static uchar b[] = {0, 1, 4, 5, 2, 3, 6, 7, 0, 1, 2, 3, 2, 3, 6, 7 };
 	int buttons, dx, dy;
 
 	/* 
diff --git a/pc/sdmylex.c b/pc/sdmylex.c
index 6be4bca938a7f089b399ceb066b11e9e30f76ac4..dcc759a0a218b595021e635d886681558ae49a2e 100644
--- a/pc/sdmylex.c
+++ b/pc/sdmylex.c
@@ -288,7 +288,7 @@ mylex24rio(SDreq* r)
 	ulong p;
 	Ctlr *ctlr;
 	Ccb24 *ccb;
-	Mbox32 *mb;
+	Mbox24 *mb;
 	uchar *data, lun, *sense;
 	int d, n, btstat, sdstat, target;
 
@@ -306,7 +306,7 @@ mylex24rio(SDreq* r)
 	if(ccb = ctlr->cache[target]){
 		ctlr->cache[target] = nil;
 		if(r->cmd[0] == 0x03
-		  && ccb->sdstat == SDcheck && lun == ((ccb->cs[1]>>5) & 0x07)){
+		&& ccb->sdstat == SDcheck && lun == ((ccb->cs[1]>>5) & 0x07)){
 			unlock(&ctlr->cachelock);
 			if(r->dlen){
 				sense = &ccb->cs[ccb->cdblen];
@@ -331,7 +331,6 @@ mylex24rio(SDreq* r)
 	 */
 	n = r->dlen;
 	if(n && !PADDR24(r->data, n)){
-		ccb->data = r->data;
 		data = mallocz(n, 0);
 		if(data == nil || !PADDR24(data, n)){
 			if(data != nil){
@@ -342,7 +341,8 @@ mylex24rio(SDreq* r)
 			return SDmalloc;
 		}
 		if(r->write)
-			memmove(data, ccb->data, n);
+			memmove(data, r->data, n);
+		ccb->data = r->data;
 	}
 	else
 		data = r->data;
diff --git a/port/dev.c b/port/dev.c
index c5dd77414cd1fa975e4938b2b2abaa413da9d1e9..78019c300e050579c919b639d464079f1a6ea332 100644
--- a/port/dev.c
+++ b/port/dev.c
@@ -160,7 +160,7 @@ devstat(Chan *c, char *db, Dirtab *tab, int ntab, Devgen *gen)
 					for(elem=p=c->name->s; *p; p++)
 						if(*p == '/')
 							elem = p+1;
-				devdir(c, c->qid, elem, i*DIRLEN, eve, CHDIR|0555, &dir);
+				devdir(c, c->qid, elem, 0, eve, CHDIR|0555, &dir);
 				convD2M(&dir, db);
 				return;
 			}
diff --git a/port/devmouse.c b/port/devmouse.c
index 30330e744947f4c56ac5fa0b5dd62b2fdcdee845..38051e43928dbc3904112c5bd539ea63c1f7b5fb 100644
--- a/port/devmouse.c
+++ b/port/devmouse.c
@@ -142,7 +142,7 @@ mouseopen(Chan *c, int omode)
 		unlock(&mouse);
 		break;
 	case Qmousein:
-		error("disabled");
+	/*	error("disabled");	*/
 		lock(&mouse);
 		if(mouse.inopen){
 			unlock(&mouse);
@@ -546,7 +546,7 @@ m3mouseputc(Queue*, int c)
 	static uchar msg[3];
 	static int nb;
 	static int middle;
-	static uchar b[] = { 0, 4, 1, 5, 0, 2, 1, 5 };
+	static uchar b[] = { 0, 4, 1, 5, 0, 2, 1, 3 };
 	short x;
 	int dx, dy, newbuttons;
 
@@ -586,7 +586,7 @@ mouseputc(Queue*, int c)
 {
 	static short msg[5];
 	static int nb;
-	static uchar b[] = {0, 4, 2, 6, 1, 5, 3, 7, 0, 2, 2, 6, 1, 5, 3, 7};
+	static uchar b[] = {0, 4, 2, 6, 1, 5, 3, 7, 0, 2, 2, 6, 1, 3, 3, 7};
 	int dx, dy, newbuttons;
 
 	if((c&0xF0) == 0x80)