From c16a9da717c00950ab0a0084655261932583911f Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 28 Jun 1997 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1997-06-28

---
 pc/ether82557.c | 3 ++-
 pc/scsi.c       | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pc/ether82557.c b/pc/ether82557.c
index dacc058385a8c1f406d54d7cfd9c51d8a86140eb..c14c5bf188a3bf9a4ed92753f8d0b4377ab5122b 100644
--- a/pc/ether82557.c
+++ b/pc/ether82557.c
@@ -1,10 +1,11 @@
 /*
  * Intel 82557 Fast Ethernet PCI Bus LAN Controller
  * as found on the Intel EtherExpress PRO/100B. This chip is full
- * of smarts, unfortunately none of them are in the right place.
+ * of smarts, unfortunately they're not all in the right place.
  * To do:
  *	the PCI scanning code could be made common to other adapters;
  *	auto-negotiation;
+ *	full-duplex;
  *	optionally use memory-mapped registers.
  */
 #include "u.h"
diff --git a/pc/scsi.c b/pc/scsi.c
index 7ebe7f7f817c39ea7966efd5e7a7175ab9a7cb6a..bfc0ffad1fa10a13f34649ff6000c341bc03121d 100644
--- a/pc/scsi.c
+++ b/pc/scsi.c
@@ -539,8 +539,10 @@ scsireadcdda(Target *t, char lun, int, void *b, long n, long bsize, long bno)
 	cmd[3] = bno>>16;
 	cmd[4] = bno>>8;
 	cmd[5] = bno;
-	cmd[6] = n>>8;
-	cmd[7] = n;
+	cmd[6] = n>>24;
+	cmd[7] = n>>16;
+	cmd[8] = n>>8;
+	cmd[9] = n;
 
 	nbytes = n*bsize;
 	s = scsiexec(t, SCSIread, cmd, sizeof(cmd), b, &nbytes);