diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-22 14:56:10 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-22 14:56:10 +0000 |
| commit | 0c0b2434d7e0163367f13e8feadb470aa918d8a6 (patch) | |
| tree | 4656689d3cf1eb784c98d69bdb865f6dfe3a7a7c | |
| parent | 70082a2567dcbe8826019e7813132d5354e7bea7 (diff) | |
blink_mode was a boolean and changed to a channels bitmask. Now actually
changing the type from bool to unsigned long. (xpp r5756).
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4314 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | xpp/xpd.h | 2 | ||||
| -rw-r--r-- | xpp/xpp_zap.c | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -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/xpp/xpp_zap.c b/xpp/xpp_zap.c index 5ee7303..9c1805e 100644 --- a/xpp/xpp_zap.c +++ b/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; } |