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

Added copyright strings for author of DMA HDD code (Mario79). Fixed error handling in hd_drv.inc.

Browse Source 
git-svn-id: svn://kolibrios.org@161 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Evgeny Grechnikov (Diamond) 2006-10-02 12:21:10 +00:00
parent 393a43c2ba
commit 603863d00c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,5 @@
; Low-level driver for HDD access
; DMA support by Mario79
;************************************************************************** ;**************************************************************************
; ;
@ -431,8 +433,7 @@ hd_read_error:
mov esi,hd_read_str mov esi,hd_read_str
call sys_msg_board_str call sys_msg_board_str
pop edx eax pop edx eax
jmp return_01 ret
; jmp $
hd_write_error: hd_write_error:
@ -440,8 +441,7 @@ hd_write_error:
call clear_application_table_status call clear_application_table_status
mov esi,hd_write_str mov esi,hd_write_str
call sys_msg_board_str call sys_msg_board_str
jmp return_02 ret
; jmp $
hd_write_error_dma: hd_write_error_dma:
call clear_hd_cache call clear_hd_cache
@ -449,7 +449,7 @@ hd_write_error_dma:
mov esi, hd_write_str mov esi, hd_write_str
call sys_msg_board_str call sys_msg_board_str
pop esi pop esi
jmp return_02 ret
hd_lba_error: hd_lba_error:
call clear_hd_cache call clear_hd_cache
@ -520,6 +520,7 @@ wait_for_sector_buffer:
pop edx eax pop edx eax
ret ret
; \begin{Mario79}
align 4 align 4
wait_for_sector_dma_ide0: wait_for_sector_dma_ide0:
push eax push eax
@ -852,3 +853,4 @@ do_write_dma:
uglobal uglobal
IDEContrRegsBaseAddr dw ? IDEContrRegsBaseAddr dw ?
endg endg
; \end{Mario79}

3
kernel/trunk/boot/bootcode.inc
View File

@ -364,6 +364,8 @@ sayerr:
push 0 push 0
pop es pop es
and word [es:0x9031], 0 and word [es:0x9031], 0
; \begin{Mario79}
; find HDD IDE DMA PCI device
; check for PCI BIOS ; check for PCI BIOS
mov ax, 0xB101 mov ax, 0xB101
int 0x1A int 0x1A
@ -400,6 +402,7 @@ sayerr:
and cx, 0xFFF0 ; clear address decode type and cx, 0xFFF0 ; clear address decode type
mov [es:0x9031], cx mov [es:0x9031], cx
.nopci: .nopci:
; \end{Mario79}
mov al,0xf6 ; Ñáðîñ êëàâèàòóðû, ðàçðåøèòü ñêàíèðîâàíèå mov al,0xf6 ; Ñáðîñ êëàâèàòóðû, ðàçðåøèòü ñêàíèðîâàíèå
out 0x60,al out 0x60,al