Major coding style reformatting -> Kernighan & Ritchie

This project now (hopefully) uses the same style recommended by Kernighan and Ritchie and used in the Linux Kernel

2 files changed, 35 insertions, 26 deletions

diff --git a/src/kernel/input/ps2/keyboard.c b/src/kernel/input/ps2/keyboard.c
index 2a093e5..24802bd 100644
--- a/src/kernel/input/ps2/keyboard.c
+++ b/src/kernel/input/ps2/keyboard.c
@@ -64,12 +64,13 @@ char shift_keymap[128] = {
         0, // Other keys
 };
 
-void keyboard_handler(struct regs *r) {
+void keyboard_handler(struct regs *r)
+{
     unsigned char scan_code;
     char *current_keymap = keymap;
     if (shift_pressed) current_keymap = shift_keymap;
 
-    scan_code = receive_b(0x60);
+    scan_code = inb(0x60);
 
     if ((scan_code & 0x80) == 0) { // PRESS
         // TODO: Fix caps lock deactivation when pressing shift while shifted
@@ -87,18 +88,21 @@ void keyboard_handler(struct regs *r) {
     }
 }
 
-void keyboard_acknowledge() {
-    while (receive_b(0x60) != 0xfa);
+void keyboard_acknowledge()
+{
+    while (inb(0x60) != 0xfa);
 }
 
-void keyboard_rate() {
-    send_b(0x60, 0xF3);
+void keyboard_rate()
+{
+    outb(0x60, 0xF3);
     keyboard_acknowledge();
-    send_b(0x60, 0x0); // Rate{00000} Delay{00} 0
+    outb(0x60, 0x0); // Rate{00000} Delay{00} 0
 }
 
 // Installs the keyboard handler into IRQ1
-void keyboard_install() {
+void keyboard_install()
+{
     keyboard_rate();
     irq_install_handler(1, keyboard_handler);
     shift_pressed = 0;
diff --git a/src/kernel/input/ps2/mouse.c b/src/kernel/input/ps2/mouse.c
index 016b8b0..97ae256 100644
--- a/src/kernel/input/ps2/mouse.c
+++ b/src/kernel/input/ps2/mouse.c
@@ -10,19 +10,20 @@ int mouse_but_1 = 0;
 int mouse_but_2 = 0;
 int mouse_but_3 = 0;
 
-void mouse_handler(struct regs *a_r) {
+void mouse_handler(struct regs *a_r)
+{
     switch (mouse_cycle) {
         case 0:
-            mouse_byte[0] = receive_b(0x60);
+            mouse_byte[0] = inb(0x60);
             if (((mouse_byte[0] >> 3) & 1) == 1) mouse_cycle++;
             else mouse_cycle = 0;
             break;
         case 1:
-            mouse_byte[1] = receive_b(0x60);
+            mouse_byte[1] = inb(0x60);
             mouse_cycle++;
             break;
         case 2:
-            mouse_byte[2] = receive_b(0x60);
+            mouse_byte[2] = inb(0x60);
             mouse_x += mouse_byte[1];
             mouse_y -= mouse_byte[2];
             mouse_but_1 = mouse_byte[0] & 1;
@@ -41,49 +42,53 @@ void mouse_handler(struct regs *a_r) {
     }
 }
 
-void mouse_wait(unsigned char a_type) {
+void mouse_wait(unsigned char a_type)
+{
     unsigned int time_out = 100000;
     if (a_type == 0) {
         while (time_out--)
-            if ((receive_b(0x64) & 1) == 1)
+            if ((inb(0x64) & 1) == 1)
                 return;
         return;
     } else {
         while (time_out--)
-            if ((receive_b(0x64) & 2) == 0)
+            if ((inb(0x64) & 2) == 0)
                 return;
         return;
     }
 }
 
-void mouse_write(unsigned char a_write) {
+void mouse_write(unsigned char a_write)
+{
     mouse_wait(1);
-    send_b(0x64, 0xD4);
+    outb(0x64, 0xD4);
     mouse_wait(1);
-    send_b(0x60, a_write);
+    outb(0x60, a_write);
 }
 
-char mouse_read() {
+char mouse_read()
+{
     mouse_wait(0);
-    return receive_b(0x60);
+    return inb(0x60);
 }
 
-void mouse_install() {
+void mouse_install()
+{
     unsigned char status;
 
     // Enable auxiliary mouse device
     mouse_wait(1);
-    send_b(0x64, 0xA8);
+    outb(0x64, 0xA8);
 
     // Enable interrupts
     mouse_wait(1);
-    send_b(0x64, 0x20);
+    outb(0x64, 0x20);
     mouse_wait(0);
-    status = (receive_b(0x60) | 2);
+    status = (inb(0x60) | 2);
     mouse_wait(1);
-    send_b(0x64, 0x60);
+    outb(0x64, 0x60);
     mouse_wait(1);
-    send_b(0x60, status);
+    outb(0x60, status);
 
     // Use default settings
     mouse_write(0xF6);