3 files changed, 6 insertions(+), 4 deletions(-)

M alphapc/sdscsi.c
M pc/sdscsi.c
M port/tod.c

@@ 223,7 223,7 @@ scsionline(SDunit* unit)
 			 * Since we don't read audio via this interface
 			 * it's okay to always fudge this.
 			 */
-			if((unit->inquiry[0] & 0x1F) == 0x05 && unit->secsize == 2352)
+			if(unit->secsize == 2352)
 				unit->secsize = 2048;
 			ok = 1;
 			break;

@@ 223,7 223,7 @@ scsionline(SDunit* unit)
 			 * Since we don't read audio via this interface
 			 * it's okay to always fudge this.
 			 */
-			if((unit->inquiry[0] & 0x1F) == 0x05 && unit->secsize == 2352)
+			if(unit->secsize == 2352)
 				unit->secsize = 2048;
 			ok = 1;
 			break;

@@ 102,6 102,9 @@ todget(vlong *ticksp)
 		ticks = fastticks((uvlong*)&tod.hz);
 	else
 		ticks = fastticks(nil);
+
+	/* since 64 bit ops are not atomix, we have to lock around them */
+	ilock(&tod);
 	diff = ticks - tod.last;
 
 	// convert to epoch


@@ 109,7 112,6 @@ todget(vlong *ticksp)
 	x = x + tod.off;
 
 	if(m->machno == 0){
-		ilock(&tod);
 
 		// add in correction
 		if(tod.sstart != tod.send){


@@ 125,7 127,6 @@ todget(vlong *ticksp)
 			tod.last = ticks;
 			tod.off = x;
 		}
-		iunlock(&tod);
 	}
 
 	// time can't go backwards


@@ 133,6 134,7 @@ todget(vlong *ticksp)
 		x = tod.lasttime;
 	else
 		tod.lasttime = x;
+	iunlock(&tod);
 
 	if(ticksp != nil)
 		*ticksp = ticks;