From d94ffac4a584dc7a4f6f2ec567b8caab05ce9253 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 6 May 2020 19:04:05 +0200
Subject: New build parameters and shared includes

This changes many files but I've just applied some replace commands.. So
- nothing special!
---
 src/kernel/io/io.c | 22 +++++++++++-----------
 src/kernel/io/io.h | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/kernel/io')

diff --git a/src/kernel/io/io.c b/src/kernel/io/io.c
index fb95464..ad63c88 100644
--- a/src/kernel/io/io.c
+++ b/src/kernel/io/io.c
@@ -1,23 +1,23 @@
 #include <stdint.h>
-#include <kernel/system.h>
+#include <system.h>
 
-uint8_t inb(uint16_t port)
+u8 inb(u16 port)
 {
-	uint8_t value;
+	u8 value;
 	asm volatile("inb %1, %0" : "=a"(value) : "Nd"(port));
 	return value;
 }
 
-uint16_t inw(uint16_t port)
+u16 inw(u16 port)
 {
-	uint16_t value;
+	u16 value;
 	asm volatile("inw %1, %0" : "=a"(value) : "Nd"(port));
 	return value;
 }
 
-uint32_t inl(uint16_t port)
+u32 inl(u16 port)
 {
-	uint32_t value;
+	u32 value;
 	asm volatile("inl %1, %0" : "=a"(value) : "Nd"(port));
 	return value;
 }
@@ -37,17 +37,17 @@ void hlt()
 	asm volatile("hlt");
 }
 
-void outb(uint16_t port, uint8_t data)
+void outb(u16 port, u8 data)
 {
 	asm volatile("outb %0, %1" ::"a"(data), "Nd"(port));
 }
 
-void outw(uint16_t port, uint16_t data)
+void outw(u16 port, u16 data)
 {
 	asm volatile("outw %0, %1" ::"a"(data), "Nd"(port));
 }
 
-void outl(uint16_t port, uint32_t data)
+void outl(u16 port, u32 data)
 {
 	asm volatile("outl %0, %1" ::"a"(data), "Nd"(port));
 }
@@ -73,5 +73,5 @@ void serial_put(char ch)
 {
 	while (is_transmit_empty() == 0)
 		;
-	outb(0x3f8, (uint8_t)ch);
+	outb(0x3f8, (u8)ch);
 }
\ No newline at end of file
diff --git a/src/kernel/io/io.h b/src/kernel/io/io.h
index 50e9c6f..8b3dd2f 100644
--- a/src/kernel/io/io.h
+++ b/src/kernel/io/io.h
@@ -8,21 +8,21 @@
  * @param port The hardware port
  * @return The hardware response
  */
-uint8_t inb(uint16_t port);
+u8 inb(u16 port);
 
 /**
  * Receive from specified hardware port
  * @param port The hardware port
  * @return The hardware response
  */
-uint16_t inw(uint16_t port);
+u16 inw(u16 port);
 
 /**
  * Receive from specified hardware port
  * @param port The hardware port
  * @return The hardware response
  */
-uint32_t inl(uint16_t port);
+u32 inl(u16 port);
 
 void cli();
 void sti();
@@ -33,21 +33,21 @@ void hlt();
  * @param port The hardware port
  * @param data The data that should be sent
  */
-void outb(uint16_t port, uint8_t data);
+void outb(u16 port, u8 data);
 
 /**
  * Send data to the specified hardware port
  * @param port The hardware port
  * @param data The data that should be sent
  */
-void outw(uint16_t port, uint16_t data);
+void outw(u16 port, u16 data);
 
 /**
  * Send data to the specified hardware port
  * @param port The hardware port
  * @param data The data that should be sent
  */
-void outl(uint16_t port, uint32_t data);
+void outl(u16 port, u32 data);
 
 /**
  * Initialize the serial conenction
-- 
cgit v1.2.3