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

wctdm24xxp: Remove the wctdm_regs structure from the stack in wctdm_ioctl.

Browse Source 
Drops the size of the wctdm_ioctl stack from 524 to 204 bytes.

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

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9748 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-02-09 18:57:53 +00:00
parent 04f50821d4
commit e9558d499b
1 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/dahdi/wctdm24xxp/base.c
View File

@ -3000,11 +3000,36 @@ static void qrv_dosetup(struct dahdi_chan *chan,struct wctdm *wc)
return;
}
static void wctdm24xxp_get_fxs_regs(struct wctdm *wc, struct dahdi_chan *chan,
struct wctdm_regs *regs)
{
int x;
for (x = 0; x < NUM_INDIRECT_REGS; x++)
regs->indirect[x] = wctdm_proslic_getreg_indirect(wc,
chan->chanpos - 1, x);
for (x = 0; x < NUM_REGS; x++)
regs->direct[x] = wctdm_getreg(wc, chan->chanpos - 1, x);
}
static void wctdm24xxp_get_fxo_regs(struct wctdm *wc, struct dahdi_chan *chan,
struct wctdm_regs *regs)
{
int x;
for (x = 0; x < NUM_FXO_REGS; x++)
regs->direct[x] = wctdm_getreg(wc, chan->chanpos - 1, x);
}
static void wctdm24xxp_get_qrv_regs(struct wctdm *wc, struct dahdi_chan *chan,
struct wctdm_regs *regs)
{
int x;
for (x = 0; x < 0x32; x++)
regs->direct[x] = wctdm_getreg(wc, chan->chanpos - 1, x);
}
static int wctdm_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long data)
{
struct wctdm_stats stats;
struct wctdm_regs regs;
struct wctdm_regop regop;
struct wctdm_echo_coefs echoregs;
struct dahdi_hwgain hwgain;
@ -3086,23 +3111,26 @@ static int wctdm_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long
return -EFAULT;
break;
case WCTDM_GET_REGS:
if (wc->modtype[chan->chanpos - 1] == MOD_TYPE_FXS) {
for (x=0;x<NUM_INDIRECT_REGS;x++)
regs.indirect[x] = wctdm_proslic_getreg_indirect(wc, chan->chanpos -1, x);
for (x=0;x<NUM_REGS;x++)
regs.direct[x] = wctdm_getreg(wc, chan->chanpos - 1, x);
} else if (wc->modtype[chan->chanpos - 1] == MOD_TYPE_QRV) {
memset(&regs, 0, sizeof(regs));
for (x=0;x<0x32;x++)
regs.direct[x] = wctdm_getreg(wc, chan->chanpos - 1, x);
} else {
memset(&regs, 0, sizeof(regs));
for (x=0;x<NUM_FXO_REGS;x++)
regs.direct[x] = wctdm_getreg(wc, chan->chanpos - 1, x);
}
if (copy_to_user((__user void *)data, &regs, sizeof(regs)))
{
struct wctdm_regs *regs = kzalloc(sizeof(*regs), GFP_KERNEL);
if (!regs)
return -ENOMEM;
if (wc->modtype[chan->chanpos - 1] == MOD_TYPE_FXS)
wctdm24xxp_get_fxs_regs(wc, chan, regs);
else if (wc->modtype[chan->chanpos - 1] == MOD_TYPE_QRV)
wctdm24xxp_get_qrv_regs(wc, chan, regs);
else
wctdm24xxp_get_fxo_regs(wc, chan, regs);
if (copy_to_user((__user void *)data, regs, sizeof(*regs))) {
kfree(regs);
return -EFAULT;
}
kfree(regs);
break;
}
case WCTDM_SET_REG:
if (copy_from_user(&regop, (__user void *) data, sizeof(regop)))
return -EFAULT;