elal
/
eOS
mirror of https://github.com/E-Almqvist/eOS
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fix

Browse Source
memory
E. Almqvist 3 years ago
parent fd7e32e141
commit 7de16a6a67
2 changed files with 3 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      drivers/vga.h
  2. 4
      kernel/memory.c

2
drivers/vga.h
Unescape View File

@ -2,7 +2,7 @@
#define VGA_ADDRESS_MAX 0xb8fa0 #define VGA_ADDRESS_MAX 0xb8fa0
#define DEFAULT_COLOR 0x07 #define DEFAULT_COLOR 0x07
#define URGET_COLOR 0x0c #define URGENT_COLOR 0x0c
#define SUCCESS_COLOR 0x0a #define SUCCESS_COLOR 0x0a
#define MAX_ROWS 25 #define MAX_ROWS 25

4
kernel/memory.c
Unescape View File

@ -43,7 +43,7 @@ pointer block_alloc(uint blockidx) {
return BLOCK_TO_MEMP(blockidx); return BLOCK_TO_MEMP(blockidx);
} else { } else {
println("[ERROR] Attemped to allocate non-free block.", 0x0c); println("[ERROR] Attemped to allocate non-free block.", URGENT_COLOR);
return 0; return 0;
} }
@ -92,7 +92,7 @@ void pm_alloc_range(ulong start, ulong end, bool force) {
return; return;
} else { } else {
println("[ERROR] Tried to allocate memory range without permission!", 0x0c); println("[ERROR] Tried to allocate memory range without permission!", URGENT_COLOR);
return; return;
} }
} }

Write Preview
Loading…
Cancel
Save