Skip to content

Commit

Permalink
Исправление предупреждений
Browse files Browse the repository at this point in the history
  • Loading branch information
Aren committed Feb 1, 2024
1 parent 84e5169 commit 885a097
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion kernel/cpu/idt.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static void exception_handler(struct frame state) {
}

stack_frame_t *stk;
stk = state.rbp;
stk = (stack_frame_t *)state.rbp;

LOG("Трассировка стека:\n");

Expand Down
4 changes: 2 additions & 2 deletions kernel/mod.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void mod_init( ) {
continue;
}

module_info_t (*module_init)(env_t * env) =
module_info_t (*module_init)(env_t *env) =
(module_info_t(*)(env_t * env)) elf_entry((elf64_header_t *)module_ptr->address);

// LOG("\t->Точка входа: 0x%x\n", module_init);
Expand All @@ -136,7 +136,7 @@ void mod_init( ) {

sys_install(&main_env);

uint64_t id = task_new_thread(1, module_list[i].name);
uint64_t id = task_new_thread((void *)1, module_list[i].name);

module_info_t ret = module_init(&main_env);
LOG("\t->%s\n", ret.message);
Expand Down
2 changes: 1 addition & 1 deletion modules/helloworld/main.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <system.h>

static const char name[] = "Привет мир!";
static const char name[] = "[APP]Привет мир!";
static const char message[] = "Привет из модуля!";

module_info_t __attribute__((section(".minit"))) init(env_t *env) {
Expand Down
Empty file modified modules/ios/build.sh
100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions modules/ios/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ static void main( ) {
delete_thread( );
} else {
app_list = realloc(app_list, app_count * sizeof(module_info_t));
for (uint64_t i = 0; i < app_count; i++) { fb_printf("%2u.\t%s\n", app_list[i]); }
for (;;) { asm volatile("hlt"); }
}

Expand Down
2 changes: 1 addition & 1 deletion modules/ps2/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static int is_ctrl(uint8_t scancode) {
}
}

static void handler(struct frame *state) {
void handler(struct frame *state) {
(void)state;
while (!(inb(0x64) & 1)) { asm volatile("pause"); }

Expand Down

0 comments on commit 885a097

Please sign in to comment.