Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xpp: Fix build with 32-bits kernel #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xpp: Fix build with 32-bits kernel #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions drivers/dahdi/xpp/xbus-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,11 +1768,14 @@ int waitfor_xpds(xbus_t *xbus, char *buf)

static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q)
{
s64 msec = 0;
s32 rem = 0;

msec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
seq_printf(sfile,
"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",
"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%d ms\n",
q->name, q->steady_state_count, q->count, q->max_count,
q->worst_count, q->overflows, q->worst_lag_usec / 1000,
q->worst_lag_usec % 1000);
q->worst_count, q->overflows, msec, rem);
xframe_queue_clearstats(q);
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/dahdi/xpp/xbus-pcm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static int xpp_ticker_step(struct xpp_ticker *ticker, const ktime_t t)
usec = ktime_us_delta(ticker->last_sample,
ticker->first_sample);
ticker->first_sample = ticker->last_sample;
ticker->tick_period = usec / ticker->cycle;
ticker->tick_period = div_s64(usec, ticker->cycle);
cycled = 1;
}
ticker->count++;
Expand Down Expand Up @@ -497,7 +497,7 @@ static void send_drift(xbus_t *xbus, int drift)
XBUS_DBG(SYNC, xbus,
"%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n",
(disable_pll_sync) ? "Fake " : "", msg, drift,
msec_delta / MSEC_PER_SEC);
div_s64(msec_delta, MSEC_PER_SEC));
if (!disable_pll_sync)
CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL,
drift);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dahdi/xpp/xbus-sysfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static DEVICE_ATTR_READER(driftinfo_show, dev, buf)
/*
* Calculate lost ticks time
*/
seconds = ktime_ms_delta(now, di->last_lost_tick) / 1000;
seconds = div_s64(ktime_ms_delta(now, di->last_lost_tick), 1000);
minutes = seconds / 60;
seconds = seconds % 60;
hours = minutes / 60;
Expand Down
15 changes: 10 additions & 5 deletions drivers/dahdi/xpp/xframe_queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@ static void __xframe_dump_queue(struct xframe_queue *q)
int i = 0;
char prefix[30];
ktime_t now = ktime_get();
s64 msec = 0;
s32 rem = 0;

printk(KERN_DEBUG "%s: dump queue '%s' (first packet in each frame)\n",
THIS_MODULE->name, q->name);
list_for_each_entry_reverse(xframe, &q->head, frame_list) {
xpacket_t *pack = (xpacket_t *)&xframe->packets[0];
s64 usec = ktime_us_delta(now, xframe->kt_queued);
msec = div_s64_rem(usec, 1000, &rem);

snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03lld msec",
i++, usec / 1000, usec % 1000);
snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03d msec",
i++, msec, rem);
dump_packet(prefix, pack, 1);
}
}
Expand All @@ -52,6 +55,8 @@ static bool __xframe_enqueue(struct xframe_queue *q, xframe_t *xframe)
{
int ret = 1;
static int overflow_cnt;
s64 msec = 0;
s32 rem = 0;

if (unlikely(q->disabled)) {
ret = 0;
Expand All @@ -60,11 +65,11 @@ static bool __xframe_enqueue(struct xframe_queue *q, xframe_t *xframe)
if (q->count >= q->max_count) {
q->overflows++;
if ((overflow_cnt++ % 1000) < 5) {
NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",
msec = div_s64_rem(q->worst_lag_usec, 1000, &rem);
NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%d ms\n",
q->name, q->steady_state_count, q->count,
q->max_count, q->worst_count, q->overflows,
q->worst_lag_usec / 1000,
q->worst_lag_usec % 1000);
msec, rem);
__xframe_dump_queue(q);
}
ret = 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/dahdi/xpp/xpp_usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ static void xpp_send_callback(struct urb *urb)
usec = 0; /* System clock jumped */
if (usec > xusb->max_tx_delay)
xusb->max_tx_delay = usec;
i = usec / USEC_BUCKET;
i = div_s64(usec, USEC_BUCKET);
if (i >= NUM_BUCKETS)
i = NUM_BUCKETS - 1;
xusb->usb_tx_delay[i]++;
Expand Down
Loading