From 75344b5502893959ef3562b3f10fe2d69b39d7ee Mon Sep 17 00:00:00 2001 From: tzafrir Date: Thu, 22 May 2008 15:02:32 +0000 Subject: blink_mode was a boolean and changed to a channels bitmask. Now actually changing the type from bool to unsigned long. (xpp r5756). Merged revisions 4314 via svnmerge from http://svn.digium.com/svn/zaptel/branches/1.2 git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4315 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- kernel/xpp/xpp_zap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel/xpp/xpp_zap.c') diff --git a/kernel/xpp/xpp_zap.c b/kernel/xpp/xpp_zap.c index 5ee7303..9c1805e 100644 --- a/kernel/xpp/xpp_zap.c +++ b/kernel/xpp/xpp_zap.c @@ -622,7 +622,7 @@ static int proc_xpd_blink_read(char *page, char **start, off_t off, int count, i BUG_ON(!xpd); spin_lock_irqsave(&xpd->lock, flags); - len += sprintf(page + len, "%d\n", xpd->blink_mode); + len += sprintf(page + len, "0x%lX\n", xpd->blink_mode); spin_unlock_irqrestore(&xpd->lock, flags); if (len <= off+count) *eof = 1; @@ -640,7 +640,7 @@ static int proc_xpd_blink_write(struct file *file, const char __user *buffer, un xpd_t *xpd = data; char buf[MAX_PROC_WRITE]; char *endp; - unsigned blink; + unsigned long blink; BUG_ON(!xpd); @@ -654,7 +654,7 @@ static int proc_xpd_blink_write(struct file *file, const char __user *buffer, un blink = simple_strtoul(buf, &endp, 0); if(*endp != '\0' || blink > 0xFFFF) return -EINVAL; - XPD_DBG(GENERAL, xpd, "BLINK channels: 0x%X\n", blink); + XPD_DBG(GENERAL, xpd, "BLINK channels: 0x%lX\n", blink); xpd->blink_mode = blink; return count; } -- cgit v1.2.3