-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
V4L/DVB (12733): cx25821: some CodingStyle fixes
The original driver were generated with some dos editor, and used their own coding style. This patch does some automatic CodingStyle fixes, by running dos2unix and Lindent tools. More work still needs to be done for it to use upstream CodingStyle. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
- Loading branch information
Mauro Carvalho Chehab
committed
Sep 19, 2009
1 parent
bb4c9a7
commit 1a9fc85
Showing
35 changed files
with
12,592 additions
and
12,726 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,57 @@ | ||
| /* | ||
| * Driver for the Conexant CX25821 PCIe bridge | ||
| * | ||
| * Copyright (C) 2009 Conexant Systems Inc. | ||
| * Authors <hiep.huynh@conexant.com>, <shu.lin@conexant.com> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| */ | ||
|
|
||
| #include <linux/mutex.h> | ||
| #include <linux/workqueue.h> | ||
|
|
||
|
|
||
| #define NUM_AUDIO_PROGS 8 | ||
| #define NUM_AUDIO_FRAMES 8 | ||
| #define END_OF_FILE 0 | ||
| #define IN_PROGRESS 1 | ||
| #define RESET_STATUS -1 | ||
| #define FIFO_DISABLE 0 | ||
| #define FIFO_ENABLE 1 | ||
| #define NUM_NO_OPS 4 | ||
|
|
||
|
|
||
| #define RISC_READ_INSTRUCTION_SIZE 12 | ||
| #define RISC_JUMP_INSTRUCTION_SIZE 12 | ||
| #define RISC_WRITECR_INSTRUCTION_SIZE 16 | ||
| #define RISC_SYNC_INSTRUCTION_SIZE 4 | ||
| #define DWORD_SIZE 4 | ||
| #define AUDIO_SYNC_LINE 4 | ||
|
|
||
|
|
||
| #define LINES_PER_AUDIO_BUFFER 15 | ||
| #define AUDIO_LINE_SIZE 128 | ||
| #define AUDIO_DATA_BUF_SZ (AUDIO_LINE_SIZE * LINES_PER_AUDIO_BUFFER) | ||
|
|
||
| #define USE_RISC_NOOP_AUDIO 1 | ||
|
|
||
| #ifdef USE_RISC_NOOP_AUDIO | ||
| #define AUDIO_RISC_DMA_BUF_SIZE ( LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE + RISC_JUMP_INSTRUCTION_SIZE) | ||
| #endif | ||
|
|
||
|
|
||
| #ifndef USE_RISC_NOOP_AUDIO | ||
| #define AUDIO_RISC_DMA_BUF_SIZE ( LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + RISC_JUMP_INSTRUCTION_SIZE) | ||
| #endif | ||
|
|
||
| static int _line_size; | ||
| char * _defaultAudioName = "/root/audioGOOD.wav"; | ||
|
|
||
| /* | ||
| * Driver for the Conexant CX25821 PCIe bridge | ||
| * | ||
| * Copyright (C) 2009 Conexant Systems Inc. | ||
| * Authors <hiep.huynh@conexant.com>, <shu.lin@conexant.com> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| */ | ||
|
|
||
| #include <linux/mutex.h> | ||
| #include <linux/workqueue.h> | ||
|
|
||
| #define NUM_AUDIO_PROGS 8 | ||
| #define NUM_AUDIO_FRAMES 8 | ||
| #define END_OF_FILE 0 | ||
| #define IN_PROGRESS 1 | ||
| #define RESET_STATUS -1 | ||
| #define FIFO_DISABLE 0 | ||
| #define FIFO_ENABLE 1 | ||
| #define NUM_NO_OPS 4 | ||
|
|
||
| #define RISC_READ_INSTRUCTION_SIZE 12 | ||
| #define RISC_JUMP_INSTRUCTION_SIZE 12 | ||
| #define RISC_WRITECR_INSTRUCTION_SIZE 16 | ||
| #define RISC_SYNC_INSTRUCTION_SIZE 4 | ||
| #define DWORD_SIZE 4 | ||
| #define AUDIO_SYNC_LINE 4 | ||
|
|
||
| #define LINES_PER_AUDIO_BUFFER 15 | ||
| #define AUDIO_LINE_SIZE 128 | ||
| #define AUDIO_DATA_BUF_SZ (AUDIO_LINE_SIZE * LINES_PER_AUDIO_BUFFER) | ||
|
|
||
| #define USE_RISC_NOOP_AUDIO 1 | ||
|
|
||
| #ifdef USE_RISC_NOOP_AUDIO | ||
| #define AUDIO_RISC_DMA_BUF_SIZE ( LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE + RISC_JUMP_INSTRUCTION_SIZE) | ||
| #endif | ||
|
|
||
| #ifndef USE_RISC_NOOP_AUDIO | ||
| #define AUDIO_RISC_DMA_BUF_SIZE ( LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + RISC_JUMP_INSTRUCTION_SIZE) | ||
| #endif | ||
|
|
||
| static int _line_size; | ||
| char *_defaultAudioName = "/root/audioGOOD.wav"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,57 @@ | ||
| /* | ||
| * Driver for the Conexant CX25821 PCIe bridge | ||
| * | ||
| * Copyright (C) 2009 Conexant Systems Inc. | ||
| * Authors <shu.lin@conexant.com>, <hiep.huynh@conexant.com> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| */ | ||
|
|
||
| #ifndef __CX25821_AUDIO_H__ | ||
| #define __CX25821_AUDIO_H__ | ||
|
|
||
|
|
||
| #define USE_RISC_NOOP 1 | ||
| #define LINES_PER_BUFFER 15 | ||
| #define AUDIO_LINE_SIZE 128 | ||
|
|
||
| //Number of buffer programs to use at once. | ||
| #define NUMBER_OF_PROGRAMS 8 | ||
|
|
||
| //Max size of the RISC program for a buffer. - worst case is 2 writes per line | ||
| // 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) | ||
| #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) | ||
| #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) | ||
|
|
||
| #endif | ||
|
|
||
| /* | ||
| * Driver for the Conexant CX25821 PCIe bridge | ||
| * | ||
| * Copyright (C) 2009 Conexant Systems Inc. | ||
| * Authors <shu.lin@conexant.com>, <hiep.huynh@conexant.com> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| */ | ||
|
|
||
| #ifndef __CX25821_AUDIO_H__ | ||
| #define __CX25821_AUDIO_H__ | ||
|
|
||
| #define USE_RISC_NOOP 1 | ||
| #define LINES_PER_BUFFER 15 | ||
| #define AUDIO_LINE_SIZE 128 | ||
|
|
||
| //Number of buffer programs to use at once. | ||
| #define NUMBER_OF_PROGRAMS 8 | ||
|
|
||
| //Max size of the RISC program for a buffer. - worst case is 2 writes per line | ||
| // 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) | ||
| #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) | ||
| #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) | ||
|
|
||
| #endif |
Oops, something went wrong.