Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 659488 | Differences between
and this patch

Collapse All | Expand All

(-)dahdi-linux-3.1.0.orig/drivers/dahdi/opvxd115/vpm450m.c (-1 / +1 lines)
Lines 52-58 Link Here
52
#else
52
#else
53
	ktime_get_real_ts64(&tv);
53
	ktime_get_real_ts64(&tv);
54
		total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) +
54
		total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) +
55
				  (((unsigned long long)(tv.tv_nsec)) / 1000);
55
				  (((unsigned long long)(tv.tv_nsec / 1000)));
56
#endif
56
#endif
57
57
58
	f_pTime->aulWallTimeUs[0] = (total_usecs & mask);
58
	f_pTime->aulWallTimeUs[0] = (total_usecs & mask);
(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xbus-core.c (-3 / +5 lines)
Lines 1754-1764 Link Here
1754
1754
1755
static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q)
1755
static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q)
1756
{
1756
{
1757
	s32 lag_us_rem;
1758
	s64 lag_ms = div_s64_rem(q->worst_lag_usec, 1000, &lag_us_rem);
1759
1757
	seq_printf(sfile,
1760
	seq_printf(sfile,
1758
		"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",
1761
		"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%03d ms\n",
1759
		q->name, q->steady_state_count, q->count, q->max_count,
1762
		q->name, q->steady_state_count, q->count, q->max_count,
1760
		q->worst_count, q->overflows, q->worst_lag_usec / 1000,
1763
		q->worst_count, q->overflows, lag_ms, lag_us_rem);
1761
		q->worst_lag_usec % 1000);
1762
	xframe_queue_clearstats(q);
1764
	xframe_queue_clearstats(q);
1763
}
1765
}
1764
1766
(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xbus-pcm.c (-2 / +2 lines)
Lines 129-135 Link Here
129
		usec = ktime_us_delta(ticker->last_sample,
129
		usec = ktime_us_delta(ticker->last_sample,
130
					ticker->first_sample);
130
					ticker->first_sample);
131
		ticker->first_sample = ticker->last_sample;
131
		ticker->first_sample = ticker->last_sample;
132
		ticker->tick_period = usec / ticker->cycle;
132
		ticker->tick_period = div_s64(usec, ticker->cycle);
133
		cycled = 1;
133
		cycled = 1;
134
	}
134
	}
135
	ticker->count++;
135
	ticker->count++;
Lines 497-503 Link Here
497
	XBUS_DBG(SYNC, xbus,
497
	XBUS_DBG(SYNC, xbus,
498
		 "%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n",
498
		 "%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n",
499
		 (disable_pll_sync) ? "Fake " : "", msg, drift,
499
		 (disable_pll_sync) ? "Fake " : "", msg, drift,
500
		 msec_delta / MSEC_PER_SEC);
500
		 div_s64(msec_delta, MSEC_PER_SEC));
501
	if (!disable_pll_sync)
501
	if (!disable_pll_sync)
502
		CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL,
502
		CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL,
503
			   drift);
503
			   drift);
(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xbus-sysfs.c (-1 / +1 lines)
Lines 249-255 Link Here
249
	/*
249
	/*
250
	 * Calculate lost ticks time
250
	 * Calculate lost ticks time
251
	 */
251
	 */
252
	seconds = ktime_ms_delta(now, di->last_lost_tick) / 1000;
252
	seconds = div_s64(ktime_ms_delta(now, di->last_lost_tick), 1000);
253
	minutes = seconds / 60;
253
	minutes = seconds / 60;
254
	seconds = seconds % 60;
254
	seconds = seconds % 60;
255
	hours = minutes / 60;
255
	hours = minutes / 60;
(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xframe_queue.c (-6 / +9 lines)
Lines 40-49 Link Here
40
	       THIS_MODULE->name, q->name);
40
	       THIS_MODULE->name, q->name);
41
	list_for_each_entry_reverse(xframe, &q->head, frame_list) {
41
	list_for_each_entry_reverse(xframe, &q->head, frame_list) {
42
		xpacket_t *pack = (xpacket_t *)&xframe->packets[0];
42
		xpacket_t *pack = (xpacket_t *)&xframe->packets[0];
43
		s64 usec = ktime_us_delta(now, xframe->kt_queued);
43
		s32 usec_rem;
44
		s64 msec = div_s64_rem(ktime_us_delta(now, xframe->kt_queued), 1000, &usec_rem);
44
45
45
		snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03lld msec",
46
		snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03d msec",
46
			 i++, usec / 1000, usec % 1000);
47
			 i++, msec, usec_rem);
47
		dump_packet(prefix, pack, 1);
48
		dump_packet(prefix, pack, 1);
48
	}
49
	}
49
}
50
}
Lines 60-70 Link Here
60
	if (q->count >= q->max_count) {
61
	if (q->count >= q->max_count) {
61
		q->overflows++;
62
		q->overflows++;
62
		if ((overflow_cnt++ % 1000) < 5) {
63
		if ((overflow_cnt++ % 1000) < 5) {
63
			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",
64
			s32 lag_us_rem;
65
			s64 lag_ms = div_s64_rem(q->worst_lag_usec, 1000, &lag_us_rem);
66
67
			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%03d ms\n",
64
			     q->name, q->steady_state_count, q->count,
68
			     q->name, q->steady_state_count, q->count,
65
			     q->max_count, q->worst_count, q->overflows,
69
			     q->max_count, q->worst_count, q->overflows,
66
			     q->worst_lag_usec / 1000,
70
			     lag_ms, lag_us_rem);
67
			     q->worst_lag_usec % 1000);
68
			__xframe_dump_queue(q);
71
			__xframe_dump_queue(q);
69
		}
72
		}
70
		ret = 0;
73
		ret = 0;
(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xpp_usb.c (-1 / +1 lines)
Lines 882-888 Link Here
882
		usec = 0; /* System clock jumped */
882
		usec = 0; /* System clock jumped */
883
	if (usec > xusb->max_tx_delay)
883
	if (usec > xusb->max_tx_delay)
884
		xusb->max_tx_delay = usec;
884
		xusb->max_tx_delay = usec;
885
	i = usec / USEC_BUCKET;
885
	i = div_s64(usec, USEC_BUCKET);
886
	if (i >= NUM_BUCKETS)
886
	if (i >= NUM_BUCKETS)
887
		i = NUM_BUCKETS - 1;
887
		i = NUM_BUCKETS - 1;
888
	xusb->usb_tx_delay[i]++;
888
	xusb->usb_tx_delay[i]++;

Return to bug 659488