Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bootloader
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
bootloader
Commits
f6c9cff3
Commit
f6c9cff3
authored
8 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Fixes for real hardware
parent
0a58960a
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
x86/bootsector.asm
+25
-25
25 additions, 25 deletions
x86/bootsector.asm
x86/startup-common.asm
+5
-5
5 additions, 5 deletions
x86/startup-common.asm
x86/vesa.asm
+2
-2
2 additions, 2 deletions
x86/vesa.asm
with
32 additions
and
32 deletions
x86/bootsector.asm
+
25
−
25
View file @
f6c9cff3
...
...
@@ -65,31 +65,31 @@ load:
mov
[
DAPACK.count
],
cx
mov
[
DAPACK.seg
],
dx
;
mov si, loading
;
call print
;
mov bx, [DAPACK.addr]
;
call print_num
;
mov al, '#'
;
call print_char
;
;
mov bx, [DAPACK.count]
;
call print_num
;
;
mov al, ' '
;
call print_char
;
;
mov bx, [DAPACK.seg]
;
call print_num
;
;
mov al, ':'
;
call print_char
;
;
mov bx, [DAPACK.buf]
;
call print_num
;
;
call print_line
mov
si
,
loading
call
print
mov
bx
,
[
DAPACK.addr
]
call
print_num
mov
al
,
'#'
call
print_char
mov
bx
,
[
DAPACK.count
]
call
print_num
mov
al
,
' '
call
print_char
mov
bx
,
[
DAPACK.seg
]
call
print_num
mov
al
,
':'
call
print_char
mov
bx
,
[
DAPACK.buf
]
call
print_num
call
print_line
mov
dl
,
[
di
sk
]
mov
si
,
DAPACK
...
...
This diff is collapsed.
Click to expand it.
x86/startup-common.asm
+
5
−
5
View file @
f6c9cff3
...
...
@@ -14,7 +14,7 @@ startup:
; buffersize in multiple of sectors (512 Bytes)
; min 1
; max (0x70000 - startup_end) / 512
buffer_size_sectors
equ
1
buffer_size_sectors
equ
512
; buffer size in Bytes
buffer_size_bytes
equ
buffer_size_sectors
*
512
...
...
@@ -32,7 +32,7 @@ kernel_base equ 0x100000
; populating buffer
mov
cx
,
buffer_size_sectors
mov
bx
,
startup_end
mov
bx
,
kernel_file
mov
dx
,
0x0
push
ax
...
...
@@ -42,7 +42,7 @@ kernel_base equ 0x100000
call
unreal
pop
ax
mov
esi
,
startup_end
mov
esi
,
kernel_file
mov
ecx
,
buffer_size_bytes
/
4
a32
rep
movsd
...
...
@@ -57,14 +57,14 @@ kernel_base equ 0x100000
test
cx
,
cx
jz
finished_loading
; if cx = 0 => skip
mov
bx
,
startup_end
mov
bx
,
kernel_file
mov
dx
,
0x0
call
load
; moving remnants of kernel
call
unreal
mov
esi
,
startup_end
mov
esi
,
kernel_file
mov
ecx
,
(
kernel_file.length_sectors
%
buffer_size_bytes
)
/
4
a32
rep
movsd
finished_loading:
...
...
This diff is collapsed.
Click to expand it.
x86/vesa.asm
+
2
−
2
View file @
f6c9cff3
...
...
@@ -183,8 +183,8 @@ vesa:
.minx
dw
640
.miny
dw
480
.required:
.requiredx
dw
1024
;USE THESE WITH CAUTION
.requiredy
dw
768
.requiredx
dw
0
;
1024 ;USE THESE WITH CAUTION
.requiredy
dw
0
;
768
.requiredmode
dw
0
.noedidmsg
db
"
EDI
D
not
supported.
",10,13,0
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment