From 17bfb0ef0a48330b1d54e61fe3c30d83528d2d90 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Wed, 25 Jan 2023 20:16:22 +0100
Subject: style: typedef structs, shorter namespaces

I've wanted to do this for a while, and since I've just had a relatively
large refactor commit (pcpy), this is as good of a time as any.

Typedefing structs was mostly inspired by Plan 9's coding style. It makes
some lines of code much shorter at basically no expense.
Everything related to userland kept old-style struct definitions, so as not
to force that style onto other people.

I also considered changing SCREAMING_ENUM_FIELDS to NicerLookingCamelcase,
but I didn't, just in case that'd be confusing.
---
 src/user/app/init/driver/ps2.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/user/app/init/driver/ps2.c')

diff --git a/src/user/app/init/driver/ps2.c b/src/user/app/init/driver/ps2.c
index 1accbfc..a5cdb07 100644
--- a/src/user/app/init/driver/ps2.c
+++ b/src/user/app/init/driver/ps2.c
@@ -32,7 +32,7 @@ static const char keymap_upper[] = {
 static volatile uint8_t backlog_buf[16];
 static volatile ring_t backlog = {(void*)backlog_buf, sizeof backlog_buf, 0, 0};
 
-static handle_t fd;
+static hid_t fd;
 
 static bool keys[0x80] = {0};
 
@@ -63,7 +63,7 @@ static void main_loop(void) {
 			case VFSOP_READ:
 				while (ring_used((void*)&backlog) == 0) {
 					/* read raw input until we have something to output */
-					int len = _syscall_read(fd, buf, sizeof buf, 0);
+					int len = _sys_read(fd, buf, sizeof buf, 0);
 					if (len == 0) break;
 					for (int i = 0; i < len; i++)
 						parse_scancode(buf[i]);
@@ -80,7 +80,7 @@ static void main_loop(void) {
 }
 
 void ps2_drv(void) {
-	fd = _syscall_open("/kdev/ps2/kb", 12, 0);
+	fd = _sys_open("/kdev/ps2/kb", 12, 0);
 	if (fd < 0) exit(1);
 
 	main_loop();
-- 
cgit v1.2.3