WebSVN – Kolibri OS – Diff – /drivers/unfinished/cardbus.asm

 ; This module detects and initialises all Cardbus/pc-card/PCMCIA cards.
 ; WARNING: Cards must be inserted before the driver starts, and shouldn't be removed.
 ; This module doesn't handle insertions and removals.
+format PE DLL native
-format MS COFF
+entry START
         CURRENT_API             = 0x0200
-        API_VERSION             = 0x01000100
-        DRIVER_VERSION          = 5
+        COMPATIBLE_API          = 0x0100
         API_VERSION             = (COMPATIBLE_API shl 16) + CURRENT_API
+        CARDBUS_IO              = 0xFC00
         CARDBUS_IO              = 0xFC00
         __DEBUG__               = 1
-        DEBUG                   = 1
-        __DEBUG__               = 1
         __DEBUG_LEVEL__         = 1
-include '../struct.inc'
-include '../macros.inc'
-include '../proc32.inc'
-include '../imports.inc'
-include '../pci.inc'
-include '../fdo.inc'
+section '.flat' readable writable executable
-public START
+include '../proc32.inc'
-public service_proc
+include '../struct.inc'
-public version
+include '../macros.inc'
 include '../pci_pe.inc'
-section '.flat' code readable align 16
+include '../fdo.inc'
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                        ;;
-;; proc START             ;;
-;;                        ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; (standard driver proc) ;;
+;;                        ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; proc START             ;;
 ;;                        ;;
-align 4
+;; (standard driver proc) ;;
-proc START stdcall, state:dword
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
         cmp [state], 1
-        jne .exit
+proc START c, reason:dword, cmdline:dword
 ;; proc SERVICE_PROC      ;;
 ;;                        ;;
 ;; (standard driver proc) ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 align 4
 proc service_proc stdcall, ioctl:dword
         DEBUGF  1, "Searching for cardbus bridges...\n"
         xor     eax, eax
         mov     [bus], eax
         inc     eax
-        call    PciApi
+        invoke  PciApi
         cmp     eax, -1
         je      .err
         mov     [last_bus], eax
         inc     eax
         mov     [card_bus], eax
   .next_bus:
         and     [devfn], 0
   .next_dev:
-        stdcall PciRead32, [bus], [devfn], PCI_VENDOR_ID
+        invoke  PciRead32, [bus], [devfn], PCI_header02.vendor_id
         test    eax, eax
         jz      .next
         cmp     eax, -1
         je      .next
-        stdcall PciRead16, [bus], [devfn], 0x0a ; class & subclass
+        invoke  PciRead16, [bus], [devfn], 0x0a ; class & subclass
         ret
   .found:
         DEBUGF  1, "Found cardbus bridge: bus=0x%x, dev=0x%x\n", [bus], [devfn]
-        stdcall PciRead8, [bus], [devfn], 0x0e                  ; get header type
-        DEBUGF  1, "Header type=0x%x\n", eax:2
+        invoke  PciRead8, [bus], [devfn], PCI_header.header_type
+        DEBUGF  1, "Header type=0x%x\n", eax:2
-        test    al, al
+        cmp     al, 2
-        jz      .next
+        jne     .next
 ; Write PCI and cardbus numbers
-        stdcall PciRead32, [bus], [devfn], 0x18                 ; PCcard latency settings + Card bus number, PCI bus number
+        invoke  PciRead32, [bus], [devfn], PCI_header02.pci_bus_nr      ; PCcard latency settings + Card bus number, PCI bus number
-        and     eax, 0xff000000                                 ; Keep original latency setting, clear the rest
+        and     eax, 0xff000000                                         ; Keep original latency setting, clear the rest
         mov     al, byte[bus]
         mov     ah, byte[card_bus]
         mov     ebx, [card_bus]
         shl     ebx, 16
         or      eax, ebx
         DEBUGF  1, "Latency, bus,.. 0x%x\n", eax
-        stdcall PciWrite32, [bus], [devfn], 0x18, eax
+        invoke  PciWrite32, [bus], [devfn], PCI_header02.pci_bus_nr, eax
 ; set ExCA legacy mode base
-        stdcall PciWrite32, [bus], [devfn], 0x44, 1
+        invoke  PciWrite32, [bus], [devfn], 0x44, 1
 ; Enable power
-        stdcall PciRead8, [bus], [devfn], 0x14                  ; get capabilities offset
+        invoke  PciRead8, [bus], [devfn], 0x14                  ; get capabilities offset
         movzx   eax, al                                         ; (A0 for TI bridges)
         DEBUGF  1, "Capabilities offset=0x%x\n", eax:2
         add     al, 4                                           ; Power management control/status
-        stdcall PciWrite16, [bus], [devfn], eax, 0x0100         ; Enable PME signaling, power state=D0
+        invoke  PciWrite16, [bus], [devfn], eax, 0x0100         ; Enable PME signaling, power state=D0
 ; Enable Bus master, io space, memory space
         cmp     al, 00100000b                                   ; Check for inserted cardbus card
         je      .CardbusInserted
 ; No card found... set PCI command back to 0
-        stdcall PciWrite16, [bus], [devfn], PCI_REG_COMMAND, 0  ; To avoid conflicts with other sockets
+        invoke  PciWrite16, [bus], [devfn], PCI_header02.command, 0  ; To avoid conflicts with other sockets
         DEBUGF  1, "Cardbus KO\n"
         jmp     .next
   .CardbusInserted:
         DEBUGF  1, "Card inserted\n"
         ;mov     word[ecx + 0x802], 0x00F9       ; Assert reset, output enable, vcc=vpp=3.3V
         mov     dword[ecx + 0x10], 0x33         ; Request 3.3V for Vcc and Vpp (Control register)
         ;push    ecx
         ;mov     esi, 10
-        ;call    Sleep
+        ;invoke  Sleep
         ;pop     ecx
 irp     regvalue,   0x7efff000, 0x7effffff, 0x7effe000, 0x7effe000, CARDBUS_IO, CARDBUS_IO + 0xFF, 0, 0
+{
 common
         reg = 0x1C
 forward
-        stdcall PciWrite32, [bus], [devfn], reg, regvalue
+        invoke  PciWrite32, [bus], [devfn], reg, regvalue
         DEBUGF  1, "Writing 0x%x to 0x%x\n", regvalue, reg
         reg = reg + 4
+}
-        stdcall PciWrite8, [bus], [devfn], 0x3c, 0xc    ; IRQ line
+        invoke  PciWrite8, [bus], [devfn], PCI_header02.interrupt_line, 0xc    ; IRQ line
-        stdcall PciRead16, [bus], [devfn], 0x3e                 ; Bridge control
+        invoke  PciRead16, [bus], [devfn], PCI_header02.bridge_ctrl                 ; Bridge control
         or      ax, 0x0700                                      ; Enable write posting, both memory windows prefetchable
-        stdcall PciWrite16, [bus], [devfn], 0x3e, eax
+        invoke  PciWrite16, [bus], [devfn], PCI_header02.bridge_ctrl, eax
         DEBUGF  1, "Write posting enabled\n"
         DEBUGF  1, "Bridge PCI registers:\n"
 rept    17 reg
+{
-        stdcall PciRead32, [bus], [devfn], 4*(reg-1)
+        invoke  PciRead32, [bus], [devfn], 4*(reg-1)
         DEBUGF  1, "0x%x\n", eax
+}
         inc     byte[0x80009021]                                ; LAST PCI bus count in kernel (dirty HACK!)
         mov     ecx, 100
   .waitactive:
         push    ecx
-        stdcall PciRead32, [card_bus], 0, PCI_VENDOR_ID         ; Check if the card is awake yet
+        invoke  PciRead32, [card_bus], 0, PCI_header02.vendor_id         ; Check if the card is awake yet
         inc     eax
   .got_it:
         pop     eax
         DEBUGF  1, "Card is enabled!\n"
-        stdcall PciWrite32, [card_bus], 0, PCI_BASE_ADDRESS_0, CARDBUS_IO       ; Supposing it's IO space that is needed
+        invoke  PciWrite32, [card_bus], 0, PCI_header02.base_addr, CARDBUS_IO       ; Supposing it's IO space that is needed
-        stdcall PciWrite8, [card_bus], 0, PCI_REG_IRQ, 0xC                      ; FIXME
+        invoke  PciWrite8, [card_bus], 0, PCI_header02.interrupt_line, 0xC                      ; FIXME
-        stdcall PciWrite16, [card_bus], 0, PCI_REG_COMMAND, PCI_BIT_PIO or PCI_BIT_MMIO
+        invoke  PciWrite16, [card_bus], 0, PCI_header02.command, PCI_CMD_PIO or PCI_CMD_MMIO
         DEBUGF  1, "Error\n"
         xor     eax, eax
-        ret
         ret
-endp
+endp
+; End of code
-; End of code
+data fixups
 end data

Subversion Repositories Kolibri OS

(root)/drivers/unfinished/cardbus.asm – Rev 4476 → 5066