From fa693c71a70a5769c3db26d541f48997de5b9417 Mon Sep 17 00:00:00 2001 From: Ry Date: Thu, 30 Mar 2023 21:44:29 -0700 Subject: [PATCH] all: Increase file struct size to 32 bytes for both files and streams --- applications/bg/main.asm | 2 +- applications/sh/commands/dir.asm | 2 +- applications/sh/commands/type.asm | 2 +- applications/terminal/main.asm | 8 ++++++-- kernel/fxf/launch.asm | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/applications/bg/main.asm b/applications/bg/main.asm index f371f9f..a471732 100644 --- a/applications/bg/main.asm +++ b/applications/bg/main.asm @@ -19,7 +19,7 @@ call end_current_task bg_file_name: data.strz "bg.raw" -bg_file_struct: data.fill 0, 8 +bg_file_struct: data.fill 0, 32 #include "../../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/sh/commands/dir.asm b/applications/sh/commands/dir.asm index c996013..fc4b371 100644 --- a/applications/sh/commands/dir.asm +++ b/applications/sh/commands/dir.asm @@ -79,7 +79,7 @@ shell_dir_command_failed_to_open_file: shell_dir_command_list_buffer: data.fill 0, 341 shell_dir_command_file_buffer: data.fill 0, 9 shell_dir_command_type_buffer: data.fill 0, 4 -shell_dir_command_temp_file_struct: data.fill 0, 8 +shell_dir_command_temp_file_struct: data.fill 0, 32 shell_dir_command_header_string: data.8 SET_COLOR data.8 0x20 data.8 1 ; set the color to green data.str "file type size" data.8 10 diff --git a/applications/sh/commands/type.asm b/applications/sh/commands/type.asm index 409b1b5..e7c7020 100644 --- a/applications/sh/commands/type.asm +++ b/applications/sh/commands/type.asm @@ -43,6 +43,6 @@ shell_type_command_file_not_found: ret -shell_type_command_file_struct: data.32 0 data.32 0 +shell_type_command_file_struct: data.fill 0, 32 shell_type_command_file_character_buffer: data.8 0 shell_type_command_file_not_found_string: data.strz "file not found: " diff --git a/applications/terminal/main.asm b/applications/terminal/main.asm index e3d77d0..1ccc024 100644 --- a/applications/terminal/main.asm +++ b/applications/terminal/main.asm @@ -124,11 +124,15 @@ shell_task_id: data.8 0 stream_struct: data.8 0x00 - data.16 0x00 - data.32 0x00 + data.16 0x0000 + data.32 0x00000000 data.8 0x01 data.32 stream_get_input data.32 stream_write_to_terminal + data.32 0x00000000 + data.32 0x00000000 + data.32 0x00000000 + data.32 0x00000000 #include "stream.asm" #include "text.asm" diff --git a/kernel/fxf/launch.asm b/kernel/fxf/launch.asm index ac89744..dee5d67 100644 --- a/kernel/fxf/launch.asm +++ b/kernel/fxf/launch.asm @@ -109,7 +109,7 @@ launch_fxf_from_disk_file_error: mov r0, 0xFFFFFFFF ret -launch_fxf_struct: data.fill 0, 8 +launch_fxf_struct: data.fill 0, 32 launch_fxf_task_id: data.8 0 launch_fxf_binary_ptr: data.32 0 launch_fxf_stack_ptr: data.32 0