aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMatthew Dillon <dillon@FreeBSD.org>1999-01-28 01:33:02 +0000
committerMatthew Dillon <dillon@FreeBSD.org>1999-01-28 01:33:02 +0000
commit485111b55ba6751a1405384bfe9dc696fb7a8e2a (patch)
tree6f8cc0bd209af713ee884cc05529f0113a5f8438 /sys
parent8aef171243894d9b06e5ac740bfa5e8686fc4c1a (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ahb/ahb.c9
-rw-r--r--sys/i386/eisa/ahb.c9
2 files changed, 14 insertions, 4 deletions
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 7493c30942d6..8a790670b462 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ahb.c,v 1.3 1998/09/17 00:08:26 gibbs Exp $
+ * $Id: ahb.c,v 1.4 1998/10/09 21:38:31 gibbs Exp $
*/
#include "eisa.h"
@@ -171,8 +171,13 @@ ahbqueuembox(struct ahb_softc *ahb, u_int32_t mboxval, u_int attn_code)
while (--loopmax) {
u_int status;
+ /*
+ * XXX - this still looks wrong, even after fixing the
+ * parenthesization.
+ */
+
status = ahb_inb(ahb, HOSTSTAT);
- if ((status & HOSTSTAT_MBOX_EMPTY|HOSTSTAT_BUSY)
+ if ((status & (HOSTSTAT_MBOX_EMPTY|HOSTSTAT_BUSY))
!= HOSTSTAT_MBOX_EMPTY)
break;
DELAY(20);
diff --git a/sys/i386/eisa/ahb.c b/sys/i386/eisa/ahb.c
index 7493c30942d6..8a790670b462 100644
--- a/sys/i386/eisa/ahb.c
+++ b/sys/i386/eisa/ahb.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ahb.c,v 1.3 1998/09/17 00:08:26 gibbs Exp $
+ * $Id: ahb.c,v 1.4 1998/10/09 21:38:31 gibbs Exp $
*/
#include "eisa.h"
@@ -171,8 +171,13 @@ ahbqueuembox(struct ahb_softc *ahb, u_int32_t mboxval, u_int attn_code)
while (--loopmax) {
u_int status;
+ /*
+ * XXX - this still looks wrong, even after fixing the
+ * parenthesization.
+ */
+
status = ahb_inb(ahb, HOSTSTAT);
- if ((status & HOSTSTAT_MBOX_EMPTY|HOSTSTAT_BUSY)
+ if ((status & (HOSTSTAT_MBOX_EMPTY|HOSTSTAT_BUSY))
!= HOSTSTAT_MBOX_EMPTY)
break;
DELAY(20);