aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranklin Wei <frankhwei536@gmail.com>2015-02-09 21:31:25 -0500
committerFranklin Wei <frankhwei536@gmail.com>2015-02-09 21:31:25 -0500
commit997eedc958753a9a1d2ce2b487c1c255cc3e7298 (patch)
treec62e22debfef956efd36c0121692ac9232728fae
parent893694168d8b943505ff30bd4db57ac8aaef6fef (diff)
downloadkappa-997eedc958753a9a1d2ce2b487c1c255cc3e7298.zip
kappa-997eedc958753a9a1d2ce2b487c1c255cc3e7298.tar.gz
kappa-997eedc958753a9a1d2ce2b487c1c255cc3e7298.tar.bz2
kappa-997eedc958753a9a1d2ce2b487c1c255cc3e7298.tar.xz
remove sanity checks
-rw-r--r--drivers/gfx.c9
-rw-r--r--kernel/main.c3
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/gfx.c b/drivers/gfx.c
index 87b2962..f2b2cac 100644
--- a/drivers/gfx.c
+++ b/drivers/gfx.c
@@ -46,14 +46,7 @@ uint32_t gfx_get_foreground(void)
void gfx_drawpixel(int x, int y)
{
- if(0 <= y && y < fb_height && 0 <= x && x < fb_width)
- ((uint32_t*)framebuffer)[y * fb_width + x] = _gfx_fgcol;
- else
- {
- printf("x: %d, y: %d\n", x, y);
- printf("max_x: %d\nmax_y: %d\n", fb_width, fb_height);
- panic("OOB");
- }
+ ((uint32_t*)framebuffer)[y * fb_width + x] = _gfx_fgcol;
}
/* implemented in assembly now */
diff --git a/kernel/main.c b/kernel/main.c
index fd263db..2ec6c46 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -69,7 +69,6 @@ void main(struct multiboot_info_t *hdr, uint32_t magic)
printf("Running graphics benchmark...\n");
srand(42);
-
if(gfx_status)
{
const int width = *gfx_width;
@@ -99,6 +98,7 @@ void main(struct multiboot_info_t *hdr, uint32_t magic)
int endfill = *current_tick;
gfx_clear();
+
int starttext = *current_tick;
for(int i=0;i<1000000;++i)
{
@@ -108,6 +108,7 @@ void main(struct multiboot_info_t *hdr, uint32_t magic)
gfx_drawchar(rx, ry, rand()%127+1);
}
int endtext = *current_tick;
+
gfx_clear();
int starthline = *current_tick;