sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

* hd_read doesn't add sector to cache if read error has occured

Browse Source 
* hd read errors at boot do not hang up system

git-svn-id: svn://kolibrios.org@725 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Evgeny Grechnikov (Diamond) 2008-02-10 10:16:46 +00:00
parent 6e65ab7c45
commit ee2c4f4c94
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trunk/blkdev/hd_drv.inc
View File

@ -62,6 +62,8 @@ hd_read:
.bios: .bios:
call bd_read call bd_read
@@: @@:
cmp [hd_error], 0
jne return_01
; lea esi,[edi*8+HD_CACHE] ; lea esi,[edi*8+HD_CACHE]
; push eax ; push eax
call calculate_cache_1 call calculate_cache_1

33
kernel/trunk/kernel.asm
View File

@ -557,6 +557,22 @@ high_code:
; Initialize system V86 machine ; Initialize system V86 machine
call init_sys_v86 call init_sys_v86
; TIMER SET TO 1/100 S
mov al,0x34 ; set to 100Hz
out 0x43,al
mov al,0x9b ; lsb 1193180 / 1193
out 0x40,al
mov al,0x2e ; msb
out 0x40,al
; Enable timer IRQ (IRQ0) and hard drives IRQs (IRQ14, IRQ15)
; they are used: when partitions are scanned, hd_read relies on timer
mov al, 0xFE
out 0x21, al
mov al, 0x3F
out 0xA1, al
;!!!!!!!!!!!!!!!!!!!!!!!!!! ;!!!!!!!!!!!!!!!!!!!!!!!!!!
include 'detect/disks.inc' include 'detect/disks.inc'
;!!!!!!!!!!!!!!!!!!!!!!!!!! ;!!!!!!!!!!!!!!!!!!!!!!!!!!
@ -600,7 +616,7 @@ no_lib_load:
; pop eax ; pop eax
; popad ; popad
stdcall read_file, char, FONT_I, 0, 2560 stdcall read_file, char, FONT_I, 0, 2304
stdcall read_file, char2, FONT_II, 0, 2560 stdcall read_file, char2, FONT_II, 0, 2560
mov esi,boot_fonts mov esi,boot_fonts
@ -632,17 +648,6 @@ no_lib_load:
call detect_devices call detect_devices
stdcall load_driver, szPS2MDriver stdcall load_driver, szPS2MDriver
; TIMER SET TO 1/100 S
mov esi,boot_timer
call boot_log
mov al,0x34 ; set to 100Hz
out 0x43,al
mov al,0x9b ; lsb 1193180 / 1193
out 0x40,al
mov al,0x2e ; msb
out 0x40,al
; SET MOUSE ; SET MOUSE
mov esi,boot_setmouse mov esi,boot_setmouse
@ -731,11 +736,13 @@ no_lib_load:
mov esi,boot_tsc mov esi,boot_tsc
call boot_log call boot_log
cli
call _rdtsc call _rdtsc
mov ecx,eax mov ecx,eax
mov esi,250 ; wait 1/4 a second mov esi,250 ; wait 1/4 a second
call delay_ms call delay_ms
call _rdtsc call _rdtsc
sti
sub eax,ecx sub eax,ecx
shl eax,2 shl eax,2
mov [CPU_FREQ],eax ; save tsc / sec mov [CPU_FREQ],eax ; save tsc / sec
@ -892,7 +899,7 @@ first_app_found:
jmp osloop jmp osloop
jmp $ ; wait here for timer to take control ; jmp $ ; wait here for timer to take control
; Fly :) ; Fly :)