[9front] [patch] 9/port/sdaoe: remove unfinished atapi support

[9front] [patch] 9/port/sdaoe: remove unfinished atapi support

[Arne Meyer]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

sdaoe has some vestigial code that was probably meant to support atapi. this depends on code from sdscsi,
which is not reflected in the conf files for pc and pc64 but sdscsi gets pulled in by other drivers and compiles by accident.

[-- Attachment #2: sdaoe.diff --]
[-- Type: application/octet-stream, Size: 747 bytes --]

diff ded308e5762d26ed79d26d540dfba8d336f20390 uncommitted
--- a/sys/src/9/port/sdaoe.c
+++ b/sys/src/9/port/sdaoe.c
@@ -366,14 +366,7 @@
 	int r;
 
 	c = u->dev->ctlr;
-	r = 0;
 
-	if((c->feat&Datapi) && c->drivechange){
-		if(aoeconnect(u, c) == 0 && (r = scsionline(u)) > 0)
-			c->drivechange = 0;
-		return r;
-	}
-
 	if(c->drivechange){
 		if(aoeconnect(u, c) == -1)
 			return 0;
@@ -396,8 +389,6 @@
 	Ctlr *c;
 
 	c = u->dev->ctlr;
-//	if(c->feat & Datapi)
-//		return scsibio(u, lun, write, a, count, lba);
 	data = a;
 	if(write)
 		rio = devtab[c->c->type]->write;
@@ -431,8 +422,6 @@
 
 	u = r->unit;
 	c = u->dev->ctlr;
-//	if(c->feat & Datapi)
-//		return aoeriopkt(r, d);
 
 	if(r->cmd[0] == 0x35 || r->cmd[0] == 0x91){
 		qlock(c);

Re: [9front] [patch] 9/port/sdaoe: remove unfinished atapi support

[cinap_lenrek]

yeah, makes sense. as the pkt stuff seems unfinished,
removing it might make most sense.


--
cinap

Re: [9front] [patch] 9/port/sdaoe: remove unfinished atapi support

[cinap_lenrek]

applied.