KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Small fix in ftdi_get_list. Added memset in ftdi_read_data

Browse Source 
git-svn-id: svn://kolibrios.org@5037 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
gtament 2014-08-17 18:45:31 +00:00
parent 2fe5245774
commit 88cafe6b95
2 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
drivers/usb/usbftdi/linkedlist.inc
View File

@ -5,68 +5,67 @@
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
head dd 0
size dd 0
head dd 0
linkedlist_add:
push ebx
mov ebx, [head]
mov [head], eax
mov [eax + node.next], ebx
pop ebx
push ebx
mov ebx, [head]
mov [head], eax
mov [eax + node.next], ebx
pop ebx
ret
linkedlist_delete:
push ebx ecx
mov ebx, eax ; eax - pointer to node for delete
cmp eax, [head]
jz .unlink_head
push ebx ecx
mov ebx, eax ; eax - pointer to node for delete
cmp eax, [head]
jz .unlink_head
.getnext:
cmp [ebx+node.next], eax
jz .unlink
cmp [ebx+node.next], 0
jz .invalid_pointer
mov ebx, [ebx+node.next]
jmp .getnext
cmp [ebx+node.next], eax
jz .unlink
cmp [ebx+node.next], 0
jz .invalid_pointer
mov ebx, [ebx+node.next]
jmp .getnext
.unlink:
mov ecx, [eax+node.next]
mov [ebx+node.next], ecx
jmp @f
mov ecx, [eax+node.next]
mov [ebx+node.next], ecx
jmp @f
.unlink_head:
mov ebx, [eax+node.next]
mov [head], ebx
mov ebx, [eax+node.next]
mov [head], ebx
@@:
mov ecx, eax
call Kfree
mov ecx, eax
call Kfree
.invalid_pointer:
pop ecx ebx
pop ecx ebx
ret
linkedlist_isvalid: ;eax - pointer to check; returns zero if valid
push ebx ecx
xor ecx, ecx
test eax, eax
jz .invalid_pointer
mov ebx, [head]
push ebx ecx
xor ecx, ecx
test eax, eax
jz .invalid_pointer
mov ebx, [head]
.next_check:
cmp eax, ebx
jz .valid_pointer
mov ebx, [ebx + node.next]
test ebx, ebx
jz .invalid_pointer
jmp .next_check
cmp eax, ebx
jz .valid_pointer
mov ebx, [ebx + node.next]
test ebx, ebx
jz .invalid_pointer
jmp .next_check
.invalid_pointer:
inc ecx
inc ecx
.valid_pointer:
mov eax, ecx
pop ecx ebx
mov eax, ecx
pop ecx ebx
ret
linkedlist_gethead:
mov eax, [head]
mov eax, [head]
ret
restore node

27
drivers/usb/usbftdi/usbftdi.asm
View File

@ -22,10 +22,10 @@ __DEBUG_LEVEL__ = 1
node equ ftdi_context
node.next equ ftdi_context.next_context
include '../../proc32.inc'
include '../../imports.inc'
include '../../fdo.inc'
include '../../struct.inc'
include '../proc32.inc'
include '../imports.inc'
include '../fdo.inc'
include '../struct.inc'
public START
public version
@ -611,6 +611,11 @@ endl
jmp .eventdestroy
@@:
mov edi, eax
push edi eax
mov ecx, [esi+8]
xor eax, eax
rep stosb
pop eax edi
mov dword[ConfPacket], eax ; Store in ConfPAcket ptr to allocated memory
;---Dirty hack end
xor ecx, ecx
@ -637,7 +642,6 @@ endl
cmp [EventData+8], -1
jz .error
add ecx, [EventData+8]
DEBUGF 1, 'K : In buffer %x\n', [edi]
jmp .read_loop
;---Dirty hack begin
.read_end:
@ -686,14 +690,14 @@ endl
call WaitEvent
jmp .endswitch
.ftdi_get_list:
.ftdi_get_list:
mov edi, [edi+output]
xor ecx, ecx
call linkedlist_gethead
test eax, eax
jz .endswitch
mov edi, [edi+output]
jz .emptylist
push edi
add edi, 4
xor ecx, ecx
add edi, 4
.nextdev:
inc ecx
cmp [eax + ftdi_context.lockPID], 0
@ -711,6 +715,7 @@ endl
test eax, eax
jnz .nextdev
pop edi
.emptylist:
mov [edi], ecx
jmp .endswitch
@ -718,7 +723,6 @@ endl
mov esi, [edi+input]
mov ebx, [esi+4]
mov eax, [ebx + ftdi_context.lockPID]
DEBUGF 1, 'K : to PID %x from PID %x\n', [esi], eax
test eax, eax
jnz .lockedby
mov eax, [esi]
@ -733,7 +737,6 @@ endl
mov edi, [edi+output]
mov ebx, [esi+4]
mov eax, [ebx + ftdi_context.lockPID]
DEBUGF 1, 'K : to PID %x from PID %x\n', [esi], eax
cmp eax, [esi]
jnz .unlockimp
mov [ebx + ftdi_context.lockPID], 0