Commit 67d58fd1 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Merged previously uncommitted changes made by aglover for RISC OS Ltd CD.

Removed dynamic dependencies from Makefile.
parent be48c4dc
...@@ -1099,7 +1099,9 @@ DeviceVector_Claim ROUT ...@@ -1099,7 +1099,9 @@ DeviceVector_Claim ROUT
BGE DV_Fail_NaffDevNo BGE DV_Fail_NaffDevNo
CMP r0, #Podule_DevNo CMP r0, #Podule_DevNo
[ IOMD2Support
CMPNE r0, #IOMD2_PCI_DevNo CMPNE r0, #IOMD2_PCI_DevNo
]
CMPNE r0, #PFIQasIRQ_DevNo CMPNE r0, #PFIQasIRQ_DevNo
BEQ PoduleChainClaim BEQ PoduleChainClaim
...@@ -1152,7 +1154,9 @@ PoduleChainClaim ...@@ -1152,7 +1154,9 @@ PoduleChainClaim
STR r3, [r10, #PodDesp_Address] STR r3, [r10, #PodDesp_Address]
STR r4, [r10, #PodDesp_Mask] STR r4, [r10, #PodDesp_Mask]
CMP r0, #Podule_DevNo CMP r0, #Podule_DevNo
[ IOMD2Support
CMPNE r0, #IOMD2_PCI_DevNo CMPNE r0, #IOMD2_PCI_DevNo
]
LDREQ r0, =PIRQ_Chain LDREQ r0, =PIRQ_Chain
LDRNE r0, =PFIQasIRQ_Chain LDRNE r0, =PFIQasIRQ_Chain
TEQP pc, #SVC_mode+I_bit ; IRQs off for update TEQP pc, #SVC_mode+I_bit ; IRQs off for update
...@@ -1181,7 +1185,9 @@ DeviceVector_Release ROUT ...@@ -1181,7 +1185,9 @@ DeviceVector_Release ROUT
TEQP pc, #SVC_mode + I_bit ; IRQs off while holding context TEQP pc, #SVC_mode + I_bit ; IRQs off while holding context
CMP r0, #Podule_DevNo CMP r0, #Podule_DevNo
[ IOMD2Support
CMPNE r0, #IOMD2_PCI_DevNo CMPNE r0, #IOMD2_PCI_DevNo
]
CMPNE r0, #PFIQasIRQ_DevNo CMPNE r0, #PFIQasIRQ_DevNo
BEQ PoduleChainRelease BEQ PoduleChainRelease
...@@ -1231,7 +1237,9 @@ DeviceVector_Release ROUT ...@@ -1231,7 +1237,9 @@ DeviceVector_Release ROUT
; ;
PoduleChainRelease PoduleChainRelease
CMP r0, #Podule_DevNo CMP r0, #Podule_DevNo
[ IOMD2Support
CMPNE r0, #IOMD2_PCI_DevNo CMPNE r0, #IOMD2_PCI_DevNo
]
LDREQ r0, =PIRQ_Chain-PodDesp_Link LDREQ r0, =PIRQ_Chain-PodDesp_Link
LDRNE r0, =PFIQasIRQ_Chain-PodDesp_Link LDRNE r0, =PFIQasIRQ_Chain-PodDesp_Link
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment