WebSVN – Kolibri OS – Diff – /kernel/trunk/drivers/usb/usb.asm

 API_VERSION     equ 0  ;debug
 include '../proc32.inc'
-include '../imports.inc'
-OS_BASE         equ 0x80000000
-SLOT_BASE       equ OS_BASE+0x0080000
+include '../imports.inc'
 struc UHCI
 {
-   .bus         dd ?
+   .bus                dd ?
-   .devfn       dd ?
+   .devfn              dd ?
-   .io_base     dd ?
+   .io_base            dd ?
-   .mm_base     dd ?
+   .mm_base            dd ?
-   .irq         dd ?
+   .irq                dd ?
-   .flags       dd ?
+   .flags              dd ?
+   .reset              dd ?
+   .start              dd ?
+   .stop               dd ?
+   .port_c_suspend     dd ?
+   .resuming_ports     dd ?
-   .reset       dd ?
+   .rh_state           dd ?
+   .rh_numports        dd ?
+   .is_stopped         dd ?
-   .start       dd ?
+   .dead               dd ?
    .stop        dd ?
    .sizeof:
+}
 virtual at 0
   IOCTL IOCTL
+end virtual
+struc TD   ;transfer descriptor
+{
+   .link        dd ?
+   .status      dd ?
+   .token       dd ?
+   .buffer      dd ?
+   .addr        dd ?
+   .frame       dd ?
+   .fd          dd ?
+   .bk          dd ?
+   .sizeof:
+}
+virtual at 0
+  TD TD
 end virtual
 public START
 public service_proc
 .err:
            xor eax, eax
            ret
 endp
-PCI_BASE     equ 0x20
+PCI_BASE    equ 0x20
 USB_LEGKEY  equ 0xC0
 align 4
            mov esi, [uhci]
            mov [esi+UHCI.io_base], eax
+           stdcall uhci_reset, esi
            stdcall uhci_reset, esi
            stdcall finish_reset, [uhci]
 .fail:
      if DEBUG
            mov esi, msgDevNotFound
            call SysMsgBoardStr
      end if
            ret
 endp
-UHCI_USBINTR          equ  4             ; interrupt register
+UHCI_USBINTR            equ  4             ; interrupt register
-UHCI_USBLEGSUP_RWC    equ  0x8f00        ; the R/WC bits
+UHCI_USBLEGSUP_RWC      equ  0x8f00        ; the R/WC bits
-UHCI_USBLEGSUP_RO     equ  0x5040        ; R/O and reserved bits
+UHCI_USBLEGSUP_RO       equ  0x5040        ; R/O and reserved bits
+UHCI_USBCMD_RUN         equ  0x0001        ; RUN/STOP bit
+UHCI_USBCMD_HCRESET     equ  0x0002        ; Host Controller reset
+UHCI_USBCMD_EGSM        equ  0x0008        ; Global Suspend Mode
+UHCI_USBCMD_CONFIGURE   equ  0x0040        ; Config Flag
+UHCI_USBINTR_RESUME     equ  0x0002        ; Resume interrupt enable
+PORTSC0                 equ  0x10
+PORTSC1                 equ  0x12
+UHCI_RH_RESET           equ  0
+UHCI_RH_SUSPENDED       equ  1
+UHCI_RH_AUTO_STOPPED    equ  2
+UHCI_RH_RESUMING        equ  3
+; In this state the HC changes from running to halted
+; so it can legally appear either way.
+UHCI_RH_SUSPENDING      equ  4
-UHCI_USBCMD_RUN       equ  0x0001        ; RUN/STOP bit
+; In the following states it's an error if the HC is halted.
-UHCI_USBCMD_HCRESET   equ  0x0002        ; Host Controller reset
-UHCI_USBCMD_EGSM      equ  0x0008        ; Global Suspend Mode
+; These two must come last.
-UHCI_USBCMD_CONFIGURE equ  0x0040        ; Config Flag
+UHCI_RH_RUNNING         equ 5  ; The normal state
-UHCI_USBINTR_RESUME   equ  0x0002        ; Resume interrupt enable
+UHCI_RH_RUNNING_NODEVS  equ 6  ; Running with no devices
            test ax, UHCI_USBCMD_CONFIGURE
            jz .reset
            test ax, UHCI_USBCMD_EGSM
+           jz .reset
+           add edx, UHCI_USBINTR
+           in ax, dx
+           test ax, not UHCI_USBINTR_RESUME
-           jz .reset
+           jnz .reset
            ret
 .reset:
            stdcall PciWrite16, [esi+UHCI.bus], [esi+UHCI.devfn], USB_LEGKEY, UHCI_USBLEGSUP_RWC
            add edx, UHCI_USBINTR
            out dx, ax
            ret
 endp
+proc finish_reset stdcall, uhci:dword
+           mov esi, [uhci]
+           mov edx, [esi+UHCI.io_base]
+           add edx, PORTSC0
+           xor eax, eax
+           out dx, ax
+           add edx, (PORTSC1-PORTSC0)
+           out dx, ax
+           mov [esi+UHCI.port_c_suspend], eax
+           mov [esi+UHCI.resuming_ports], eax
+           mov [esi+UHCI.rh_state], UHCI_RH_RESET
+           mov [esi+UHCI.rh_numports], 2
+           mov [esi+UHCI.is_stopped], UHCI_IS_STOPPED
+     ;      mov [ uhci_to_hcd(uhci)->state = HC_STATE_HALT;
+     ;      uhci_to_hcd(uhci)->poll_rh = 0;
+           mov [esi+UHCI.dead], eax  ; Full reset resurrects the controller
+           ret
+endp
+proc insert_td stdcall, td:dword, frame:dword
+           mov edi, [td]
+           mov eax, [frame]
+           and eax, -1024
+           mov [edi+TD.frame], eax
+           mov ebx, [framelist]
+           mov edx, [dma_framelist]
+           shl eax, 5
+           mov ecx, [eax+ebx]
+           test ecx, ecx
+           jz .empty
+           mov ecx, [ecx+TD.bk]               ;last TD
+           mov edx, [ecx+TD.fd]
+           mov [edi+TD.fd], edx
+           mov [edi+TD.bk], ecx
+           mov [ecx+TD.fd], edi
+           mov [edx+TD.bk], edi
+           mov eax, [ecx+TD.link]
+           mov [edi+TD.link], eax
+           mov ebx, [edi+TD.addr]
+           mov [ecx+TD.link], ebx
+           ret
+.empty:
+           mov ecx, [eax+edx]
+           mov [edi+TD.link], ecx
+           mov [ebx+eax], edi
+           mov ecx, [edi+TD.addr]
+           mov [eax+edx], ecx
+           ret
+endp
-DEVICE_ID    equ  0x8086;  pci device id
+DEVICE_ID    equ  0x24D2     ;  pci device id
-VENDOR_ID    equ  0x24D4;  device vendor id
+VENDOR_ID    equ  0x8086     ;  device vendor id
 QEMU_USB     equ  0x7020
+;all initialized data place here
 ;all initialized data place here
 align 4

Subversion Repositories Kolibri OS

(root)/kernel/trunk/drivers/usb/usb.asm @ 572 – Rev 557 → 567