diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-08-11 15:31:49 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-08-11 15:31:49 +0000 |
commit | e762ee6ef14b199bce70228f42c03bd5fbd05c38 (patch) | |
tree | a7c4b7305dbb6f4c003ae3ae3b0fe36cd718c56a /drivers/dahdi/xpp | |
parent | 518f6b963d7201451c4c62c4be23921c0ac54f7e (diff) |
xpp_blink is a bit mask of ports, and not boolean anymore.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4758 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp')
-rw-r--r-- | drivers/dahdi/xpp/xpd.h | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dahdi/xpp/xpd.h b/drivers/dahdi/xpp/xpd.h index d9a00aa..ae87360 100644 --- a/drivers/dahdi/xpp/xpd.h +++ b/drivers/dahdi/xpp/xpd.h @@ -171,7 +171,7 @@ struct xpd { atomic_t open_counter; /* Number of open channels */ int flags; - bool blink_mode; /* for visual identification */ + unsigned long blink_mode; /* bitmask of blinking ports */ #define DEFAULT_LED_PERIOD (1000/8) /* in tick */ #ifdef CONFIG_PROC_FS diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 6d2d241..ea4b61b 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -625,7 +625,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; @@ -643,7 +643,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); @@ -657,7 +657,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; } |