diff options
Diffstat (limited to 'v4l_experimental/firesat/cmp.c')
| -rw-r--r-- | v4l_experimental/firesat/cmp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/v4l_experimental/firesat/cmp.c b/v4l_experimental/firesat/cmp.c index c302a4127..29f8a7d3c 100644 --- a/v4l_experimental/firesat/cmp.c +++ b/v4l_experimental/firesat/cmp.c @@ -29,10 +29,10 @@ static int cmp_read(struct firesat *firesat, void *buffer, u64 addr, size_t leng int ret; if(down_interruptible(&firesat->avc_sem)) return -EINTR; - + ret = hpsb_read(firesat->host, firesat->nodeentry->nodeid, firesat->nodeentry->generation, addr, buffer, length); - + up(&firesat->avc_sem); return ret; } @@ -41,10 +41,10 @@ static int cmp_lock(struct firesat *firesat, quadlet_t *data, u64 addr, quadlet_ int ret; if(down_interruptible(&firesat->avc_sem)) return -EINTR; - + ret = hpsb_lock(firesat->host, firesat->nodeentry->nodeid, firesat->nodeentry->generation, addr, ext_tcode, data, arg); - + up(&firesat->avc_sem); return ret; } @@ -52,13 +52,13 @@ static int cmp_lock(struct firesat *firesat, quadlet_t *data, u64 addr, quadlet_ //try establishing a point-to-point connection (may be interrupted by a busreset int try_CMPEstablishPPconnection(struct firesat *firesat, int output_plug, int iso_channel) { unsigned int BWU; //bandwidth to allocate - + quadlet_t old_oPCR,test_oPCR = 0x0; u64 oPCR_address=0xfffff0000904ull+(output_plug << 2); int result=cmp_read(firesat, &test_oPCR, oPCR_address, 4); - + printk(KERN_INFO "%s: nodeid = %d\n",__FUNCTION__,firesat->nodeentry->nodeid); - + if (result < 0) { printk("%s: cannot read oPCR\n", __FUNCTION__); return result; @@ -100,7 +100,7 @@ int try_CMPEstablishPPconnection(struct firesat *firesat, int output_plug, int i printk(KERN_INFO "%s: trying compare_swap...\n",__FUNCTION__); printk(KERN_INFO "%s: oPCR_old: %08x, oPCR_new: %08x\n",__FUNCTION__, old_oPCR, new_oPCR); result=cmp_lock(firesat, &test_oPCR, oPCR_address, old_oPCR, 2); - + if (result < 0) { printk("%s: cannot compare_swap oPCR\n",__FUNCTION__); return result; @@ -131,7 +131,7 @@ int try_CMPBreakPPconnection(struct firesat *firesat, int output_plug,int iso_ch u64 oPCR_address=0xfffff0000904ull+(output_plug << 2); int result=cmp_read(firesat, &test_oPCR, oPCR_address, 4); - + printk(KERN_INFO "%s\n",__FUNCTION__); if (result < 0) { |