Applied official linux kernel code style guidelines

Due to my change to vim and the clang-format plugin this was needed!

2 files changed, 212 insertions, 200 deletions

diff --git a/src/kernel/input/ps2/keyboard.c b/src/kernel/input/ps2/keyboard.c
index 6721193..886786b 100644
--- a/src/kernel/input/ps2/keyboard.c
+++ b/src/kernel/input/ps2/keyboard.c
@@ -9,133 +9,137 @@ int shift_pressed;
 int control_pressed;
 
 char keymap[128] = {
-        0 /*E*/, 27, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b',
-        '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',
-        17 /*C*/, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 14 /*LS*/,
-        '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 14 /*RS*/, '*',
-        0, // Alt key
-        ' ', // Space bar
-        15, // Caps lock
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys
-        0, // Num lock
-        0, // Scroll lock
-        0, // Home key
-        0, // Up arrow
-        0, // Page up
-        '-',
-        0, // Left arrow
-        0,
-        0, // Right arrow
-        '+',
-        0, // End key
-        0, // Down arrow
-        0, // Page down
-        0, // Insert key
-        0, // Delete key
-        0, 0, 0,
-        0, // F11
-        0, // F12
-        0, // Other keys
+	0 /*E*/,   27,	     '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-',	  '=',
+	'\b',	   '\t',     'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[',	  ']',
+	'\n',	   17 /*C*/, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'',	  '`',
+	14 /*LS*/, '\\',     'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 14 /*RS*/, '*',
+	0, // Alt key
+	' ', // Space bar
+	15, // Caps lock
+	0,	   0,	     0,	  0,   0,   0,	 0,   0,   0,	0, // F keys
+	0, // Num lock
+	0, // Scroll lock
+	0, // Home key
+	0, // Up arrow
+	0, // Page up
+	'-',
+	0, // Left arrow
+	0,
+	0, // Right arrow
+	'+',
+	0, // End key
+	0, // Down arrow
+	0, // Page down
+	0, // Insert key
+	0, // Delete key
+	0,	   0,	     0,
+	0, // F11
+	0, // F12
+	0, // Other keys
 };
 
 char shift_keymap[128] = {
-        0 /*E*/, 27, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', '\b',
-        '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n',
-        17 /*C*/, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '~', 14 /*LS*/,
-        '|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 14 /*RS*/, '*',
-        0, // Alt key
-        ' ', // Space bar
-        15, // Caps lock
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys
-        0, // Num lock
-        0, // Scroll lock
-        0, // Home key
-        0, // Up arrow
-        0, // Page up
-        '-',
-        0, // Left arrow
-        0,
-        0, // Right arrow
-        '+',
-        0, // End key
-        0, // Down arrow
-        0, // Page down
-        0, // Insert key
-        0, // Delete key
-        0, 0, 0,
-        0, // F11
-        0, // F12
-        0, // Other keys
+	0 /*E*/,   27,	     '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_',	  '+',
+	'\b',	   '\t',     'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{',	  '}',
+	'\n',	   17 /*C*/, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"',	  '~',
+	14 /*LS*/, '|',	     'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 14 /*RS*/, '*',
+	0, // Alt key
+	' ', // Space bar
+	15, // Caps lock
+	0,	   0,	     0,	  0,   0,   0,	 0,   0,   0,	0, // F keys
+	0, // Num lock
+	0, // Scroll lock
+	0, // Home key
+	0, // Up arrow
+	0, // Page up
+	'-',
+	0, // Left arrow
+	0,
+	0, // Right arrow
+	'+',
+	0, // End key
+	0, // Down arrow
+	0, // Page down
+	0, // Insert key
+	0, // Delete key
+	0,	   0,	     0,
+	0, // F11
+	0, // F12
+	0, // Other keys
 };
 
 char *handle_shift(int scan_code)
 {
-    char *current_keymap = keymap;
-    if (shift_pressed) current_keymap = shift_keymap;
+	char *current_keymap = keymap;
+	if (shift_pressed)
+		current_keymap = shift_keymap;
 
-    if ((scan_code & 0x80) == 0) { // PRESS
-        // TODO: Fix caps lock deactivation when pressing shift while (locked) shifted
-        if (current_keymap[scan_code] == 14 || (current_keymap[scan_code] == 15 && !shift_pressed)) {
-            shift_pressed = 1;
-        } else if (current_keymap[scan_code] == 15 && shift_pressed) {
-            shift_pressed = 0;
-        }
-    } else { // RELEASE
-        char key = current_keymap[scan_code];
-        if (key == 14) shift_pressed = 0;
-    }
+	if ((scan_code & 0x80) == 0) { // PRESS
+		// TODO: Fix caps lock deactivation when pressing shift while (locked) shifted
+		if (current_keymap[scan_code] == 14 ||
+		    (current_keymap[scan_code] == 15 && !shift_pressed)) {
+			shift_pressed = 1;
+		} else if (current_keymap[scan_code] == 15 && shift_pressed) {
+			shift_pressed = 0;
+		}
+	} else { // RELEASE
+		char key = current_keymap[scan_code];
+		if (key == 14)
+			shift_pressed = 0;
+	}
 
-    return current_keymap;
+	return current_keymap;
 }
 
 void keyboard_handler(struct regs *r)
 {
-    unsigned char scan_code;
+	unsigned char scan_code;
 
-    scan_code = inb(0x60);
-    char *current_keymap = handle_shift(scan_code);
+	scan_code = inb(0x60);
+	char *current_keymap = handle_shift(scan_code);
 
-    if ((scan_code & 0x80) == 0) { // PRESS
-        if (current_keymap[scan_code] == 17)
-            control_pressed = 1;
+	if ((scan_code & 0x80) == 0) { // PRESS
+		if (current_keymap[scan_code] == 17)
+			control_pressed = 1;
 
-        if (control_pressed && current_keymap[scan_code] == 'l') {
-            vesa_clear();
-            return;
-        }
+		if (control_pressed && current_keymap[scan_code] == 'l') {
+			vesa_clear();
+			return;
+		}
 
-        keyboard_char_buffer = current_keymap[scan_code];
-        keyboard_buffer[strlen(keyboard_buffer)] = keyboard_char_buffer;
-    } else { // RELEASE
-        if (current_keymap[scan_code] == (int) 0xffffffb5) // TODO: IDK WHY -107?!
-            control_pressed = 0;
-    }
+		keyboard_char_buffer = current_keymap[scan_code];
+		keyboard_buffer[strlen(keyboard_buffer)] = keyboard_char_buffer;
+	} else { // RELEASE
+		if (current_keymap[scan_code] == (int)0xffffffb5) // TODO: IDK WHY -107?!
+			control_pressed = 0;
+	}
 }
 
 void keyboard_acknowledge()
 {
-    while (inb(0x60) != 0xfa);
+	while (inb(0x60) != 0xfa)
+		;
 }
 
 void keyboard_rate()
 {
-    outb(0x60, 0xF3);
-    keyboard_acknowledge();
-    outb(0x60, 0x0); // Rate{00000} Delay{00} 0
+	outb(0x60, 0xF3);
+	keyboard_acknowledge();
+	outb(0x60, 0x0); // Rate{00000} Delay{00} 0
 }
 
 void keyboard_clear_buffer()
 {
-    kfree(keyboard_buffer);
-    keyboard_buffer = (char *) kmalloc(4096); // 4KiB
+	kfree(keyboard_buffer);
+	keyboard_buffer = (char *)kmalloc(4096); // 4KiB
 }
 
 // Installs the keyboard handler into IRQ1
 void keyboard_install()
 {
-    keyboard_clear_buffer();
-    keyboard_rate();
-    irq_install_handler(1, keyboard_handler);
-    shift_pressed = 0;
-    info("Installed keyboard handler");
+	keyboard_clear_buffer();
+	keyboard_rate();
+	irq_install_handler(1, keyboard_handler);
+	shift_pressed = 0;
+	info("Installed keyboard handler");
 }
diff --git a/src/kernel/input/ps2/mouse.c b/src/kernel/input/ps2/mouse.c
index c9fa94f..31002ad 100644
--- a/src/kernel/input/ps2/mouse.c
+++ b/src/kernel/input/ps2/mouse.c
@@ -13,127 +13,135 @@ int mouse_but_3 = 0;
 
 void mouse_handler(struct regs *a_r)
 {
-    switch (mouse_cycle) {
-        case 0:
-            mouse_byte[0] = inb(0x60);
-            if (((mouse_byte[0] >> 3) & 1) == 1) mouse_cycle++;
-            else mouse_cycle = 0;
-            break;
-        case 1:
-            mouse_byte[1] = inb(0x60);
-            mouse_cycle++;
-            break;
-        case 2:
-            mouse_byte[2] = inb(0x60);
-            mouse_x += mouse_byte[1];
-            mouse_y -= mouse_byte[2];
-            mouse_but_1 = mouse_byte[0] & 1;
-            mouse_but_2 = (mouse_byte[0] >> 1) & 1;
-            mouse_but_3 = (mouse_byte[0] >> 2) & 1;
-            mouse_cycle = 0;
+	switch (mouse_cycle) {
+	case 0:
+		mouse_byte[0] = inb(0x60);
+		if (((mouse_byte[0] >> 3) & 1) == 1)
+			mouse_cycle++;
+		else
+			mouse_cycle = 0;
+		break;
+	case 1:
+		mouse_byte[1] = inb(0x60);
+		mouse_cycle++;
+		break;
+	case 2:
+		mouse_byte[2] = inb(0x60);
+		mouse_x += mouse_byte[1];
+		mouse_y -= mouse_byte[2];
+		mouse_but_1 = mouse_byte[0] & 1;
+		mouse_but_2 = (mouse_byte[0] >> 1) & 1;
+		mouse_but_3 = (mouse_byte[0] >> 2) & 1;
+		mouse_cycle = 0;
 
-            if (mouse_x < 0) mouse_x = 0;
-            if (mouse_y < 0) mouse_y = 0;
-            if (mouse_x > vbe_width - 1) mouse_x = vbe_width - 1;
-            if (mouse_y > vbe_height - 1) mouse_y = vbe_height - 1;
-            vesa_draw_cursor(mouse_x, mouse_y);
-            break;
-        default:
-            break;
-    }
+		if (mouse_x < 0)
+			mouse_x = 0;
+		if (mouse_y < 0)
+			mouse_y = 0;
+		if (mouse_x > vbe_width - 1)
+			mouse_x = vbe_width - 1;
+		if (mouse_y > vbe_height - 1)
+			mouse_y = vbe_height - 1;
+		vesa_draw_cursor(mouse_x, mouse_y);
+		break;
+	default:
+		break;
+	}
 }
 
 void mouse_wait(unsigned char a_type)
 {
-    unsigned int time_out = 100000;
-    if (a_type == 0) {
-        while (time_out--)
-            if ((inb(0x64) & 1) == 1)
-                return;
-        return;
-    } else {
-        while (time_out--)
-            if ((inb(0x64) & 2) == 0)
-                return;
-        return;
-    }
+	unsigned int time_out = 100000;
+	if (a_type == 0) {
+		while (time_out--)
+			if ((inb(0x64) & 1) == 1)
+				return;
+		return;
+	} else {
+		while (time_out--)
+			if ((inb(0x64) & 2) == 0)
+				return;
+		return;
+	}
 }
 
 void mouse_write(unsigned char a_write)
 {
-    mouse_wait(1);
-    outb(0x64, 0xD4);
-    mouse_wait(1);
-    outb(0x60, a_write);
+	mouse_wait(1);
+	outb(0x64, 0xD4);
+	mouse_wait(1);
+	outb(0x60, a_write);
 }
 
 char mouse_read()
 {
-    mouse_wait(0);
-    return inb(0x60);
+	mouse_wait(0);
+	return inb(0x60);
 }
 
 void mouse_install()
 {
-    unsigned char status;
+	unsigned char status;
 
-    // Enable auxiliary mouse device
-    mouse_wait(1);
-    outb(0x64, 0xA8);
+	// Enable auxiliary mouse device
+	mouse_wait(1);
+	outb(0x64, 0xA8);
 
-    // Enable interrupts
-    mouse_wait(1);
-    outb(0x64, 0x20);
-    mouse_wait(0);
-    status = (unsigned char) (inb(0x60) | 3);
-    mouse_wait(1);
-    outb(0x64, 0x60);
-    mouse_wait(1);
-    outb(0x60, status);
+	// Enable interrupts
+	mouse_wait(1);
+	outb(0x64, 0x20);
+	mouse_wait(0);
+	status = (unsigned char)(inb(0x60) | 3);
+	mouse_wait(1);
+	outb(0x64, 0x60);
+	mouse_wait(1);
+	outb(0x60, status);
 
-    // Enable mousewheel
-    mouse_write(0xF2);
-    mouse_read();
-    mouse_read();
-    mouse_write(0xF3);
-    mouse_read();
-    mouse_write(200);
-    mouse_read();
-    mouse_write(0xF3);
-    mouse_read();
-    mouse_write(100);
-    mouse_read();
-    mouse_write(0xF3);
-    mouse_read();
-    mouse_write(80);
-    mouse_read();
-    mouse_write(0xF2);
-    mouse_read();
-    status = (unsigned char) mouse_read();
-    if (status == 3) serial_printf("Scrollwheel support!");
+	// Enable mousewheel
+	mouse_write(0xF2);
+	mouse_read();
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(200);
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(100);
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(80);
+	mouse_read();
+	mouse_write(0xF2);
+	mouse_read();
+	status = (unsigned char)mouse_read();
+	if (status == 3)
+		serial_printf("Scrollwheel support!");
 
-    // Activate 4th and 5th mouse buttons
-    mouse_write(0xF2);
-    mouse_read();
-    mouse_read();
-    mouse_write(0xF3);
-    mouse_read();
-    mouse_write(200);
-    mouse_read();
-    mouse_write(0xF3);
-    mouse_read();
-    mouse_write(200);
-    mouse_read();
-    mouse_write(0xF3);
-    mouse_read();
-    mouse_write(80);
-    mouse_read();
-    mouse_write(0xF2);
-    mouse_read();
-    status = (unsigned char) mouse_read();
-    if (status == 4) serial_printf("4th and 5th mouse button support!");
+	// Activate 4th and 5th mouse buttons
+	mouse_write(0xF2);
+	mouse_read();
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(200);
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(200);
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(80);
+	mouse_read();
+	mouse_write(0xF2);
+	mouse_read();
+	status = (unsigned char)mouse_read();
+	if (status == 4)
+		serial_printf("4th and 5th mouse button support!");
 
-    /* TODO: Fix mouse laggyness
+	/* TODO: Fix mouse laggyness
     mouse_write(0xE8);
     mouse_read();
     mouse_write(0x03);
@@ -144,11 +152,11 @@ void mouse_install()
     mouse_write(200);
     mouse_read(); */
 
-    // Enable mouse
-    mouse_write(0xF4);
-    mouse_read();
+	// Enable mouse
+	mouse_write(0xF4);
+	mouse_read();
 
-    // Setup the mouse handler
-    irq_install_handler(12, mouse_handler);
-    info("Installed mouse handler");
+	// Setup the mouse handler
+	irq_install_handler(12, mouse_handler);
+	info("Installed mouse handler");
 }
\ No newline at end of file