diff --git a/include/fb.h b/include/fb.h index 2130023..66a0d97 100644 --- a/include/fb.h +++ b/include/fb.h @@ -33,10 +33,14 @@ enum colors { #define SCREEN_HEIGHT height #define SCREEN_BUFFER fb_addr +#ifndef NO_DEBUG #define LOG(...) \ fb_printf("[%u]%s() (%s:%d) ", GET_TICK_BIG, __func__, __FILE__, \ __LINE__); \ fb_printf(__VA_ARGS__) +#else +#define LOG(...) +#endif void fb_set_text_color(uint32_t color); void fb_init( ); diff --git a/include/version.h b/include/version.h index 13f6f22..567c44c 100644 --- a/include/version.h +++ b/include/version.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 1 -#define VERSION_BUILD 580 +#define VERSION_BUILD 582 diff --git a/kernel/start.c b/kernel/start.c index 8ee8979..28aca03 100644 --- a/kernel/start.c +++ b/kernel/start.c @@ -24,11 +24,11 @@ void _start( ) { mem_init( ); fb_set_text_color(0x00FF00); - LOG("\t\t\t\t *** Базовая Модульная Платформа Операционных Систем " - "версии %u.%u.%u %s***\n", - VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, KERNEL_GIT_TAG); + fb_printf("\t\t\t\t *** Базовая Модульная Платформа Операционных Систем " + "версии %u.%u.%u %s***\n", + VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, KERNEL_GIT_TAG); - LOG("\t\t\t\t *** Дата сборки: %s %s ***\n", __DATE__, __TIME__); + fb_printf("\t\t\t\t *** Дата сборки: %s %s ***\n", __DATE__, __TIME__); fb_set_text_color(0x00D000); mod_init( ); diff --git a/pbuild.py b/pbuild.py index ef8513a..ced66fa 100644 --- a/pbuild.py +++ b/pbuild.py @@ -13,7 +13,7 @@ if "^.M" in output: ARCH_FLAGS = "-m64 -march=x86-64 -mabi=sysv -mno-red-zone -mcmodel=kernel -MMD -MP" WARN_FLAGS = "-Wall -Wextra -nostdlib" -STANDART_FLAGS = f"-std=gnu11 -DKERNEL_GIT_TAG=\\\"{__VERSION}\\\"" +STANDART_FLAGS = f"-std=gnu11 -DKERNEL_GIT_TAG=\\\"{__VERSION}\\\"" # -DNO_DEBUG=1 PROTECT_FLAGS = "-O0 -g -pipe -ffreestanding -fno-stack-protector -fno-lto -fno-stack-check -fno-PIC -fno-PIE" CHARSET_FLAGS = "-finput-charset=UTF-8 -fexec-charset=cp1251" LIBS_FLAGS = "-Ilimine -Iinclude"