Attachment #535246 for bug #617876




	return 0;
}

static void xbus_command_timer(unsigned long param)
{
	xbus_t *xbus = (xbus_t *)param;
	struct timeval now;

	BUG_ON(!xbus);
	do_gettimeofday(&now);
	xbus_command_queue_tick(xbus);
	if (!xbus->self_ticking) /* Must be 1KHz rate */
		mod_timer(&xbus->command_timer, jiffies + 1);
}

void xbus_set_command_timer(xbus_t *xbus, bool on)
{
	XBUS_DBG(SYNC, xbus, "%s\n", (on) ? "ON" : "OFF");
	if (on) {
		if (!timer_pending(&xbus->command_timer)) {
			XBUS_DBG(SYNC, xbus, "add_timer\n");
			xbus->command_timer.function = xbus_command_timer;
			xbus->command_timer.data = (unsigned long)xbus;
			xbus->command_timer.expires = jiffies + 1;
			add_timer(&xbus->command_timer);
		}
	} else if (timer_pending(&xbus->command_timer)) {
		XBUS_DBG(SYNC, xbus, "del_timer\n");
		del_timer(&xbus->command_timer);
	}
	xbus->self_ticking = !on;
}

bool xbus_setflags(xbus_t *xbus, int flagbit, bool on)
{
	unsigned long flags;




			 (syncer) ? syncer->busname : "NO-SYNC");
}

static void xbus_command_timer(unsigned long param)
{
	xbus_t *xbus = (xbus_t *)param;
	struct timeval now;

	BUG_ON(!xbus);
	do_gettimeofday(&now);
	xbus_command_queue_tick(xbus);
	if (!xbus->self_ticking) /* Must be 1KHz rate */
		mod_timer(&xbus->command_timer, jiffies + 1);
}

void xbus_set_command_timer(xbus_t *xbus, bool on)
{
	XBUS_DBG(SYNC, xbus, "%s\n", (on) ? "ON" : "OFF");
	if (on) {
		if (!timer_pending(&xbus->command_timer)) {
			XBUS_DBG(SYNC, xbus, "add_timer\n");
			xbus->command_timer.function = xbus_command_timer;
			xbus->command_timer.data = (unsigned long)xbus;
			xbus->command_timer.expires = jiffies + 1;
			add_timer(&xbus->command_timer);
		}
	} else if (timer_pending(&xbus->command_timer)) {
		XBUS_DBG(SYNC, xbus, "del_timer\n");
		del_timer(&xbus->command_timer);
	}
	xbus->self_ticking = !on;
}

/*
 * Called when the Astribank replies to a sync change request
 */
- 

Return to bug 617876

Lines 1350-1355 err: Link Here

(-)a/drivers/dahdi/xpp/xbus-core.c (+30 lines)
1350	return 0;	1350	return 0;
1351	}	1351	}
1352		1352
		1353	static void xbus_command_timer(unsigned long param)
		1354	{
		1355	xbus_t xbus = (xbus_t )param;
		1356	struct timeval now;
		1357
		1358	BUG_ON(!xbus);
		1359	do_gettimeofday(&now);
		1360	xbus_command_queue_tick(xbus);
		1361	if (!xbus->self_ticking) /* Must be 1KHz rate */
		1362	mod_timer(&xbus->command_timer, jiffies + 1);
		1363	}
		1364
		1365	void xbus_set_command_timer(xbus_t *xbus, bool on)
		1366	{
		1367	XBUS_DBG(SYNC, xbus, "%s\n", (on) ? "ON" : "OFF");
		1368	if (on) {
		1369	if (!timer_pending(&xbus->command_timer)) {
		1370	XBUS_DBG(SYNC, xbus, "add_timer\n");
		1371	xbus->command_timer.function = xbus_command_timer;
		1372	xbus->command_timer.data = (unsigned long)xbus;
		1373	xbus->command_timer.expires = jiffies + 1;
		1374	add_timer(&xbus->command_timer);
		1375	}
		1376	} else if (timer_pending(&xbus->command_timer)) {
		1377	XBUS_DBG(SYNC, xbus, "del_timer\n");
		1378	del_timer(&xbus->command_timer);
		1379	}
		1380	xbus->self_ticking = !on;
		1381	}
		1382
1353	bool xbus_setflags(xbus_t *xbus, int flagbit, bool on)	1383	bool xbus_setflags(xbus_t *xbus, int flagbit, bool on)
1354	{	1384	{
1355	unsigned long flags;	1385	unsigned long flags;

Lines 353-388 static void xpp_set_syncer(xbus_t *xbus, bool on) Link Here

(-)a/drivers/dahdi/xpp/xbus-pcm.c (-31 lines)
353	(syncer) ? syncer->busname : "NO-SYNC");	353	(syncer) ? syncer->busname : "NO-SYNC");
354	}	354	}
355		355
356	static void xbus_command_timer(unsigned long param)
357	{
358	xbus_t xbus = (xbus_t )param;
359	struct timeval now;
360
361	BUG_ON(!xbus);
362	do_gettimeofday(&now);
363	xbus_command_queue_tick(xbus);
364	if (!xbus->self_ticking) /* Must be 1KHz rate */
365	mod_timer(&xbus->command_timer, jiffies + 1);
366	}
367
368	void xbus_set_command_timer(xbus_t *xbus, bool on)
369	{
370	XBUS_DBG(SYNC, xbus, "%s\n", (on) ? "ON" : "OFF");
371	if (on) {
372	if (!timer_pending(&xbus->command_timer)) {
373	XBUS_DBG(SYNC, xbus, "add_timer\n");
374	xbus->command_timer.function = xbus_command_timer;
375	xbus->command_timer.data = (unsigned long)xbus;
376	xbus->command_timer.expires = jiffies + 1;
377	add_timer(&xbus->command_timer);
378	}
379	} else if (timer_pending(&xbus->command_timer)) {
380	XBUS_DBG(SYNC, xbus, "del_timer\n");
381	del_timer(&xbus->command_timer);
382	}
383	xbus->self_ticking = !on;
384	}
385
386	/*	356	/*
387	* Called when the Astribank replies to a sync change request	357	* Called when the Astribank replies to a sync change request
388	*/	358	*/
389	-