xv6

commit ef30c2c7499de88862560e0560d7de7860ffad1d
parent bcca6c6bdeacd537a9c84ec9205da06616ecb8bd
Author: rsc <rsc>
Date:   Mon, 20 Aug 2007 18:55:51 +0000

no more w

Diffstat:
M
x86.h
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/x86.h b/x86.h
@@ -2,10 +2,10 @@
 // hardware instructions.
 
 static __inline uchar
-inb(int port)
+inb(ushort port)
 {
   uchar data;
-  __asm __volatile("inb %w1,%0" : "=a" (data) : "d" (port));
+  __asm __volatile("in %1,%0" : "=a" (data) : "d" (port));
   return data;
 }
 
@@ -19,15 +19,15 @@ insl(int port, void *addr, int cnt)
 }
 
 static __inline void
-outb(int port, uchar data)
+outb(ushort port, uchar data)
 {
-  __asm __volatile("outb %0,%w1" : : "a" (data), "d" (port));
+  __asm __volatile("out %0,%1" : : "a" (data), "d" (port));
 }
 
 static __inline void
-outw(int port, ushort data)
+outw(ushort port, ushort data)
 {
-  __asm __volatile("outw %0,%w1" : : "a" (data), "d" (port));
+  __asm __volatile("out %0,%1" : : "a" (data), "d" (port));
 }
 
 static __inline void