Changeset 714675b in mainline

Timestamp:

2005-09-18T09:14:02Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7b43e11

Parents:

a5556b4

Message:

Outb, outw, outl are now inline functions

Location:

arch/ia32

Files:

• include/asm.h (modified) (2 diffs)
• src/asm.S (modified) (2 diffs)

arch/ia32/include/asm.h

@@ -42 +42 @@
 extern __u16 inw(int port);
 extern __u32 inl(int port);
-
-extern void outw(int port, __u16 w);
-extern void outl(int port, __u32 l);
 
 extern void enable_l_apic_in_msr(void);
@@ -93 +90 @@
 static inline void outb(__u16 port, __u8 val) { __asm__ volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) ); }
 
+/** Word to port
+ *
+ * Output word to port
+ *
+ * @param port Port to write to
+ * @param val Value to write
+ */
+static inline void outw(__u16 port, __u16 val) { __asm__ volatile ("outw %w0, %w1\n" : : "a" (val), "d" (port) ); }
+
+
+
+/** Double word to port
+ *
+ * Output double word to port
+ *
+ * @param port Port to write to
+ * @param val Value to write
+ */
+static inline void outl(__u16 port, __u32 val) { __asm__ volatile ("outl %l0, %w1\n" : : "a" (val), "d" (port) ); }
 
 /** Set priority level low

arch/ia32/src/asm.S

@@ -41 +41 @@
 .global inw
 .global inl
-.global outw
-.global outl
 .global memcpy
 .global memsetb
@@ -190 +188 @@
         movl 4(%esp),%edx
         inl %dx,%eax
-        ret
-
-
-## I/O output (word)
-#
-# Send a word to I/O port.
-#
-outw:
-        push %eax
-
-        movl 8(%esp),%edx
-        movl 12(%esp),%eax
-        outw %ax,%dx
-
-        pop %eax
-        ret
-
-
-## I/O output (dword)
-#
-# Send a dword to I/O port.
-#
-outl:
-        push %eax
-
-        movl 8(%esp),%edx
-        movl 12(%esp),%eax
-        outl %eax,%dx
-
-        pop %eax
         ret