summaryrefslogtreecommitdiff
path: root/x86.h
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-20 18:55:51 +0000
committerrsc <rsc>2007-08-20 18:55:51 +0000
commitef30c2c7499de88862560e0560d7de7860ffad1d (patch)
tree6a6db413de7388da64c2b613140ad1f88720166e /x86.h
parentbcca6c6bdeacd537a9c84ec9205da06616ecb8bd (diff)
downloadxv6-labs-ef30c2c7499de88862560e0560d7de7860ffad1d.tar.gz
xv6-labs-ef30c2c7499de88862560e0560d7de7860ffad1d.tar.bz2
xv6-labs-ef30c2c7499de88862560e0560d7de7860ffad1d.zip
no more w
Diffstat (limited to 'x86.h')
-rw-r--r--x86.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/x86.h b/x86.h
index 7617322..f892ad2 100644
--- 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