diff options
author | Lior Dotan <liodot@gmail.com> | 2010-05-18 05:46:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-18 17:53:17 -0400 |
commit | abfc768d9e374dc30b98206aff99d790e36d06dd (patch) | |
tree | b4c86ca1f65886bb8b44a9a51dfcf1c8f622f06b /drivers/staging/crystalhd/crystalhd_fw_if.h | |
parent | 973267a212a6f28c26cbb7929a7ffdd963c16861 (diff) |
Staging: crystalhd: Remove typedefs from driver
Remove typedefs from driver
Signed-of-by: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/crystalhd/crystalhd_fw_if.h')
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_fw_if.h | 60 |
1 files changed, 27 insertions, 33 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_fw_if.h b/drivers/staging/crystalhd/crystalhd_fw_if.h index 261cd19a0ee..77560d4b680 100644 --- a/drivers/staging/crystalhd/crystalhd_fw_if.h +++ b/drivers/staging/crystalhd/crystalhd_fw_if.h | |||
@@ -29,21 +29,17 @@ | |||
29 | 29 | ||
30 | /* TBD: Pull in only required defs into this file.. */ | 30 | /* TBD: Pull in only required defs into this file.. */ |
31 | 31 | ||
32 | |||
33 | |||
34 | /* User Data Header */ | 32 | /* User Data Header */ |
35 | typedef struct user_data { | 33 | struct user_data { |
36 | struct user_data *next; | 34 | struct user_data *next; |
37 | uint32_t type; | 35 | uint32_t type; |
38 | uint32_t size; | 36 | uint32_t size; |
39 | } UD_HDR; | 37 | }; |
40 | |||
41 | |||
42 | 38 | ||
43 | /*------------------------------------------------------* | 39 | /*------------------------------------------------------* |
44 | * MPEG Extension to the PPB * | 40 | * MPEG Extension to the PPB * |
45 | *------------------------------------------------------*/ | 41 | *------------------------------------------------------*/ |
46 | typedef struct { | 42 | struct ppb_mpeg { |
47 | uint32_t to_be_defined; | 43 | uint32_t to_be_defined; |
48 | uint32_t valid; | 44 | uint32_t valid; |
49 | 45 | ||
@@ -61,15 +57,15 @@ typedef struct { | |||
61 | /* MPEG_VALID_USERDATA | 57 | /* MPEG_VALID_USERDATA |
62 | User data is in the form of a linked list. */ | 58 | User data is in the form of a linked list. */ |
63 | int32_t userDataSize; | 59 | int32_t userDataSize; |
64 | UD_HDR *userData; | 60 | struct user_data *userData; |
65 | 61 | ||
66 | } PPB_MPEG; | 62 | }; |
67 | 63 | ||
68 | 64 | ||
69 | /*------------------------------------------------------* | 65 | /*------------------------------------------------------* |
70 | * VC1 Extension to the PPB * | 66 | * VC1 Extension to the PPB * |
71 | *------------------------------------------------------*/ | 67 | *------------------------------------------------------*/ |
72 | typedef struct { | 68 | struct ppb_vc1 { |
73 | uint32_t to_be_defined; | 69 | uint32_t to_be_defined; |
74 | uint32_t valid; | 70 | uint32_t valid; |
75 | 71 | ||
@@ -88,9 +84,9 @@ typedef struct { | |||
88 | /* VC1_VALID_USERDATA | 84 | /* VC1_VALID_USERDATA |
89 | User data is in the form of a linked list. */ | 85 | User data is in the form of a linked list. */ |
90 | int32_t userDataSize; | 86 | int32_t userDataSize; |
91 | UD_HDR *userData; | 87 | struct user_data *userData; |
92 | 88 | ||
93 | } PPB_VC1; | 89 | }; |
94 | 90 | ||
95 | /*------------------------------------------------------* | 91 | /*------------------------------------------------------* |
96 | * H.264 Extension to the PPB * | 92 | * H.264 Extension to the PPB * |
@@ -108,8 +104,8 @@ typedef struct { | |||
108 | /* maximum number of intervals(as many as 256 intervals?) */ | 104 | /* maximum number of intervals(as many as 256 intervals?) */ |
109 | #define MAX_FGT_VALUE_INTERVAL (256) | 105 | #define MAX_FGT_VALUE_INTERVAL (256) |
110 | 106 | ||
111 | typedef struct FGT_SEI { | 107 | struct fgt_sei { |
112 | struct FGT_SEI *next; | 108 | struct fgt_sei *next; |
113 | unsigned char model_values[3][MAX_FGT_VALUE_INTERVAL][MAX_FGT_MODEL_VALUE]; | 109 | unsigned char model_values[3][MAX_FGT_VALUE_INTERVAL][MAX_FGT_MODEL_VALUE]; |
114 | unsigned char upper_bound[3][MAX_FGT_VALUE_INTERVAL]; | 110 | unsigned char upper_bound[3][MAX_FGT_VALUE_INTERVAL]; |
115 | unsigned char lower_bound[3][MAX_FGT_VALUE_INTERVAL]; | 111 | unsigned char lower_bound[3][MAX_FGT_VALUE_INTERVAL]; |
@@ -134,9 +130,9 @@ typedef struct FGT_SEI { | |||
134 | unsigned char num_model_values[3]; /* Number of model values. */ | 130 | unsigned char num_model_values[3]; /* Number of model values. */ |
135 | uint16_t repetition_period; /* Repetition period (0-16384) */ | 131 | uint16_t repetition_period; /* Repetition period (0-16384) */ |
136 | 132 | ||
137 | } FGT_SEI; | 133 | }; |
138 | 134 | ||
139 | typedef struct { | 135 | struct ppb_h264 { |
140 | /* 'valid' specifies which fields (or sets of | 136 | /* 'valid' specifies which fields (or sets of |
141 | * fields) below are valid. If the corresponding | 137 | * fields) below are valid. If the corresponding |
142 | * bit in 'valid' is NOT set then that field(s) | 138 | * bit in 'valid' is NOT set then that field(s) |
@@ -170,14 +166,14 @@ typedef struct { | |||
170 | 166 | ||
171 | /* H264_VALID_USER */ | 167 | /* H264_VALID_USER */ |
172 | uint32_t user_data_size; | 168 | uint32_t user_data_size; |
173 | UD_HDR *user_data; | 169 | struct user_data *user_data; |
174 | 170 | ||
175 | /* H264 VALID FGT */ | 171 | /* H264 VALID FGT */ |
176 | FGT_SEI *pfgt; | 172 | struct fgt_sei *pfgt; |
177 | 173 | ||
178 | } PPB_H264; | 174 | }; |
179 | 175 | ||
180 | typedef struct { | 176 | struct ppb { |
181 | /* Common fields. */ | 177 | /* Common fields. */ |
182 | uint32_t picture_number; /* Ordinal display number */ | 178 | uint32_t picture_number; /* Ordinal display number */ |
183 | uint32_t video_buffer; /* Video (picbuf) number */ | 179 | uint32_t video_buffer; /* Video (picbuf) number */ |
@@ -215,14 +211,14 @@ typedef struct { | |||
215 | 211 | ||
216 | /* Protocol-specific extensions. */ | 212 | /* Protocol-specific extensions. */ |
217 | union { | 213 | union { |
218 | PPB_H264 h264; | 214 | struct ppb_h264 h264; |
219 | PPB_MPEG mpeg; | 215 | struct ppb_mpeg mpeg; |
220 | PPB_VC1 vc1; | 216 | struct ppb_vc1 vc1; |
221 | } other; | 217 | } other; |
222 | 218 | ||
223 | } PPB; | 219 | }; |
224 | 220 | ||
225 | typedef struct { | 221 | struct c011_pib { |
226 | uint32_t bFormatChange; | 222 | uint32_t bFormatChange; |
227 | uint32_t resolution; | 223 | uint32_t resolution; |
228 | uint32_t channelId; | 224 | uint32_t channelId; |
@@ -231,13 +227,11 @@ typedef struct { | |||
231 | uint32_t zeroPanscanValid; | 227 | uint32_t zeroPanscanValid; |
232 | uint32_t dramOutBufAddr; | 228 | uint32_t dramOutBufAddr; |
233 | uint32_t yComponent; | 229 | uint32_t yComponent; |
234 | PPB ppb; | 230 | struct ppb ppb; |
235 | |||
236 | } C011_PIB; | ||
237 | |||
238 | 231 | ||
232 | }; | ||
239 | 233 | ||
240 | typedef struct { | 234 | struct dec_rsp_channel_start_video { |
241 | uint32_t command; | 235 | uint32_t command; |
242 | uint32_t sequence; | 236 | uint32_t sequence; |
243 | uint32_t status; | 237 | uint32_t status; |
@@ -251,12 +245,12 @@ typedef struct { | |||
251 | uint32_t transportStreamCaptureAddr; | 245 | uint32_t transportStreamCaptureAddr; |
252 | uint32_t asyncEventQ; | 246 | uint32_t asyncEventQ; |
253 | 247 | ||
254 | } DecRspChannelStartVideo; | 248 | }; |
255 | 249 | ||
256 | #define eCMD_C011_CMD_BASE (0x73763000) | 250 | #define eCMD_C011_CMD_BASE (0x73763000) |
257 | 251 | ||
258 | /* host commands */ | 252 | /* host commands */ |
259 | typedef enum { | 253 | enum c011_ts_cmd { |
260 | eCMD_TS_GET_NEXT_PIC = 0x7376F100, /* debug get next picture */ | 254 | eCMD_TS_GET_NEXT_PIC = 0x7376F100, /* debug get next picture */ |
261 | eCMD_TS_GET_LAST_PIC = 0x7376F102, /* debug get last pic status */ | 255 | eCMD_TS_GET_LAST_PIC = 0x7376F102, /* debug get last pic status */ |
262 | eCMD_TS_READ_WRITE_MEM = 0x7376F104, /* debug read write memory */ | 256 | eCMD_TS_READ_WRITE_MEM = 0x7376F104, /* debug read write memory */ |
@@ -364,6 +358,6 @@ typedef enum { | |||
364 | 358 | ||
365 | eNOTIFY_C011_ENC_CHAN_EVENT = eCMD_C011_CMD_BASE + 0x210, | 359 | eNOTIFY_C011_ENC_CHAN_EVENT = eCMD_C011_CMD_BASE + 0x210, |
366 | 360 | ||
367 | } eC011_TS_CMD; | 361 | }; |
368 | 362 | ||
369 | #endif | 363 | #endif |