FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

span_sysfs_{create,remove}

Browse Source 
* Separate out device generation in dahdi_[un]register to separate
  functions.
* As we don't keep anywhere the information of whether or not
* there's
  an existing device node for a channel, I abuse an unused flag:
  DAHDI_FLAGBIT_DEVFILE (25), to mark if the channel has a sysfs node.

DAHDI_FLAGBIT_DEVFILE is expected to be replaced later on with a proper
pointer to the device (or embedding of the device). I prefer a simple
flag for now as it does not break ABI.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9625 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Tzafrir Cohen
2011-01-10 21:42:00 +00:00
parent 98aa2844c1
commit 52cc07ecb1
2 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/dahdi/dahdi-base.c
View File

@@ -6445,6 +6445,54 @@ static long dahdi_ioctl_compat(struct file *file, unsigned int cmd,
}
#endif
static void span_sysfs_remove(struct dahdi_span *span)
{
int x;
for (x = 0; x < span->channels; x++) {
struct dahdi_chan *chan = span->chans[x];
if (!test_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags))
continue;
CLASS_DEV_DESTROY(dahdi_class,
MKDEV(DAHDI_MAJOR, chan->channo));
clear_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags);
}
}
static int span_sysfs_create(struct dahdi_span *span)
{
int res = 0;
int x;
for (x = 0; x < span->channels; x++) {
struct dahdi_chan *chan = span->chans[x];
char chan_name[32];
void *dummy;
if (chan->channo >= 250)
continue;
if (test_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags))
continue;
snprintf(chan_name, sizeof(chan_name), "dahdi!%d",
chan->channo);
dummy = (void *)CLASS_DEV_CREATE(dahdi_class,
MKDEV(DAHDI_MAJOR, chan->channo),
NULL, chan_name);
if (IS_ERR(dummy)) {
res = PTR_ERR(dummy);
goto cleanup;
}
set_bit(DAHDI_FLAGBIT_DEVFILE, &chan->flags);
}
return 0;
cleanup:
span_sysfs_remove(span);
return res;
}
/**
* _get_next_channo - Return the next taken channel number from the span list.
* @span: The span with which to start the search.
@@ -6518,6 +6566,7 @@ static int _dahdi_register(struct dahdi_span *span, int prefmaster)
struct list_head *loc = &span_list;
unsigned long flags;
unsigned int channo;
int res = 0;
if (!span || !span->ops || !span->ops->owner)
return -EINVAL;
@@ -6560,15 +6609,7 @@ static int _dahdi_register(struct dahdi_span *span, int prefmaster)
}
#endif
for (x = 0; x < span->channels; x++) {
if (span->chans[x]->channo < 250) {
char chan_name[32];
snprintf(chan_name, sizeof(chan_name), "dahdi!%d",
span->chans[x]->channo);
CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR,
span->chans[x]->channo), NULL, chan_name);
}
}
res = span_sysfs_create(span);
if (debug & DEBUG_MAIN) {
module_printk(KERN_NOTICE, "Registered Span %d ('%s') with "
@@ -6637,10 +6678,7 @@ static int _dahdi_unregister(struct dahdi_span *span)
remove_proc_entry(span->proc_entry->name, root_proc_entry);
#endif /* CONFIG_PROC_FS */
for (x = 0; x < span->channels; x++) {
if (span->chans[x]->channo < 250)
CLASS_DEV_DESTROY(dahdi_class, MKDEV(DAHDI_MAJOR, span->chans[x]->channo));
}
span_sysfs_remove(span);
for (x=0;x<span->channels;x++)
dahdi_chan_unreg(span->chans[x]);

1
include/dahdi/kernel.h
View File

@@ -712,6 +712,7 @@ enum {
DAHDI_FLAGBIT_LOOPED = 18, /*!< Loopback the receive data from the channel to the transmit */
DAHDI_FLAGBIT_MTP2 = 19, /*!< Repeats last message in buffer and also discards repeating messages sent to us */
DAHDI_FLAGBIT_HDLC56 = 20, /*!< Sets the given channel (if in HDLC mode) to use 56K HDLC instead of 64K */
DAHDI_FLAGBIT_DEVFILE = 25, /*!< Channel has a sysfs dev file */
};
#ifdef CONFIG_DAHDI_NET