From 73b42c66fd7246ee286237caf39c1989e9a8ecd6 Mon Sep 17 00:00:00 2001 From: Elaina Claus Date: Sat, 12 Oct 2024 15:38:24 -0400 Subject: [PATCH] renamed mem.inc and removed unused items --- include/{mem.inc => early_mem.inc} | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) rename include/{mem.inc => early_mem.inc} (88%) diff --git a/include/mem.inc b/include/early_mem.inc similarity index 88% rename from include/mem.inc rename to include/early_mem.inc index 0ac49da..d2b3ea2 100755 --- a/include/mem.inc +++ b/include/early_mem.inc @@ -18,7 +18,7 @@ ; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ; SOFTWARE. -%ifndef __INC_MEM +%ifndef __INC_EARLY_MEM ; ## Generic Low mem map (from osdev wiki) ## @@ -60,13 +60,11 @@ ; next free space is 0x32D0 %define fat32_nc_data 0x35D0 -%define fat32_nc_data_size 16 +%define fat32_nc_data_SIZE 16 ; lba_packet for raw_disk_read %define lba_packet 0x4000 - - ;PhysicalAddress = Segment * 16 + Offset %define SEG_TO_LINEAR(s,o) ((s << 4) + o) @@ -76,21 +74,5 @@ ; Seg = (physical - offset) / 16 %define LINEAR_TO_SEGMENT(p,o) ((p - o) >> 4) -; create normalized linear addres from seg:off (16:4) -; Segement = linear >> 4 (top 16 bits) -; offset = linear & 0x0F (low 4 bits) - -struc EarlyBootStruct_t - .lba_packet_offset resw 1 -endstruc - -; 20 bytes, passed to loaded kernel -struc SteviaInfoStruct_t - .MemoryMapPtr resd 1 - .MemoryMapEntries resd 1 - .BPBDataPtr resd 1 - .EBPBDataPtr resd 1 -endstruc - %endif -%define __INC_MEM \ No newline at end of file +%define __INC_EARLY_MEM \ No newline at end of file