diff options
| author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-12-12 03:37:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 11:57:44 -0500 |
| commit | afd1a0c9ac281eed3b22b293ccd92af7b0d60889 (patch) | |
| tree | 686c03cf1a1a2efb1fba6dc6e682fbb48edc7c58 /include/linux/dvb | |
| parent | 808824b5f73e361503420ee318ca9689781da034 (diff) | |
[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3
Clean up whitespaces at v4l/dvb files
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/dvb')
| -rw-r--r-- | include/linux/dvb/audio.h | 28 | ||||
| -rw-r--r-- | include/linux/dvb/ca.h | 36 | ||||
| -rw-r--r-- | include/linux/dvb/dmx.h | 20 | ||||
| -rw-r--r-- | include/linux/dvb/osd.h | 58 | ||||
| -rw-r--r-- | include/linux/dvb/video.h | 44 |
5 files changed, 93 insertions, 93 deletions
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h index cc314443f1c4..2b8797084685 100644 --- a/include/linux/dvb/audio.h +++ b/include/linux/dvb/audio.h | |||
| @@ -32,39 +32,39 @@ | |||
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | typedef enum { | 34 | typedef enum { |
| 35 | AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ | 35 | AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ |
| 36 | AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */ | 36 | AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */ |
| 37 | } audio_stream_source_t; | 37 | } audio_stream_source_t; |
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | typedef enum { | 40 | typedef enum { |
| 41 | AUDIO_STOPPED, /* Device is stopped */ | 41 | AUDIO_STOPPED, /* Device is stopped */ |
| 42 | AUDIO_PLAYING, /* Device is currently playing */ | 42 | AUDIO_PLAYING, /* Device is currently playing */ |
| 43 | AUDIO_PAUSED /* Device is paused */ | 43 | AUDIO_PAUSED /* Device is paused */ |
| 44 | } audio_play_state_t; | 44 | } audio_play_state_t; |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | typedef enum { | 47 | typedef enum { |
| 48 | AUDIO_STEREO, | 48 | AUDIO_STEREO, |
| 49 | AUDIO_MONO_LEFT, | 49 | AUDIO_MONO_LEFT, |
| 50 | AUDIO_MONO_RIGHT | 50 | AUDIO_MONO_RIGHT |
| 51 | } audio_channel_select_t; | 51 | } audio_channel_select_t; |
| 52 | 52 | ||
| 53 | 53 | ||
| 54 | typedef struct audio_mixer { | 54 | typedef struct audio_mixer { |
| 55 | unsigned int volume_left; | 55 | unsigned int volume_left; |
| 56 | unsigned int volume_right; | 56 | unsigned int volume_right; |
| 57 | // what else do we need? bass, pass-through, ... | 57 | // what else do we need? bass, pass-through, ... |
| 58 | } audio_mixer_t; | 58 | } audio_mixer_t; |
| 59 | 59 | ||
| 60 | 60 | ||
| 61 | typedef struct audio_status { | 61 | typedef struct audio_status { |
| 62 | int AV_sync_state; /* sync audio and video? */ | 62 | int AV_sync_state; /* sync audio and video? */ |
| 63 | int mute_state; /* audio is muted */ | 63 | int mute_state; /* audio is muted */ |
| 64 | audio_play_state_t play_state; /* current playback state */ | 64 | audio_play_state_t play_state; /* current playback state */ |
| 65 | audio_stream_source_t stream_source; /* current stream source */ | 65 | audio_stream_source_t stream_source; /* current stream source */ |
| 66 | audio_channel_select_t channel_select; /* currently selected channel */ | 66 | audio_channel_select_t channel_select; /* currently selected channel */ |
| 67 | int bypass_mode; /* pass on audio data to */ | 67 | int bypass_mode; /* pass on audio data to */ |
| 68 | audio_mixer_t mixer_state; /* current mixer state */ | 68 | audio_mixer_t mixer_state; /* current mixer state */ |
| 69 | } audio_status_t; /* separate decoder hardware */ | 69 | } audio_status_t; /* separate decoder hardware */ |
| 70 | 70 | ||
| @@ -74,8 +74,8 @@ struct audio_karaoke{ /* if Vocal1 or Vocal2 are non-zero, they get mixed */ | |||
| 74 | int vocal1; /* into left and right t at 70% each */ | 74 | int vocal1; /* into left and right t at 70% each */ |
| 75 | int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/ | 75 | int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/ |
| 76 | int melody; /* mixed into the left channel and */ | 76 | int melody; /* mixed into the left channel and */ |
| 77 | /* Vocal2 into the right channel at 100% each. */ | 77 | /* Vocal2 into the right channel at 100% each. */ |
| 78 | /* if Melody is non-zero, the melody channel gets mixed*/ | 78 | /* if Melody is non-zero, the melody channel gets mixed*/ |
| 79 | } audio_karaoke_t; /* into left and right */ | 79 | } audio_karaoke_t; /* into left and right */ |
| 80 | 80 | ||
| 81 | 81 | ||
diff --git a/include/linux/dvb/ca.h b/include/linux/dvb/ca.h index 558af0cc7692..c18537f3e449 100644 --- a/include/linux/dvb/ca.h +++ b/include/linux/dvb/ca.h | |||
| @@ -27,16 +27,16 @@ | |||
| 27 | /* slot interface types and info */ | 27 | /* slot interface types and info */ |
| 28 | 28 | ||
| 29 | typedef struct ca_slot_info { | 29 | typedef struct ca_slot_info { |
| 30 | int num; /* slot number */ | 30 | int num; /* slot number */ |
| 31 | 31 | ||
| 32 | int type; /* CA interface this slot supports */ | 32 | int type; /* CA interface this slot supports */ |
| 33 | #define CA_CI 1 /* CI high level interface */ | 33 | #define CA_CI 1 /* CI high level interface */ |
| 34 | #define CA_CI_LINK 2 /* CI link layer level interface */ | 34 | #define CA_CI_LINK 2 /* CI link layer level interface */ |
| 35 | #define CA_CI_PHYS 4 /* CI physical layer level interface */ | 35 | #define CA_CI_PHYS 4 /* CI physical layer level interface */ |
| 36 | #define CA_DESCR 8 /* built-in descrambler */ | 36 | #define CA_DESCR 8 /* built-in descrambler */ |
| 37 | #define CA_SC 128 /* simple smart card interface */ | 37 | #define CA_SC 128 /* simple smart card interface */ |
| 38 | 38 | ||
| 39 | unsigned int flags; | 39 | unsigned int flags; |
| 40 | #define CA_CI_MODULE_PRESENT 1 /* module (or card) inserted */ | 40 | #define CA_CI_MODULE_PRESENT 1 /* module (or card) inserted */ |
| 41 | #define CA_CI_MODULE_READY 2 | 41 | #define CA_CI_MODULE_READY 2 |
| 42 | } ca_slot_info_t; | 42 | } ca_slot_info_t; |
| @@ -45,37 +45,37 @@ typedef struct ca_slot_info { | |||
| 45 | /* descrambler types and info */ | 45 | /* descrambler types and info */ |
| 46 | 46 | ||
| 47 | typedef struct ca_descr_info { | 47 | typedef struct ca_descr_info { |
| 48 | unsigned int num; /* number of available descramblers (keys) */ | 48 | unsigned int num; /* number of available descramblers (keys) */ |
| 49 | unsigned int type; /* type of supported scrambling system */ | 49 | unsigned int type; /* type of supported scrambling system */ |
| 50 | #define CA_ECD 1 | 50 | #define CA_ECD 1 |
| 51 | #define CA_NDS 2 | 51 | #define CA_NDS 2 |
| 52 | #define CA_DSS 4 | 52 | #define CA_DSS 4 |
| 53 | } ca_descr_info_t; | 53 | } ca_descr_info_t; |
| 54 | 54 | ||
| 55 | typedef struct ca_caps { | 55 | typedef struct ca_caps { |
| 56 | unsigned int slot_num; /* total number of CA card and module slots */ | 56 | unsigned int slot_num; /* total number of CA card and module slots */ |
| 57 | unsigned int slot_type; /* OR of all supported types */ | 57 | unsigned int slot_type; /* OR of all supported types */ |
| 58 | unsigned int descr_num; /* total number of descrambler slots (keys) */ | 58 | unsigned int descr_num; /* total number of descrambler slots (keys) */ |
| 59 | unsigned int descr_type; /* OR of all supported types */ | 59 | unsigned int descr_type; /* OR of all supported types */ |
| 60 | } ca_caps_t; | 60 | } ca_caps_t; |
| 61 | 61 | ||
| 62 | /* a message to/from a CI-CAM */ | 62 | /* a message to/from a CI-CAM */ |
| 63 | typedef struct ca_msg { | 63 | typedef struct ca_msg { |
| 64 | unsigned int index; | 64 | unsigned int index; |
| 65 | unsigned int type; | 65 | unsigned int type; |
| 66 | unsigned int length; | 66 | unsigned int length; |
| 67 | unsigned char msg[256]; | 67 | unsigned char msg[256]; |
| 68 | } ca_msg_t; | 68 | } ca_msg_t; |
| 69 | 69 | ||
| 70 | typedef struct ca_descr { | 70 | typedef struct ca_descr { |
| 71 | unsigned int index; | 71 | unsigned int index; |
| 72 | unsigned int parity; /* 0 == even, 1 == odd */ | 72 | unsigned int parity; /* 0 == even, 1 == odd */ |
| 73 | unsigned char cw[8]; | 73 | unsigned char cw[8]; |
| 74 | } ca_descr_t; | 74 | } ca_descr_t; |
| 75 | 75 | ||
| 76 | typedef struct ca_pid { | 76 | typedef struct ca_pid { |
| 77 | unsigned int pid; | 77 | unsigned int pid; |
| 78 | int index; /* -1 == disable*/ | 78 | int index; /* -1 == disable*/ |
| 79 | } ca_pid_t; | 79 | } ca_pid_t; |
| 80 | 80 | ||
| 81 | #define CA_RESET _IO('o', 128) | 81 | #define CA_RESET _IO('o', 128) |
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h index ce3f829da82c..263e9e19f772 100644 --- a/include/linux/dvb/dmx.h +++ b/include/linux/dvb/dmx.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * dmx.h | 2 | * dmx.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de> | 4 | * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de> |
| @@ -38,10 +38,10 @@ typedef enum | |||
| 38 | { | 38 | { |
| 39 | DMX_OUT_DECODER, /* Streaming directly to decoder. */ | 39 | DMX_OUT_DECODER, /* Streaming directly to decoder. */ |
| 40 | DMX_OUT_TAP, /* Output going to a memory buffer */ | 40 | DMX_OUT_TAP, /* Output going to a memory buffer */ |
| 41 | /* (to be retrieved via the read command).*/ | 41 | /* (to be retrieved via the read command).*/ |
| 42 | DMX_OUT_TS_TAP /* Output multiplexed into a new TS */ | 42 | DMX_OUT_TS_TAP /* Output multiplexed into a new TS */ |
| 43 | /* (to be retrieved by reading from the */ | 43 | /* (to be retrieved by reading from the */ |
| 44 | /* logical DVR device). */ | 44 | /* logical DVR device). */ |
| 45 | } dmx_output_t; | 45 | } dmx_output_t; |
| 46 | 46 | ||
| 47 | 47 | ||
| @@ -54,25 +54,25 @@ typedef enum | |||
| 54 | 54 | ||
| 55 | typedef enum | 55 | typedef enum |
| 56 | { | 56 | { |
| 57 | DMX_PES_AUDIO0, | 57 | DMX_PES_AUDIO0, |
| 58 | DMX_PES_VIDEO0, | 58 | DMX_PES_VIDEO0, |
| 59 | DMX_PES_TELETEXT0, | 59 | DMX_PES_TELETEXT0, |
| 60 | DMX_PES_SUBTITLE0, | 60 | DMX_PES_SUBTITLE0, |
| 61 | DMX_PES_PCR0, | 61 | DMX_PES_PCR0, |
| 62 | 62 | ||
| 63 | DMX_PES_AUDIO1, | 63 | DMX_PES_AUDIO1, |
| 64 | DMX_PES_VIDEO1, | 64 | DMX_PES_VIDEO1, |
| 65 | DMX_PES_TELETEXT1, | 65 | DMX_PES_TELETEXT1, |
| 66 | DMX_PES_SUBTITLE1, | ||
