kernel/i386: rename the port io functions with their bit length

3 files changed, 23 insertions, 23 deletions

diff --git a/src/kernel/arch/i386/ata.c b/src/kernel/arch/i386/ata.c
index 996fa3a..aaf05ff 100644
--- a/src/kernel/arch/i386/ata.c
+++ b/src/kernel/arch/i386/ata.c
@@ -24,7 +24,7 @@ static void ata_driveselect(int drive, int block) {
 	if (drive&1) // slave?
 		v |= 0x10; // set drive number bit
 	// TODO account for block
-	port_outb(ata_iobase(drive) + DRV, v);
+	port_out8(ata_iobase(drive) + DRV, v);
 }
 
 static bool ata_identify(int drive) {
@@ -33,20 +33,20 @@ static bool ata_identify(int drive) {
 
 	ata_driveselect(drive, 0);
 	for (int i = 2; i < 6; i++)
-		port_outb(iobase + i, 0);
-	port_outb(iobase + CMD, 0xEC); // IDENTIFY
+		port_out8(iobase + i, 0);
+	port_out8(iobase + CMD, 0xEC); // IDENTIFY
 
-	v = port_inb(iobase + STATUS);
+	v = port_in8(iobase + STATUS);
 	if (v == 0) return false; // nonexistent drive
-	while (port_inb(iobase + STATUS) & 0x80);
+	while (port_in8(iobase + STATUS) & 0x80);
 
 	/* check for uncomformant devices, quit early */
-	if (port_inb(iobase + LBAmid) || port_inb(iobase + LBAhi)) {
+	if (port_in8(iobase + LBAmid) || port_in8(iobase + LBAhi)) {
 		// TODO atapi
 		return true;
 	}
 	/* pool until bit 3 (DRQ) or 0 (ERR) is set */
-	while (!((v = port_inb(iobase + STATUS) & 0x9)));
+	while (!((v = port_in8(iobase + STATUS) & 0x9)));
 	if (v & 1) return false; /* ERR was set, bail */
 
 	// now I can read 512 bytes of data, TODO
diff --git a/src/kernel/arch/i386/port_io.h b/src/kernel/arch/i386/port_io.h
index a4d640f..bcf2358 100644
--- a/src/kernel/arch/i386/port_io.h
+++ b/src/kernel/arch/i386/port_io.h
@@ -1,10 +1,10 @@
 #include <stdint.h>
 
-static inline void port_outb(uint16_t port, uint8_t val) {
+static inline void port_out8(uint16_t port, uint8_t val) {
 	asm volatile("outb %0, %1" : : "a" (val), "Nd" (port));
 }
 
-static inline uint8_t port_inb(uint16_t port) {
+static inline uint8_t port_in8(uint16_t port) {
 	uint8_t val;
 	asm volatile("inb %1, %0" : "=a" (val) : "Nd" (port));
 	return val;
diff --git a/src/kernel/arch/i386/tty/serial.c b/src/kernel/arch/i386/tty/serial.c
index 2b89ecf..f9bb252 100644
--- a/src/kernel/arch/i386/tty/serial.c
+++ b/src/kernel/arch/i386/tty/serial.c
@@ -7,37 +7,37 @@ static const int COM1 = 0x3f8;
 
 static void serial_selftest(void) {
 	char b = 0x69;
-	port_outb(COM1 + 4, 0b00011110); // enable loopback mode
-	port_outb(COM1, b);
-	assert(port_inb(COM1) == b);
+	port_out8(COM1 + 4, 0b00011110); // enable loopback mode
+	port_out8(COM1, b);
+	assert(port_in8(COM1) == b);
 }
 
 void serial_init(void) {
 	// see https://www.sci.muni.cz/docs/pc/serport.txt
 
-	port_outb(COM1 + 1, 0x00); // disable interrupts, we won't be using them
+	port_out8(COM1 + 1, 0x00); // disable interrupts, we won't be using them
 
 	// set baud rate divisor
-	port_outb(COM1 + 3, 0b10000000); // enable DLAB
-	port_outb(COM1 + 0, 0x01);       // divisor = 1 (low  byte)
-	port_outb(COM1 + 1, 0x00);       //             (high byte)
+	port_out8(COM1 + 3, 0b10000000); // enable DLAB
+	port_out8(COM1 + 0, 0x01);       // divisor = 1 (low  byte)
+	port_out8(COM1 + 1, 0x00);       //             (high byte)
 
-	port_outb(COM1 + 3, 0b00000011); // 8 bits, no parity, one stop bit
-	port_outb(COM1 + 2, 0b11000111); // enable FIFO with 14-bit trigger level (???)
+	port_out8(COM1 + 3, 0b00000011); // 8 bits, no parity, one stop bit
+	port_out8(COM1 + 2, 0b11000111); // enable FIFO with 14-bit trigger level (???)
 
 	serial_selftest();
 
-	port_outb(COM1 + 4, 0b00001111); // enable everything in the MCR
+	port_out8(COM1 + 4, 0b00001111); // enable everything in the MCR
 }
 
 static void serial_putchar(char c) {
-	while ((port_inb(COM1 + 5) & 0x20) == 0); // wait for THRE
-	port_outb(COM1, c);
+	while ((port_in8(COM1 + 5) & 0x20) == 0); // wait for THRE
+	port_out8(COM1, c);
 }
 
 char serial_read(void) {
-	while ((port_inb(COM1 + 5) & 0x01) == 0); // wait for DR
-	return port_inb(COM1);
+	while ((port_in8(COM1 + 5) & 0x01) == 0); // wait for DR
+	return port_in8(COM1);
 }
 
 void serial_write(const char *buf, size_t len) {