From 75edc9925acd42a0a90a2b95a4f5a9b5d5efd41d Mon Sep 17 00:00:00 2001 From: tracer-ics2023 Date: Wed, 25 Sep 2024 22:07:29 +0800 Subject: [PATCH] =?UTF-8?q?>=20=20compile=20NEMU=20221220000=20=E5=BC=A0?= =?UTF-8?q?=E4=B8=89=20Linux=20zzy=205.15.146.1-microsoft-standard-WSL2=20?= =?UTF-8?q?#1=20SMP=20Thu=20Jan=2011=2004:09:03=20UTC=202024=20x86=5F64=20?= =?UTF-8?q?x86=5F64=20x86=5F64=20GNU/Linux=20=2022:07:29=20up=207=20days,?= =?UTF-8?q?=2022:07,=20=201=20user,=20=20load=20average:=200.41,=200.34,?= =?UTF-8?q?=200.28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nanos-lite/src/proc.c | 2 +- navy-apps/libs/libndl/NDL.c | 2 +- navy-apps/tests/bmp-test/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nanos-lite/src/proc.c b/nanos-lite/src/proc.c index 1a55beb..f769d34 100644 --- a/nanos-lite/src/proc.c +++ b/nanos-lite/src/proc.c @@ -26,7 +26,7 @@ void init_proc() { // load program here void naive_uload(PCB *pcb, const char *filename); - naive_uload(NULL, "/bin/nslider"); + naive_uload(NULL, "/bin/bmp-test"); } diff --git a/navy-apps/libs/libndl/NDL.c b/navy-apps/libs/libndl/NDL.c index 9bea101..c96288a 100644 --- a/navy-apps/libs/libndl/NDL.c +++ b/navy-apps/libs/libndl/NDL.c @@ -92,7 +92,7 @@ void NDL_DrawRect(uint32_t *pixels, int x, int y, int w, int h) { int _y = (dev_h - h) / 2; // printf("NDL_DrawRect: %d,%d, dev %d,%d, wh %d,%d, xy %d,%d\n", _x, _y, dev_w, dev_h, w, h, x, y); for (int i = 0; i < h; i ++) { - printf("log:%d,%d, dev %d,%d, wh %d,%d, xy %d,%d\n", _x, _y + i, dev_w, dev_h, w, h, x, y); + // printf("log:%d,%d, dev %d,%d, wh %d,%d, xy %d,%d\n", _x, _y + i, dev_w, dev_h, w, h, x, y); fseek(fp, NDL_SCREEN_POS(_x, _y + i, dev_w, dev_h), SEEK_SET); fwrite(pixels + NDL_SCREEN_IDX(x, y + i, screen_w, screen_h), 4, w, fp); } diff --git a/navy-apps/tests/bmp-test/main.c b/navy-apps/tests/bmp-test/main.c index bab9b31..613c09a 100644 --- a/navy-apps/tests/bmp-test/main.c +++ b/navy-apps/tests/bmp-test/main.c @@ -7,7 +7,7 @@ int main() { NDL_Init(0); int w, h; - void *bmp = BMP_Load("/share/pictures/projectn.bmp", &w, &h); + void *bmp = BMP_Load("/share/pictures/test.bmp", &w, &h); assert(bmp); NDL_OpenCanvas(&w, &h); NDL_DrawRect(bmp, 0, 0, w, h);