diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-29 22:03:52 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-29 22:03:52 +0000 |
| commit | 75d1b0f6c0e3b4898b3751449a379f0f8baf9619 (patch) | |
| tree | ee976a3e44c7473a002dc8d559e75c417602ce51 /drivers/dahdi/dahdi_dynamic.c | |
| parent | a395b3b6e59ce139dafdb347e4de1f558749b223 (diff) | |
make an initial split of dahdi/kernel.h into userspace- and kernelspace-specific parts
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4628 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi_dynamic.c')
| -rw-r--r-- | drivers/dahdi/dahdi_dynamic.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index c0b50b1..44d43ec 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -36,7 +36,6 @@ #include <linux/moduleparam.h> #include <dahdi/kernel.h> -#include <dahdi/user.h> /* * Tasklets provide better system interactive response at the cost of the @@ -434,7 +433,7 @@ static void dynamic_destroy(struct dahdi_dynamic *z) checkmaster(); } -static struct dahdi_dynamic *find_dynamic(DAHDI_DYNAMIC_SPAN *zds) +static struct dahdi_dynamic *find_dynamic(struct dahdi_dynamic_span *zds) { struct dahdi_dynamic *z; z = dspans; @@ -460,7 +459,7 @@ static struct dahdi_dynamic_driver *find_driver(char *name) return ztd; } -static int destroy_dynamic(DAHDI_DYNAMIC_SPAN *zds) +static int destroy_dynamic(struct dahdi_dynamic_span *zds) { unsigned long flags; struct dahdi_dynamic *z, *cur, *prev=NULL; @@ -534,7 +533,7 @@ static int ztd_close(struct dahdi_chan *chan) return 0; } -static int create_dynamic(DAHDI_DYNAMIC_SPAN *zds) +static int create_dynamic(struct dahdi_dynamic_span *zds) { struct dahdi_dynamic *z; struct dahdi_dynamic_driver *ztd; @@ -687,7 +686,7 @@ static void ztd_tasklet(unsigned long data) static int ztdynamic_ioctl(unsigned int cmd, unsigned long data) { - DAHDI_DYNAMIC_SPAN zds; + struct dahdi_dynamic_span zds; int res; switch(cmd) { case 0: @@ -698,7 +697,7 @@ static int ztdynamic_ioctl(unsigned int cmd, unsigned long data) ztdynamic_run(); return 0; case DAHDI_DYNAMIC_CREATE: - if (copy_from_user(&zds, (DAHDI_DYNAMIC_SPAN *)data, sizeof(zds))) + if (copy_from_user(&zds, (struct dahdi_dynamic_span *)data, sizeof(zds))) return -EFAULT; if (debug) printk("Dynamic Create\n"); @@ -707,11 +706,11 @@ static int ztdynamic_ioctl(unsigned int cmd, unsigned long data) return res; zds.spanno = res; /* Let them know the new span number */ - if (copy_to_user((DAHDI_DYNAMIC_SPAN *)data, &zds, sizeof(zds))) + if (copy_to_user((struct dahdi_dynamic_span *)data, &zds, sizeof(zds))) return -EFAULT; return 0; case DAHDI_DYNAMIC_DESTROY: - if (copy_from_user(&zds, (DAHDI_DYNAMIC_SPAN *)data, sizeof(zds))) + if (copy_from_user(&zds, (struct dahdi_dynamic_span *)data, sizeof(zds))) return -EFAULT; if (debug) printk("Dynamic Destroy\n"); |