WebSVN – Kolibri OS – Diff – /programs/network/netcfg/netcfg.asm

 button:                                 ; button
         mcall   17                      ; get id
         cmp     ah, 1                   ; button id = 1 ?
+        jne     @f
-        jne     @f
+exit:
-exit:   mcall   -1                      ; close this program
+        mcall   -1                      ; close this program
        @@:
-        cmp     eax,0x0000ff00
+        cmp     eax, 0x0000ff00
         jg      load_drv
         jmp     still
 load_drv:
         shr     eax, 16
-        mov     word [selected], ax
+        mov     [selected], ax
-        mov     bl , 6                  ; get a dword
+        mov     bl, 6                   ; get a dword
-        mov     bh , ah                 ; bus
+        mov     bh, ah                  ; bus
-        mov     ch , al                 ; dev
+        mov     ch, al                  ; dev
-        mov     cl , 0                  ; offset to device/vendor id
+        mov     cl, 0                   ; offset to device/vendor id
         mcall   62                      ; get ID's
-        mov     word [PCI_Vendor], ax
+        mov     [PCI_Vendor], ax
         shr     eax, 16
         mov     [IOCTL.input], hardwareinfo
         mov     [IOCTL.out_size], 0
         mov     [IOCTL.output], 0
-        mcall   68, 17, IOCTL
+        mcall   68, 17, IOCTL
-        mov     byte[drivernumber], al
+        mov     [drivernumber], al
         jmp     still
 reset:
-        movzx   ebx, byte[drivernumber]
+        movzx   ebx, [drivernumber]
         mcall   74,,2
         jmp     still
 ;------------------------------------------------------------------
 ;* Gets the PCI Version and Last Bus
 Get_PCI_Info:
         mcall   62, 0
-        mov     word [PCI_Version], ax
+        mov     [PCI_Version], ax
         mcall   62, 1
-        mov     byte [PCI_LastBus], al
+        mov     [PCI_LastBus], al
         ;----------------------------------------------------------
-        ;* Get all devices on PCI Bus
-        mov     edx, 20 shl 16 + 110  ; set start write position
+        ;* Get all devices on PCI Bus
-        cmp     al , 0xff                ; 0xFF means no pci bus found
+        cmp     al, 0xff                ; 0xFF means no pci bus found
         jne     Pci_Exists              ;
+        ret                             ; if no bus then leave
         ret                             ; if no bus then leave
 Pci_Exists:
-        mov     byte [V_Bus], 0         ; reset varibles
+        mov     [V_Bus], 0
+        mov     [V_Dev], 0
+        mov     edx, 20 shl 16 + 110    ; set start write position
         mov     byte [V_Dev], 0         ;
 Start_Enum:
-        mov     bl , 6                   ; get a dword
+        mov     bl, 6                   ; read dword
-        mov     bh , byte [V_Bus]        ; bus of pci device
+        mov     bh, [V_Bus]
-        mov     ch , byte [V_Dev]        ; device number/function
+        mov     ch, [V_Dev]
-        mov     cl , 0                   ; offset to device/vendor id
+        mov     cl, 0                   ; offset to device/vendor id
         mcall   62                      ; get ID's
+        cmp     ax, 0                   ; Vendor ID should not be 0 or 0xFFFF
-        cmp     ax, 0                   ; Vendor ID should not be 0 or 0xFFFF
+        je      nextDev                 ; check next device if nothing exists here
         je      nextDev                 ; check next device if nothing exists here
         cmp     ax, 0xffff              ;
         je      nextDev                 ;
-        mov     word [PCI_Vendor], ax   ; There is a device here, save the ID's
+        mov     [PCI_Vendor], ax        ; There is a device here, save the ID's
         shr     eax, 16                 ;
-        mov     word [PCI_Device], ax   ;
+        mov     [PCI_Device], ax        ;
-        mov     bl , 4                   ; Read config byte
+        mov     bl, 4                   ; Read config byte
-        mov     bh , byte [V_Bus]        ; Bus #
+        mov     bh, [V_Bus]             ; Bus #
-        mov     ch , byte [V_Dev]        ; Device # on bus
+        mov     ch, [V_Dev]             ; Device # on bus
-        mov     cl , 0x08                ; Register to read (Get Revision)
+        mov     cl, 0x08                ; Register to read (Get Revision)
         mcall   62                      ; Read it
-        mov     byte [PCI_Rev], al      ; Save it
+        mov     [PCI_Rev], al           ; Save it
-        mov     cl , 0x0b                ; Register to read (Get class)
+        mov     cl, 0x0b                ; Register to read (Get class)
         mcall   62                      ; Read it
-        mov     byte [PCI_Class], al    ; Save it
+        mov     [PCI_Class], al         ; Save it
-        mov     cl , 0x0a                ; Register to read (Get Subclass)
+        mov     cl, 0x0a                ; Register to read (Get Subclass)
         mcall   62                      ; Read it
-        mov     byte [PCI_SubClass], al ; Save it
+        mov     [PCI_SubClass], al      ; Save it
-        mov     cl , 0x09                ; Register to read (Get Interface)
+        mov     cl, 0x09                ; Register to read (Get Interface)
         pop     eax
         test    al, al
         js      nextDev
 nextdev2:
-        test    byte [V_Dev], 7
+        test    [V_Dev], 7
         jnz     nextDev
-        or      byte [V_Dev], 7
+        or      [V_Dev], 7
 nextDev:
+nextDev:
         inc     [V_Dev]                 ; lower 3 bits are the function number
+        jnz     Start_Enum              ; jump until we reach zero
-        jnz     Start_Enum              ; jump until we reach zero
-        mov     byte [V_Dev], 0         ; reset device number
+        mov     [V_Dev], 0              ; reset device number
-        inc     byte [V_Bus]            ; next bus
+        inc     [V_Bus]                 ; next bus
-        mov     al , byte [PCI_LastBus]  ; get last bus
+        mov     al, [PCI_LastBus]       ; get last bus
-        mov     cx , dx
+        mov     cx, dx
         dec     cx
         shl     ecx, 16
         add     ecx, 9
-        movzx   edx, byte [V_Bus]
+        xor     edx, edx
-        shl     dx , 8
+        mov     dh, [V_Bus]
-        mov     dl , byte [V_Dev]
+        mov     dl, [V_Dev]
         mov     esi, 0x0000c0ff        ; color: yellow if selected, blue otherwise
-        cmp     word [selected], dx
+        cmp     [selected], dx
         jne     @f
         mov     esi, 0x00c0c000
         mcall   8
         pop     edx
         xor     esi, esi                ; Color of text
-        movzx   ecx, word [PCI_Vendor]  ; number to be written
+        movzx   ecx, [PCI_Vendor]       ; number to be written
         mcall   47, 0x00040100          ; Write Vendor ID
         add     edx, (4*6+18) shl 16
-        movzx   ecx, word [PCI_Device]  ; get Vendor ID
+        movzx   ecx, [PCI_Device]       ; get Vendor ID
         mcall                           ; Draw Vendor ID to Window
         add     edx, (4*6+18) shl 16
-        movzx   ecx, byte [V_Bus]       ; get bus number
+        movzx   ecx, [V_Bus]
         mcall   ,0x00020100             ; draw bus number to screen
         add     edx, (2*6+18) shl 16
-        movzx   ecx, byte [V_Dev]       ; get device number
+        movzx   ecx, [V_Dev]
         shr     ecx, 3                  ; device number is bits 3-7
         mcall                           ; Draw device Number To Window
 ;------------------------------------------------------------------
 ; Prints the Vendor's Name based on Vendor ID
 ;------------------------------------------------------------------
         mov     edx, VendorsTab
-        mov     cx , word[PCI_Vendor]
+        mov     cx, [PCI_Vendor]
-.fn:    mov     ax , [edx]
+.fn:    mov     ax, [edx]
         add     edx, 6
 selected        dw ?
 V_Bus           db ?
 V_Dev           db ?
 PCI_Version     dw ?
 PCI_LastBus     db ?
+; Dont change order
 PCI_Vendor      dw ?
 PCI_Device      dw ?
 PCI_Bus         db ?
 PCI_Dev         db ?
 PCI_Rev         db ?
-; don`t change order!!!
+; Dont change order
 PCI_Class       db ?
 PCI_SubClass    db ?
 PCI_Interface   db ?
 PCI_IRQ         db ?

Subversion Repositories Kolibri OS

(root)/programs/network/netcfg/netcfg.asm – Rev 4515 → 4788