summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAnton Kling <anton@kling.gg>2024-12-12 16:03:08 +0100
committerAnton Kling <anton@kling.gg>2024-12-12 16:03:08 +0100
commitb033314bf1901d436dc71d41d5e1f37dda47e511 (patch)
tree120bd137888a7f96904a47af7d20422608ffe225 /kernel
parentdcbcdbdc5bcfb86eca05fb655e3bf009d89e39e0 (diff)
formatting: Use clang-format on all projects
This commit also add braces to all `if` statements.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/drivers/ac97.c2
-rw-r--r--kernel/drivers/ac97.h4
-rw-r--r--kernel/drivers/mouse.c12
-rw-r--r--kernel/fs/devfs.h1
-rw-r--r--kernel/includes/math.h6
-rw-r--r--kernel/includes/mmu.h2
-rw-r--r--kernel/lib/sb.c2
-rw-r--r--kernel/lib/sb.h3
-rw-r--r--kernel/lib/sv.h3
-rw-r--r--kernel/libc/ctype/tolower.c3
-rw-r--r--kernel/libc/include/assert.h3
-rw-r--r--kernel/network/udp.h3
12 files changed, 24 insertions, 20 deletions
diff --git a/kernel/drivers/ac97.c b/kernel/drivers/ac97.c
index b88a32a..27711ff 100644
--- a/kernel/drivers/ac97.c
+++ b/kernel/drivers/ac97.c
@@ -213,7 +213,7 @@ void ac97_init(void) {
PCM Output by writing value 0 to this register. Now sound card is
ready to use.
*/
- ac97_set_volume(100);
+ ac97_set_volume(5);
// Playing sound
/*
diff --git a/kernel/drivers/ac97.h b/kernel/drivers/ac97.h
index f1089e5..20ac43b 100644
--- a/kernel/drivers/ac97.h
+++ b/kernel/drivers/ac97.h
@@ -1,8 +1,8 @@
-#include <typedefs.h>
#include <stddef.h>
+#include <typedefs.h>
void ac97_init(void);
-int ac97_add_pcm(u8* buffer, size_t len);
+int ac97_add_pcm(u8 *buffer, size_t len);
int ac97_can_write(void);
void ac97_set_volume(int volume);
int ac97_get_volume(void);
diff --git a/kernel/drivers/mouse.c b/kernel/drivers/mouse.c
index 47133b8..dea8c08 100644
--- a/kernel/drivers/mouse.c
+++ b/kernel/drivers/mouse.c
@@ -102,18 +102,22 @@ void int_mouse(reg_t *r) {
int16_t y = mouse_u8[2];
uint8_t xs = mouse_u8[0] & (1 << 4);
uint8_t ys = mouse_u8[0] & (1 << 5);
- if (xs)
+ if (xs) {
x |= 0xFF00;
- if (ys)
+ }
+ if (ys) {
y |= 0xFF00;
+ }
mouse_x += x;
mouse_y -= y;
- if (mouse_x < 0)
+ if (mouse_x < 0) {
mouse_x = 0;
- if (mouse_y < 0)
+ }
+ if (mouse_y < 0) {
mouse_y = 0;
+ }
mouse_middle_button = mouse_u8[0] & (1 << 2);
mouse_right_button = mouse_u8[0] & (1 << 1);
diff --git a/kernel/fs/devfs.h b/kernel/fs/devfs.h
index 09bf4d6..09c60d0 100644
--- a/kernel/fs/devfs.h
+++ b/kernel/fs/devfs.h
@@ -22,7 +22,6 @@ vfs_inode_t *devfs_add_file(
int (*has_data)(vfs_inode_t *inode), int (*can_write)(vfs_inode_t *inode),
int type);
-
int always_has_data(vfs_inode_t *inode);
int always_can_write(vfs_inode_t *inode);
#endif
diff --git a/kernel/includes/math.h b/kernel/includes/math.h
index 87a9d37..8fb698d 100644
--- a/kernel/includes/math.h
+++ b/kernel/includes/math.h
@@ -1,3 +1,3 @@
-#define min(a,b) ((a) > (b) ? (b) : (a))
-#define max(a,b) ((a) < (b) ? (b) : (a))
-#define abs(a) ((a)>0?(a):(-1*(a)))
+#define min(a, b) ((a) > (b) ? (b) : (a))
+#define max(a, b) ((a) < (b) ? (b) : (a))
+#define abs(a) ((a) > 0 ? (a) : (-1 * (a)))
diff --git a/kernel/includes/mmu.h b/kernel/includes/mmu.h
index 580b40e..20cd2ae 100644
--- a/kernel/includes/mmu.h
+++ b/kernel/includes/mmu.h
@@ -49,7 +49,7 @@ void mmu_free_address_range(void *ptr, size_t length, PageDirectory *pd);
u32 mmu_get_number_of_allocated_frames(void);
void *mmu_map_frames(void *ptr, size_t s);
int mmu_map_physical(void *dst, PageDirectory *d, void *physical,
- size_t length);
+ size_t length);
void mmu_free_pages(void *a, u32 n);
void *mmu_map_user_frames(void *const ptr, size_t s);
void *mmu_is_valid_userpointer(const void *ptr, size_t s);
diff --git a/kernel/lib/sb.c b/kernel/lib/sb.c
index 3f99d95..6f716ac 100644
--- a/kernel/lib/sb.c
+++ b/kernel/lib/sb.c
@@ -1,8 +1,8 @@
#include <kmalloc.h>
+#include <lib/sb.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
-#include <tb/sb.h>
#define DEFAULT_CAPACITY 256
diff --git a/kernel/lib/sb.h b/kernel/lib/sb.h
index 8493997..7832015 100644
--- a/kernel/lib/sb.h
+++ b/kernel/lib/sb.h
@@ -22,8 +22,7 @@ int sb_isempty(const struct sb *ctx);
int sb_append_char(struct sb *ctx, char c);
int sb_delete_right(struct sb *ctx, size_t n);
int sb_append(struct sb *ctx, const char *s);
-int sb_append_buffer(struct sb *ctx, const char *buffer,
- size_t length);
+int sb_append_buffer(struct sb *ctx, const char *buffer, size_t length);
int sb_append_sv(struct sb *ctx, struct sv sv);
int sb_prepend_sv(struct sb *ctx, struct sv sv);
int sb_prepend_buffer(struct sb *ctx, const char *buffer, size_t length);
diff --git a/kernel/lib/sv.h b/kernel/lib/sv.h
index bd556d4..40f33ca 100644
--- a/kernel/lib/sv.h
+++ b/kernel/lib/sv.h
@@ -40,5 +40,6 @@ struct sv sv_trim_left(struct sv s, size_t n);
struct sv sv_clone(struct sv s);
struct sv sv_clone_from_c(const char *s);
char *sv_copy_to_c(struct sv s, char *out, size_t buffer_length);
-uint64_t sv_parse_unsigned_number(struct sv input, struct sv *rest, int *got_num);
+uint64_t sv_parse_unsigned_number(struct sv input, struct sv *rest,
+ int *got_num);
#endif
diff --git a/kernel/libc/ctype/tolower.c b/kernel/libc/ctype/tolower.c
index f1bb163..c14ea54 100644
--- a/kernel/libc/ctype/tolower.c
+++ b/kernel/libc/ctype/tolower.c
@@ -1,7 +1,8 @@
#include <ctype.h>
int tolower(int c) {
- if (c >= 'A' && c <= 'Z')
+ if (c >= 'A' && c <= 'Z') {
return c - 'A' + 'a';
+ }
return c;
}
diff --git a/kernel/libc/include/assert.h b/kernel/libc/include/assert.h
index d6525f0..1b631ac 100644
--- a/kernel/libc/include/assert.h
+++ b/kernel/libc/include/assert.h
@@ -21,5 +21,4 @@
}
void aFailed(char *f, int l);
-#define ASSERT_NOT_REACHED \
- { assert(0) }
+#define ASSERT_NOT_REACHED {assert(0)}
diff --git a/kernel/network/udp.h b/kernel/network/udp.h
index af532ec..06f65d1 100644
--- a/kernel/network/udp.h
+++ b/kernel/network/udp.h
@@ -1,6 +1,7 @@
#include <socket.h>
#include <typedefs.h>
-void handle_udp(ipv4_t src_ip, ipv4_t dst_ip, const u8 *payload, u32 packet_length);
+void handle_udp(ipv4_t src_ip, ipv4_t dst_ip, const u8 *payload,
+ u32 packet_length);
void send_udp_packet(struct sockaddr_in *src, const struct sockaddr_in *dst,
const u8 *payload, u16 payload_length);