Mercurial > sos > sos

changeset 49:253190997564

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Jonathan Pevarnek <pevarnj@gmail.com>
date Fri, 08 Apr 2011 10:31:17 -0400
parents a6be89bc4b04 (current diff) f219716c6b54 (diff)
children eda962110e0e
files arch/io.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/arch/io.c	Fri Apr 08 10:31:03 2011 -0400
+++ b/arch/io.c	Fri Apr 08 10:31:17 2011 -0400
@@ -47,6 +47,7 @@
 void wait_for_io_int()
 {
 	struct psw psw;
+	u8 devst;
 
         __builtin_memset(&psw, 0, sizeof(struct psw));
         psw.io  = 1;
@@ -67,7 +68,9 @@
           "r1", "r2"
         );
 
-	if (*((u8*) 0x210) & 0x04)
+	devst = *((u8*) 0x210);
+
+	if (*((u8*) 0x210) & 0x84)
 		return;
 
 	die();
--- a/arch/ioint.S	Fri Apr 08 10:31:03 2011 -0400
+++ b/arch/ioint.S	Fri Apr 08 10:31:17 2011 -0400
@@ -29,6 +29,7 @@
 	lmg	%r1,%r2,512
 	lpswe	0x170
 
+.data
 irb:
 	.8byte 0x00
 	.8byte 0x00