frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

process output_start fails (input cannot fail)

Browse Source
This commit is contained in:
rjkm 2022-01-14 12:43:50 +01:00
parent be19cdb31d
commit 24b7f979c4
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ddbridge/ddbridge-core.c
View File

@ -457,10 +457,11 @@ static void calc_con(struct ddb_output *output, u32 *con, u32 *con2, u32 flags)
*con2 = (nco << 16) | gap; *con2 = (nco << 16) | gap;
} }
static void ddb_output_start_unlocked(struct ddb_output *output) static int ddb_output_start_unlocked(struct ddb_output *output)
{ {
struct ddb *dev = output->port->dev; struct ddb *dev = output->port->dev;
u32 con = 0x11c, con2 = 0; u32 con = 0x11c, con2 = 0;
int err = 0;
if (output->dma) { if (output->dma) {
output->dma->cbuf = 0; output->dma->cbuf = 0;
@ -469,7 +470,7 @@ static void ddb_output_start_unlocked(struct ddb_output *output)
ddbwritel(dev, 0, DMA_BUFFER_CONTROL(output->dma)); ddbwritel(dev, 0, DMA_BUFFER_CONTROL(output->dma));
} }
if (output->port->class == DDB_PORT_MOD) { if (output->port->class == DDB_PORT_MOD) {
ddbridge_mod_output_start(output); err = ddbridge_mod_output_start(output);
} else { } else {
if (output->port->input[0]->port->class == DDB_PORT_LOOP) if (output->port->input[0]->port->class == DDB_PORT_LOOP)
con = (1UL << 13) | 0x14; con = (1UL << 13) | 0x14;
@ -492,17 +493,21 @@ static void ddb_output_start_unlocked(struct ddb_output *output)
ddbwritel(dev, con | 1, TS_CONTROL(output)); ddbwritel(dev, con | 1, TS_CONTROL(output));
if (output->dma) if (output->dma)
output->dma->running = 1; output->dma->running = 1;
return err;
} }
static void ddb_output_start(struct ddb_output *output) static int ddb_output_start(struct ddb_output *output)
{ {
int err;
if (output->dma) { if (output->dma) {
spin_lock_irq(&output->dma->lock); spin_lock_irq(&output->dma->lock);
ddb_output_start_unlocked(output); err = ddb_output_start_unlocked(output);
spin_unlock_irq(&output->dma->lock); spin_unlock_irq(&output->dma->lock);
} else { } else {
ddb_output_start_unlocked(output); err = ddb_output_start_unlocked(output);
} }
return err;
} }
static void ddb_output_stop_unlocked(struct ddb_output *output) static void ddb_output_stop_unlocked(struct ddb_output *output)
@ -932,7 +937,7 @@ static int ts_open(struct inode *inode, struct file *file)
if (err < 0) if (err < 0)
return err; return err;
if ((file->f_flags & O_ACCMODE) == O_RDONLY) if ((file->f_flags & O_ACCMODE) == O_RDONLY)
err = ddb_input_start(input); ddb_input_start(input);
else if ((file->f_flags & O_ACCMODE) == O_WRONLY) else if ((file->f_flags & O_ACCMODE) == O_WRONLY)
err = ddb_output_start(output); err = ddb_output_start(output);
return err; return err;