Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

master
David S. Miller 2009-01-08 11:05:59 -08:00
commit fa05f6a1eb
1 changed files with 13 additions and 13 deletions

View File

@ -51,19 +51,19 @@ start jmp <$40
; Copy DSP program control ; Copy DSP program control
move #real,r0 move #real,r0
move #upload,r1 move #upload,r1
do #upload_end-upload,<_copy do #upload_end-upload,_copy
move P:(r0)+,x0 movem P:(r0)+,x0
move x0,P:(r1)+ movem x0,P:(r1)+
_copy movep #>4,X:<<M_HCR _copy movep #4,X:<<M_HCR
movep #>$c00,X:<<M_IPR movep #$c00,X:<<M_IPR
and #<$fe,mr and #<$fe,mr
jmp upload jmp upload
real real
org P:$7ea9 org P:$7ea9
upload upload
movep #>1,X:<<M_PBC movep #1,X:<<M_PBC
movep #>0,X:<<M_BCR movep #0,X:<<M_BCR
next jclr #0,X:<<M_HSR,* next jclr #0,X:<<M_HSR,*
movep X:<<M_HRX,A movep X:<<M_HRX,A
@ -81,18 +81,18 @@ _get_length
cmp x0,A cmp x0,A
jeq load_Y jeq load_Y
load_P do y0,_load load_P do y0,_load_P
jclr #0,X:<<M_HSR,* jclr #0,X:<<M_HSR,*
movep X:<<M_HRX,P:(r0)+ movep X:<<M_HRX,P:(r0)+
_load jmp next _load_P jmp next
load_X do y0,_load load_X do y0,_load_X
jclr #0,X:<<M_HSR,* jclr #0,X:<<M_HSR,*
movep X:<<M_HRX,X:(r0)+ movep X:<<M_HRX,X:(r0)+
_load jmp next _load_X jmp next
load_Y do y0,_load load_Y do y0,_load_Y
jclr #0,X:<<M_HSR,* jclr #0,X:<<M_HSR,*
movep X:<<M_HRX,Y:(r0)+ movep X:<<M_HRX,Y:(r0)+
_load jmp next _load_Y jmp next
upload_end upload_end
end end