summaryrefslogtreecommitdiff
path: root/src/kernel/mem/virt.c
diff options
context:
space:
mode:
authordzwdz2023-01-25 20:16:22 +0100
committerdzwdz2023-01-25 20:16:22 +0100
commit17bfb0ef0a48330b1d54e61fe3c30d83528d2d90 (patch)
treeb3d4aed1f408edcb17fe5c86fccaeacaa2a5a48a /src/kernel/mem/virt.c
parent2ad6ee8ed15d1bf898645a16dbc06991a3c1425e (diff)
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.
Diffstat (limited to 'src/kernel/mem/virt.c')
-rw-r--r--src/kernel/mem/virt.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/kernel/mem/virt.c b/src/kernel/mem/virt.c
index 8bf5e69..1ac6fbc 100644
--- a/src/kernel/mem/virt.c
+++ b/src/kernel/mem/virt.c
@@ -18,7 +18,7 @@ struct virt_iter {
void __user *_virt;
size_t _remaining;
- struct pagedir *_pages;
+ Pagedir *_pages;
bool _user;
bool _writeable;
};
@@ -30,12 +30,12 @@ struct virt_cpy_error { // unused
/* if pages == NULL, creates an iterator over physical memory. */
static void virt_iter_new(
struct virt_iter *iter, void __user *virt, size_t length,
- struct pagedir *pages, bool user, bool writeable
+ Pagedir *pages, bool user, bool writeable
);
static bool virt_iter_next(struct virt_iter *);
static size_t virt_cpy(
- struct pagedir *dest_pages, void __user *dest,
- struct pagedir *src_pages, const void __user *src,
+ Pagedir *dest_pages, void __user *dest,
+ Pagedir *src_pages, const void __user *src,
size_t length, struct virt_cpy_error *err
);
@@ -43,7 +43,7 @@ static size_t virt_cpy(
static void
virt_iter_new(
struct virt_iter *iter, void __user *virt, size_t length,
- struct pagedir *pages, bool user, bool writeable
+ Pagedir *pages, bool user, bool writeable
) {
iter->frag = NULL;
iter->frag_len = 0;
@@ -94,8 +94,8 @@ virt_iter_next(struct virt_iter *iter)
static size_t
virt_cpy(
- struct pagedir *dest_pages, void __user *dest,
- struct pagedir *src_pages, const void __user *src,
+ Pagedir *dest_pages, void __user *dest,
+ Pagedir *src_pages, const void __user *src,
size_t length, struct virt_cpy_error *err
) {
struct virt_iter dest_iter, src_iter;
@@ -132,7 +132,7 @@ virt_cpy(
}
size_t
-pcpy_to(struct process *p, __user void *dst, const void *src, size_t len)
+pcpy_to(Proc *p, __user void *dst, const void *src, size_t len)
{
assert(p);
if (!p->pages) return 0;
@@ -140,7 +140,7 @@ pcpy_to(struct process *p, __user void *dst, const void *src, size_t len)
}
size_t
-pcpy_from(struct process *p, void *dst, const __user void *src, size_t len)
+pcpy_from(Proc *p, void *dst, const __user void *src, size_t len)
{
assert(p);
if (!p->pages) return 0;
@@ -149,8 +149,8 @@ pcpy_from(struct process *p, void *dst, const __user void *src, size_t len)
size_t
pcpy_bi(
- struct process *dstp, __user void *dst,
- struct process *srcp, const __user void *src,
+ Proc *dstp, __user void *dst,
+ Proc *srcp, const __user void *src,
size_t len
) {
assert(dstp && srcp);