explicit naming of in/out functions with all variants

include/asm.h

@@ -3,9 +3,11 @@
 
 #include <stdint.h>
 
-int inb(int port);
+uint8_t in8(int port);
-uint32_t inl(int port);
+uint16_t in16(int port);
-void outb(int port, int value);
+uint32_t in32(int port);
-void outl(int port, uint32_t value);
+void out8(int port, uint8_t value);
+void out16(int port, uint16_t value);
+void out32(int port, uint32_t value);
 
 #endif

src/x86_64/asm.c

@@ -1,27 +1,31 @@
 #include "asm.h"
 
-int
+uint8_t in8(int port) {
-inb(int port)
-{
 	unsigned char value;
 	__asm__ ("inb %%dx" : "=a"(value) : "d"(port));
 	return value;
 }
 
-uint32_t inl(int port) {
+uint16_t in16(int port) {
+	uint16_t value;
+	__asm__ ("inw %%dx" : "=a"(value) : "d"(port));
+	return value;
+}
+
+uint32_t in32(int port) {
     uint32_t value;
     __asm__ ("inl %%dx" : "=a"(value) : "d"(port));
     return value;
 }
 
-void
+void out8(int port, uint8_t value) {
-outb(int port, int value)
-{
 	__asm__ ("outb %%dx" :: "d"(port), "a"(value));
 }
 
-void
+void out16(int port, uint16_t value) {
-outl(int port, uint32_t value)
+	__asm__ ("outw %%dx" :: "d"(port), "a"(value));
-{
+}
+
+void out32(int port, uint32_t value) {
 	__asm__ ("outl %%dx" :: "d"(port), "a"(value));
 }

src/x86_64/uart.c

@@ -6,9 +6,9 @@ void
 uart_write_char(char c)
 {
 	while (1) {
-		int line_status = inb(COM1_BASE_PORT + 5);
+		int line_status = in8(COM1_BASE_PORT + 5);
 		if (line_status & 0x20) break;
 	}
 
-	outb(COM1_BASE_PORT, c);
+	out8(COM1_BASE_PORT, c);
 }