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

dahdi: Embed the proc entries in struct dahdi_span.

Browse Source 
Part of preparations for replacing the array of spans with a list of
spans.

Review: https://reviewboard.asterisk.org/r/905/

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9354 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2010-09-20 20:32:35 +00:00
parent 5514b84e06
commit ee7057f87a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@ EXPORT_SYMBOL(dahdi_unregister_echocan_factory);
EXPORT_SYMBOL(dahdi_set_hpec_ioctl); EXPORT_SYMBOL(dahdi_set_hpec_ioctl);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static struct proc_dir_entry *proc_entries[DAHDI_MAX_SPANS]; static struct proc_dir_entry *root_proc_entry;
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
@ -6026,8 +6026,9 @@ int dahdi_register(struct dahdi_span *span, int prefmaster)
{ {
char tempfile[17]; char tempfile[17];
snprintf(tempfile, sizeof(tempfile), "dahdi/%d", span->spanno); snprintf(tempfile, sizeof(tempfile), "dahdi/%d", span->spanno);
proc_entries[span->spanno] = create_proc_read_entry(tempfile, 0444, span->proc_entry = create_proc_read_entry(tempfile, 0444,
NULL, dahdi_proc_read, (int *) (long) span->spanno); NULL, dahdi_proc_read,
(int *) (long) span->spanno);
} }
#endif #endif
@ -8729,7 +8730,7 @@ static int __init dahdi_init(void)
int res = 0; int res = 0;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
proc_entries[0] = proc_mkdir("dahdi", NULL); root_proc_entry = proc_mkdir("dahdi", NULL);
#endif #endif
if ((res = register_chrdev(DAHDI_MAJOR, "dahdi", &dahdi_fops))) { if ((res = register_chrdev(DAHDI_MAJOR, "dahdi", &dahdi_fops))) {

4
include/dahdi/kernel.h
View File

@ -871,6 +871,10 @@ struct dahdi_span {
int watchcounter; int watchcounter;
int watchstate; int watchstate;
#endif #endif
#ifdef CONFIG_PROC_FS
struct proc_dir_entry *proc_entry;
#endif
}; };
struct dahdi_transcoder_channel { struct dahdi_transcoder_channel {