aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/dv1394.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ieee1394/dv1394.c')
-rw-r--r--drivers/ieee1394/dv1394.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index adaefabc40e9..f8fcbd048447 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -610,7 +610,7 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
610 } else { 610 } else {
611 611
612 u32 transmit_sec, transmit_cyc; 612 u32 transmit_sec, transmit_cyc;
613 u32 ts_cyc, ts_off; 613 u32 ts_cyc;
614 614
615 /* DMA is stopped, so this is the very first frame */ 615 /* DMA is stopped, so this is the very first frame */
616 video->active_frame = this_frame; 616 video->active_frame = this_frame;
@@ -636,7 +636,6 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
636 transmit_sec += transmit_cyc/8000; 636 transmit_sec += transmit_cyc/8000;
637 transmit_cyc %= 8000; 637 transmit_cyc %= 8000;
638 638
639 ts_off = ct_off;
640 ts_cyc = transmit_cyc + 3; 639 ts_cyc = transmit_cyc + 3;
641 ts_cyc %= 8000; 640 ts_cyc %= 8000;
642 641
@@ -2004,7 +2003,7 @@ static void ir_tasklet_func(unsigned long data)
2004 2003
2005 int sof=0; /* start-of-frame flag */ 2004 int sof=0; /* start-of-frame flag */
2006 struct frame *f; 2005 struct frame *f;
2007 u16 packet_length, packet_time; 2006 u16 packet_length;
2008 int i, dbc=0; 2007 int i, dbc=0;
2009 struct DMA_descriptor_block *block = NULL; 2008 struct DMA_descriptor_block *block = NULL;
2010 u16 xferstatus; 2009 u16 xferstatus;
@@ -2024,11 +2023,6 @@ static void ir_tasklet_func(unsigned long data)
2024 sizeof(struct packet)); 2023 sizeof(struct packet));
2025 2024
2026 packet_length = le16_to_cpu(p->data_length); 2025 packet_length = le16_to_cpu(p->data_length);
2027 packet_time = le16_to_cpu(p->timestamp);
2028
2029 irq_printk("received packet %02d, timestamp=%04x, length=%04x, sof=%02x%02x\n", video->current_packet,
2030 packet_time, packet_length,
2031 p->data[0], p->data[1]);
2032 2026
2033 /* get the descriptor based on packet_buffer cursor */ 2027 /* get the descriptor based on packet_buffer cursor */
2034 f = video->frames[video->current_packet / MAX_PACKETS]; 2028 f = video->frames[video->current_packet / MAX_PACKETS];
@@ -2320,7 +2314,6 @@ static void dv1394_add_host(struct hpsb_host *host)
2320 2314
2321static void dv1394_host_reset(struct hpsb_host *host) 2315static void dv1394_host_reset(struct hpsb_host *host)
2322{ 2316{
2323 struct ti_ohci *ohci;
2324 struct video_card *video = NULL, *tmp_vid; 2317 struct video_card *video = NULL, *tmp_vid;
2325 unsigned long flags; 2318 unsigned long flags;
2326 2319
@@ -2328,9 +2321,6 @@ static void dv1394_host_reset(struct hpsb_host *host)
2328 if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME)) 2321 if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME))
2329 return; 2322 return;
2330 2323
2331 ohci = (struct ti_ohci *)host->hostdata;
2332
2333
2334 /* find the corresponding video_cards */ 2324 /* find the corresponding video_cards */
2335 spin_lock_irqsave(&dv1394_cards_lock, flags); 2325 spin_lock_irqsave(&dv1394_cards_lock, flags);
2336 list_for_each_entry(tmp_vid, &dv1394_cards, list) { 2326 list_for_each_entry(tmp_vid, &dv1394_cards, list) {