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

add 3 constants

Browse Source 
git-svn-id: svn://kolibrios.org@9571 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Doczom 2022-01-04 18:51:19 +00:00
parent e0db5d61cc
commit db7f673018
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/trunk/bus/usb/init.inc
View File

@ -46,6 +46,8 @@ ohci_service_name:
db 'OHCI',0 db 'OHCI',0
ehci_service_name: ehci_service_name:
db 'EHCI',0 db 'EHCI',0
xhci_service_name:
db 'XHCI',0
endg endg
; Initializes the USB subsystem. ; Initializes the USB subsystem.
@ -78,6 +80,9 @@ proc usb_init
jz .do_kickoff jz .do_kickoff
mov ebx, ehci_service_name mov ebx, ehci_service_name
cmp byte [esi+PCIDEV.class], 0x20 cmp byte [esi+PCIDEV.class], 0x20
jz .do_kickoff
mov ebx, xhci_service_name
cmp byte [esi+PCIDEV.class], 0x30
jnz .kickoff jnz .kickoff
.do_kickoff: .do_kickoff:
inc dword [esp] inc dword [esp]
@ -117,6 +122,16 @@ proc usb_init
; 4a. Loop over all PCI devices, call usb_init_controller ; 4a. Loop over all PCI devices, call usb_init_controller
; for all EHCI controllers. ; for all EHCI controllers.
mov eax, pcidev_list mov eax, pcidev_list
.scan_xhci:
mov eax, [eax+PCIDEV.fd]
cmp eax, pcidev_list
jz .done_xhci
cmp [eax+PCIDEV.class], 0x0C0330
jnz .scan_xhci
call usb_init_controller
jmp .scan_xhci
.done_xhci:
mov eax, pcidev_list
.scan_ehci: .scan_ehci:
mov eax, [eax+PCIDEV.fd] mov eax, [eax+PCIDEV.fd]
cmp eax, pcidev_list cmp eax, pcidev_list

4
kernel/trunk/kernel.asm
View File

@ -1782,7 +1782,7 @@ sys_getsetup:
;-------------------------------------- ;--------------------------------------
@@: @@:
; F.26.10 - get the time from kernel launch in nanoseconds ; F.26.10 - get the time from kernel launch in nanoseconds
sub ebx, 1 dec ebx
jnz @f jnz @f
call get_clock_ns call get_clock_ns
@ -1792,7 +1792,7 @@ sys_getsetup:
;-------------------------------------- ;--------------------------------------
@@: @@:
; F.26.11 - Find out whether low-level HD access is enabled ; F.26.11 - Find out whether low-level HD access is enabled
sub ebx, 1 dec ebx
jnz @f jnz @f
mov eax, [lba_read_enabled] mov eax, [lba_read_enabled]