diff options
| author | Tomasz Maciej Nowak | 2018-04-19 17:53:11 +0200 |
|---|---|---|
| committer | Tomasz Maciej Nowak | 2018-04-19 17:53:11 +0200 |
| commit | 234bcb282d4976616f8e677f4a8d87a309f5bb9d (patch) | |
| tree | dbd74311cd7450e706ae450cabee1a6870791a9f /tweaks.patch | |
| parent | 839b4f44e20b1b773609ab8b87370538068929dd (diff) | |
| download | aur-234bcb282d4976616f8e677f4a8d87a309f5bb9d.tar.gz | |
upgpkg: vtunerc-dkms 1.4-4
fix build with 4.16 kernel
remove whitespaces from patches
Diffstat (limited to 'tweaks.patch')
| -rw-r--r-- | tweaks.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tweaks.patch b/tweaks.patch index 5530503563e8..23ebd7e3a7f9 100644 --- a/tweaks.patch +++ b/tweaks.patch @@ -8,18 +8,18 @@ + dprintk(ctx, "XCH_MSG: %d: entered\n", msg->type); if (down_interruptible(&ctx->xchange_sem)) return -ERESTARTSYS; - + @@ -413,7 +413,7 @@ int vtunerc_ctrldev_xchange_message(struct vtunerc_ctx *ctx, up(&ctx->xchange_sem); return 0; } - //dprintk(ctx, "XCH_MSG: %d: continue\n", msg->type); + dprintk(ctx, "XCH_MSG: %d: continue\n", msg->type); - + #if 0 BUG_ON(ctx->ctrldev_request.type != -1); @@ -433,7 +433,7 @@ int vtunerc_ctrldev_xchange_message(struct vtunerc_ctx *ctx, - + if (wait_event_interruptible(ctx->ctrldev_wait_response_wq, ctx->ctrldev_response.type != -1)) { - //dprintk(ctx, "XCH_MSG: %d: wait_event interrupted\n", msg->type); @@ -28,51 +28,51 @@ up(&ctx->xchange_sem); return -ERESTARTSYS; @@ -441,7 +441,7 @@ int vtunerc_ctrldev_xchange_message(struct vtunerc_ctx *ctx, - + BUG_ON(ctx->ctrldev_response.type == -1); - + - //dprintk(ctx, "XCH_MSG: %d -> %d (DONE)\n", msg->type, ctx->ctrldev_response.type); + dprintk(ctx, "XCH_MSG: %d -> %d (DONE)\n", msg->type, ctx->ctrldev_response.type); memcpy(msg, &ctx->ctrldev_response, sizeof(struct vtuner_message)); ctx->ctrldev_response.type = -1; - + --- a/vtunerc_main.c +++ b/vtunerc_main.c @@ -102,9 +102,9 @@ static void pidtab_copy_to_msg(struct vtunerc_ctx *ctx, { int i; - + - for (i = 0; i < (MAX_PIDTAB_LEN - 1); i++) + for (i = 0; i < MAX_PIDTAB_LEN ; i++) msg->body.pidlist[i] = ctx->pidtab[i]; /*TODO: optimize it*/ - msg->body.pidlist[MAX_PIDTAB_LEN - 1] = 0; + /* msg->body.pidlist[MAX_PIDTAB_LEN - 1] = 0; */ } - + static int vtunerc_start_feed(struct dvb_demux_feed *feed) @@ -128,8 +128,12 @@ static int vtunerc_start_feed(struct dvb_demux_feed *feed) return -EINVAL; } - + - /* organize PID list table */ + if (feed->pid >= 0x2000 ) { + printk(KERN_ERR "vtunerc%d: full mux not supported\n",ctx->idx); + return -EINVAL; + } - + + /* organize PID list table */ if (pidtab_find_index(ctx->pidtab, feed->pid) < 0) { pidtab_add_pid(ctx->pidtab, feed->pid); - + --- a/vtunerc_proxyfe.c +++ b/vtunerc_proxyfe.c @@ -174,52 +174,12 @@ static int dvb_proxyfe_set_frontend(struct dvb_frontend *fe) - + if (ctx->vtype == VT_S2 && c->delivery_system == SYS_DVBS2) { /* DELIVERY SYSTEM: S2 delsys in use */ - msg.body.fe_params.u.qpsk.fec_inner = 9; + msg.body.fe_params.u.qpsk.fec_inner |= 32; - + /* MODULATION */ if (c->modulation == PSK_8) - /* signal PSK_8 modulation used */ @@ -119,7 +119,7 @@ - } + /* signal PSK_8 modulation used */ + msg.body.fe_params.u.qpsk.fec_inner |= 64; - + /* ROLLOFF */ switch (c->rolloff) { @@ -506,10 +466,10 @@ static struct dvb_frontend_ops dvb_proxyfe_qpsk_ops = { @@ -135,5 +135,5 @@ + FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | + FE_CAN_QPSK | FE_CAN_RECOVER }, - + .release = dvb_proxyfe_release, |