Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285261
b: refs/heads/master
c: 6f1f0e8
h: refs/heads/master
i:
  285259: 349e9cb
v: v3
  • Loading branch information
Leonid V. Fedorenchik authored and Mauro Carvalho Chehab committed Nov 24, 2011
1 parent ec877cc commit 94cde80
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e249581611bfc98c1ec18b6e124b613b6b6db1b
refs/heads/master: 6f1f0e85da9be5a2ffddf42751400f619b503d62
31 changes: 16 additions & 15 deletions trunk/drivers/media/video/cx25821/cx25821-audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,28 @@
* Space is also added for the 4 no-op instructions added on the end.
*/
#ifndef USE_RISC_NOOP
#define MAX_BUFFER_PROGRAM_SIZE \
(2 * LINES_PER_BUFFER * RISC_WRITE_INSTRUCTION_SIZE + \
RISC_WRITECR_INSTRUCTION_SIZE * 4)
#define MAX_BUFFER_PROGRAM_SIZE \
(2 * LINES_PER_BUFFER * RISC_WRITE_INSTRUCTION_SIZE + \
RISC_WRITECR_INSTRUCTION_SIZE * 4)
#endif

/* MAE 12 July 2005 Try to use NOOP RISC instruction instead */
#ifdef USE_RISC_NOOP
#define MAX_BUFFER_PROGRAM_SIZE \
(2 * LINES_PER_BUFFER * RISC_WRITE_INSTRUCTION_SIZE + \
RISC_NOOP_INSTRUCTION_SIZE * 4)
#define MAX_BUFFER_PROGRAM_SIZE \
(2 * LINES_PER_BUFFER * RISC_WRITE_INSTRUCTION_SIZE + \
RISC_NOOP_INSTRUCTION_SIZE * 4)
#endif

/* Sizes of various instructions in bytes. Used when adding instructions. */
#define RISC_WRITE_INSTRUCTION_SIZE 12
#define RISC_JUMP_INSTRUCTION_SIZE 12
#define RISC_SKIP_INSTRUCTION_SIZE 4
#define RISC_SYNC_INSTRUCTION_SIZE 4
#define RISC_WRITECR_INSTRUCTION_SIZE 16
#define RISC_NOOP_INSTRUCTION_SIZE 4

#define MAX_AUDIO_DMA_BUFFER_SIZE \
(MAX_BUFFER_PROGRAM_SIZE * NUMBER_OF_PROGRAMS + RISC_SYNC_INSTRUCTION_SIZE)
#define RISC_WRITE_INSTRUCTION_SIZE 12
#define RISC_JUMP_INSTRUCTION_SIZE 12
#define RISC_SKIP_INSTRUCTION_SIZE 4
#define RISC_SYNC_INSTRUCTION_SIZE 4
#define RISC_WRITECR_INSTRUCTION_SIZE 16
#define RISC_NOOP_INSTRUCTION_SIZE 4

#define MAX_AUDIO_DMA_BUFFER_SIZE \
(MAX_BUFFER_PROGRAM_SIZE * NUMBER_OF_PROGRAMS + \
RISC_SYNC_INSTRUCTION_SIZE)

#endif

0 comments on commit 94cde80

Please sign in to comment.