Changeset 9688513 in mainline

Timestamp:

2009-02-21T17:53:44Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1e23e16

Parents:

cecb0789

Message:

Unbreak amd64.

Location:

kernel/arch/amd64

Files:

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

kernel/arch/amd64/include/asm.h

@@ -82 +82 @@
 }
 
+/** Word from port
+ *
+ * Get word from port
+ *
+ * @param port Port to read from
+ * @return Value read
+ */
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+        uint16_t val;
+        
+        asm volatile ("inw %w1, %w0 \n" : "=a" (val) : "d" (port));
+        return val;
+}
+
+/** Double word from port
+ *
+ * Get double word from port
+ *
+ * @param port Port to read from
+ * @return Value read
+ */
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+        uint32_t val;
+        
+        asm volatile ("inl %w1, %0 \n" : "=a" (val) : "d" (port));
+        return val;
+}
+
 /** Byte to port
  *
@@ -92 +122 @@
 {
         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 pio_write_16(ioport16_t *port, uint16_t 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 pio_write_32(ioport32_t *port, uint32_t val)
+{
+        asm volatile ("outl %0, %w1\n" : : "a" (val), "d" (port));
 }
 

kernel/arch/amd64/src/amd64.c

@@ -215 +215 @@
         ega_redraw();
 #endif
-        
-        i8042_grab();
 }
 
@@ -224 +222 @@
 void arch_release_console(void)
 {
-        i8042_release();
 }