Meta: Apply new clang-format rules to kernel

9 files changed, 34 insertions, 37 deletions

diff --git a/kernel/drivers/ata.c b/kernel/drivers/ata.c
index 190cf5a..ee9e81b 100644
--- a/kernel/drivers/ata.c
+++ b/kernel/drivers/ata.c
@@ -105,8 +105,7 @@ int poll_status(void) {
 }
 
 // Instructions from: https://wiki.osdev.org/ATA_PIO_Mode#28_bit_PIO
-void
-setup_drive_for_command(u32 lba, u32 sector_count) {
+void setup_drive_for_command(u32 lba, u32 sector_count) {
   // 1. Send 0xE0 for the "master" or 0xF0 for
   //    the "slave", ORed with the highest 4 bits
   //    of the LBA to port 0x1F6
@@ -139,8 +138,7 @@ void delayed_rep_outsw(size_t n, u16 port, volatile u8 *buffer) {
   }
 }
 
-void ata_write_lba28(u32 lba, u32 sector_count,
-                     volatile const u8 *buffer) {
+void ata_write_lba28(u32 lba, u32 sector_count, volatile const u8 *buffer) {
   setup_drive_for_command(lba, sector_count);
 
   outb(io_base + COMMAND_PORT, WRITE_SECTORS);
@@ -168,8 +166,7 @@ void ata_write_lba28(u32 lba, u32 sector_count,
 }
 
 // Instructions from: https://wiki.osdev.org/ATA_PIO_Mode#28_bit_PIO
-void ata_read_lba28(u32 lba, u32 sector_count,
-                    volatile void *address) {
+void ata_read_lba28(u32 lba, u32 sector_count, volatile void *address) {
   // Step 1-6 is done in this function.
   setup_drive_for_command(lba, sector_count);
 
@@ -227,8 +224,7 @@ void read_lba(u32 lba, void *address, size_t size, size_t offset) {
   }
 }
 
-void write_lba(u32 lba, volatile void *address, size_t size,
-               size_t offset) {
+void write_lba(u32 lba, volatile void *address, size_t size, size_t offset) {
   uintptr_t ptr = (uintptr_t)address;
   lba += offset / SECTOR_SIZE;
   offset = offset % SECTOR_SIZE;
diff --git a/kernel/drivers/ata.h b/kernel/drivers/ata.h
index 6aa4906..0b335be 100644
--- a/kernel/drivers/ata.h
+++ b/kernel/drivers/ata.h
@@ -5,12 +5,10 @@
 
 void ata_init(void);
 
-void read_drive_chs(u8 head_index, u8 sector_count,
-                    u8 sector_index, u8 cylinder_low_value,
-                    u8 cylinder_high_value, void *address);
+void read_drive_chs(u8 head_index, u8 sector_count, u8 sector_index,
+                    u8 cylinder_low_value, u8 cylinder_high_value,
+                    void *address);
 void read_drive_lba(u32 lba, u8 sector_count, void *address);
 void read_lba(u32 lba, void *address, size_t size, size_t offset);
-void write_lba(u32 lba, volatile void *address, size_t size,
-               size_t offset);
-void ata_write_lba28(u32 lba, u32 sector_count,
-                     volatile const u8 *buffer);
+void write_lba(u32 lba, volatile void *address, size_t size, size_t offset);
+void ata_write_lba28(u32 lba, u32 sector_count, volatile const u8 *buffer);
diff --git a/kernel/drivers/keyboard.h b/kernel/drivers/keyboard.h
index 002b9c2..50fffc5 100644
--- a/kernel/drivers/keyboard.h
+++ b/kernel/drivers/keyboard.h
@@ -1,9 +1,9 @@
 #ifndef KEYBOARD_H
 #define KEYBOARD_H
 
-#include <typedefs.h>
-#include <cpu/io.h>
 #include <cpu/idt.h>
+#include <cpu/io.h>
+#include <typedefs.h>
 
 void install_keyboard(void);
 void add_keyboard(void);
diff --git a/kernel/drivers/mouse.c b/kernel/drivers/mouse.c
index 21cb470..78280c1 100644
--- a/kernel/drivers/mouse.c
+++ b/kernel/drivers/mouse.c
@@ -5,10 +5,10 @@
 #include <fs/vfs.h>
 #include <typedefs.h>
 
-u8 mouse_cycle = 0;  // unsigned char
-u8 mouse_u8[3]; // signed char
-u8 mouse_x = 0;      // signed char
-u8 mouse_y = 0;      // signed char
+u8 mouse_cycle = 0; // unsigned char
+u8 mouse_u8[3];     // signed char
+u8 mouse_x = 0;     // signed char
+u8 mouse_y = 0;     // signed char
 vfs_inode_t *mouse_inode;
 vfs_fd_t *mouse_fd;
 
@@ -18,16 +18,14 @@ struct mouse_event {
   u8 y;
 };
 
-int fs_mouse_write(u8 *buffer, u64 offset, u64 len,
-                   vfs_fd_t *fd) {
+int fs_mouse_write(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd) {
   int rc = fifo_object_write(buffer, offset, len, fd->inode->internal_object);
   FIFO_FILE *f = fd->inode->internal_object;
   mouse_inode->has_data = f->has_data;
   return rc;
 }
 
-int fs_mouse_read(u8 *buffer, u64 offset, u64 len,
-                  vfs_fd_t *fd) {
+int fs_mouse_read(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd) {
   FIFO_FILE *f = fd->inode->internal_object;
   if (!mouse_inode->has_data)
     return 0;
@@ -46,7 +44,9 @@ void add_mouse(void) {
   get_current_task()->file_descriptors[fd] = NULL;
 }
 
-__attribute__((interrupt)) void what(registers_t *r) { EOI(0xe); }
+__attribute__((interrupt)) void what(registers_t *r) {
+  EOI(0xe);
+}
 
 __attribute__((interrupt)) void int_mouse(registers_t *r) {
   (void)r;
@@ -54,9 +54,9 @@ __attribute__((interrupt)) void int_mouse(registers_t *r) {
   switch (mouse_cycle) {
   case 0:
     mouse_u8[0] = inb(0x60);
-    if(!(mouse_u8[0] & (1 << 3))) {
-	mouse_cycle = 0;
-    return;
+    if (!(mouse_u8[0] & (1 << 3))) {
+      mouse_cycle = 0;
+      return;
     }
     mouse_cycle++;
     break;
diff --git a/kernel/drivers/pit.c b/kernel/drivers/pit.c
index f29b3f8..567ac2d 100644
--- a/kernel/drivers/pit.c
+++ b/kernel/drivers/pit.c
@@ -7,7 +7,9 @@ u64 clock_num_ms_ticks = 0;
 u64 pit_counter = 0;
 u16 hertz;
 
-u64 pit_num_ms(void) { return clock_num_ms_ticks; }
+u64 pit_num_ms(void) {
+  return clock_num_ms_ticks;
+}
 
 u16 read_pit_count(void) {
   u16 count = 0;
diff --git a/kernel/drivers/pit.h b/kernel/drivers/pit.h
index 4d221c1..ec48cc3 100644
--- a/kernel/drivers/pit.h
+++ b/kernel/drivers/pit.h
@@ -3,8 +3,8 @@
 #include <cpu/idt.h>
 #include <cpu/io.h>
 #include <sched/scheduler.h>
-#include <typedefs.h>
 #include <stdio.h>
+#include <typedefs.h>
 
 void pit_install(void);
 void set_pit_count(u16 hertz);
diff --git a/kernel/drivers/pst.h b/kernel/drivers/pst.h
index e8fdfaa..c020708 100644
--- a/kernel/drivers/pst.h
+++ b/kernel/drivers/pst.h
@@ -2,6 +2,7 @@
 #define PST_H
 #include "../fs/vfs.h"
 
-int openpty(int *amaster, int *aslave, char *name, /*const struct termios*/ void *termp,
+int openpty(int *amaster, int *aslave, char *name,
+            /*const struct termios*/ void *termp,
             /*const struct winsize*/ void *winp);
 #endif
diff --git a/kernel/drivers/serial.c b/kernel/drivers/serial.c
index 549d852..0972349 100644
--- a/kernel/drivers/serial.c
+++ b/kernel/drivers/serial.c
@@ -25,7 +25,9 @@ int serial_init(void) {
   return 0;
 }
 
-int is_transmit_empty() { return inb(PORT + 5) & 0x20; }
+int is_transmit_empty() {
+  return inb(PORT + 5) & 0x20;
+}
 
 void write_serial(char a) {
   while (is_transmit_empty() == 0)
diff --git a/kernel/drivers/vbe.c b/kernel/drivers/vbe.c
index 0fb0600..9c6fa4a 100644
--- a/kernel/drivers/vbe.c
+++ b/kernel/drivers/vbe.c
@@ -43,8 +43,7 @@ void display_driver_init(multiboot_info_t *mbi) {
   vbe_info.bpp = mbi->framebuffer_bpp;
 }
 
-vfs_vm_object_t *vbe_get_vm_object(u64 length, u64 offset,
-                                   vfs_fd_t *fd) {
+vfs_vm_object_t *vbe_get_vm_object(u64 length, u64 offset, vfs_fd_t *fd) {
   (void)fd;
   (void)length;
   (void)offset;
@@ -57,8 +56,7 @@ vfs_vm_object_t *vbe_get_vm_object(u64 length, u64 offset,
   return &vbe_vm_object;
 }
 
-int display_info_read(u8 *buffer, u64 offset, u64 len,
-                      vfs_fd_t *fd) {
+int display_info_read(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd) {
   (void)offset;
   int read_len = min(sizeof(struct DISPLAY_INFO), len);
   memcpy(buffer, &vbe_info, read_len);