summaryrefslogtreecommitdiff
path: root/kc
diff options
context:
space:
mode:
authorAda Christine <adachristine18@gmail.com>2023-02-05 12:51:06 +0000
committerAda Christine <adachristine18@gmail.com>2023-02-05 12:51:06 +0000
commit0bfbbabeed6b53d7aa44f6df9b569e3bacb040e9 (patch)
tree96c50e4354c2f5cc2f9c4c4b7689c7d5cf31212c /kc
parent05223a4bf6a3927ac638617d2e85bf3d0a348cb2 (diff)
remove stale header, add numeric.h, use min
Diffstat (limited to 'kc')
-rw-r--r--kc/core/video.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/kc/core/video.c b/kc/core/video.c
index ec1edf3..4ee0de9 100644
--- a/kc/core/video.c
+++ b/kc/core/video.c
@@ -1,6 +1,7 @@
#include <stdint.h>
#include <lib/kstring.h>
#include <lib/kstdio.h>
+#include <lib/numeric.h>
#include <kernel/entry.h>
/*
@@ -305,11 +306,6 @@ int video_putchar(int c)
return 0;
}
-static size_t min_sz(size_t left, size_t right)
-{
- return (left < right) ? left : right;
-}
-
static void bitmap_copy(struct video_bitmap *dest, struct video_bitmap *src, struct video_point dest_pos, struct video_rect src_rect)
{
void * (*copy_func)(void *, const void *, size_t) = memcpy;
@@ -335,7 +331,7 @@ static void bitmap_copy(struct video_bitmap *dest, struct video_bitmap *src, str
void *dest_addr = pixel_addr(dest, line_pos);
void *src_addr = pixel_addr(src, src_line_pos);
- copy_func(dest_addr, src_addr, min_sz(dest_stride, src_stride));
+ copy_func(dest_addr, src_addr, min(dest_stride, src_stride));
}
}