Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[pandora-kernel.git] / drivers / staging / crystalhd / crystalhd_fw_if.h

diff --git a/drivers/staging/crystalhd/crystalhd_fw_if.h b/drivers/staging/crystalhd/crystalhd_fw_if.h
index 261cd19..77560d4 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_fw_if.h
+++ b/drivers/staging/crystalhd/crystalhd_fw_if.h
@@ -29,21 +29,17 @@
 
 /* TBD: Pull in only required defs into this file.. */
 
-
-
 /* User Data Header */
-typedef struct user_data {
+struct user_data {
    struct user_data    *next;
    uint32_t            type;
    uint32_t            size;
-} UD_HDR;
-
-
+};
 
 /*------------------------------------------------------*
  *    MPEG Extension to the PPB                         *
  *------------------------------------------------------*/
-typedef struct {
+struct ppb_mpeg {
    uint32_t            to_be_defined;
    uint32_t            valid;
 
@@ -61,15 +57,15 @@ typedef struct {
    /* MPEG_VALID_USERDATA
       User data is in the form of a linked list. */
    int32_t             userDataSize;
-   UD_HDR              *userData;
+   struct user_data    *userData;
 
-} PPB_MPEG;
+};
 
 
 /*------------------------------------------------------*
  *    VC1 Extension to the PPB                   *
  *------------------------------------------------------*/
-typedef struct {
+struct ppb_vc1 {
    uint32_t            to_be_defined;
    uint32_t            valid;
 
@@ -88,9 +84,9 @@ typedef struct {
    /* VC1_VALID_USERDATA
       User data is in the form of a linked list. */
    int32_t             userDataSize;
-   UD_HDR              *userData;
+   struct user_data    *userData;
 
-} PPB_VC1;
+};
 
 /*------------------------------------------------------*
  *    H.264 Extension to the PPB                       *
@@ -108,8 +104,8 @@ typedef struct {
 /* maximum number of intervals(as many as 256 intervals?) */
 #define MAX_FGT_VALUE_INTERVAL (256)
 
-typedef struct FGT_SEI {
-    struct FGT_SEI *next;
+struct fgt_sei {
+    struct fgt_sei *next;
     unsigned char model_values[3][MAX_FGT_VALUE_INTERVAL][MAX_FGT_MODEL_VALUE];
     unsigned char upper_bound[3][MAX_FGT_VALUE_INTERVAL];
     unsigned char lower_bound[3][MAX_FGT_VALUE_INTERVAL];
@@ -134,9 +130,9 @@ typedef struct FGT_SEI {
     unsigned char num_model_values[3]; /* Number of model values. */
     uint16_t      repetition_period;   /* Repetition period (0-16384) */
 
-} FGT_SEI;
+};
 
-typedef struct {
+struct ppb_h264 {
    /* 'valid' specifies which fields (or sets of
     * fields) below are valid.  If the corresponding
     * bit in 'valid' is NOT set then that field(s)
@@ -170,14 +166,14 @@ typedef struct {
 
    /* H264_VALID_USER */
    uint32_t            user_data_size;
-   UD_HDR              *user_data;
+   struct user_data    *user_data;
 
    /* H264 VALID FGT */
-   FGT_SEI             *pfgt;
+   struct fgt_sei      *pfgt;
 
-} PPB_H264;
+};
 
-typedef struct {
+struct ppb {
    /* Common fields. */
    uint32_t    picture_number; /* Ordinal display number */
    uint32_t    video_buffer;   /* Video (picbuf) number */
@@ -215,14 +211,14 @@ typedef struct {
 
    /* Protocol-specific extensions. */
    union {
-      PPB_H264 h264;
-      PPB_MPEG mpeg;
-      PPB_VC1   vc1;
+      struct ppb_h264  h264;
+      struct ppb_mpeg  mpeg;
+      struct ppb_vc1    vc1;
    } other;
 
-} PPB;
+};
 
-typedef struct {
+struct c011_pib {
    uint32_t    bFormatChange;
    uint32_t    resolution;
    uint32_t    channelId;
@@ -231,13 +227,11 @@ typedef struct {
    uint32_t    zeroPanscanValid;
    uint32_t    dramOutBufAddr;
    uint32_t    yComponent;
-   PPB                 ppb;
-
-} C011_PIB;
-
+   struct ppb  ppb;
 
+};
 
-typedef struct {
+struct dec_rsp_channel_start_video {
     uint32_t   command;
     uint32_t   sequence;
     uint32_t   status;
@@ -251,12 +245,12 @@ typedef struct {
     uint32_t   transportStreamCaptureAddr;
     uint32_t   asyncEventQ;
 
-} DecRspChannelStartVideo;
+};
 
 #define eCMD_C011_CMD_BASE       (0x73763000)
 
 /* host commands */
-typedef enum {
+enum  c011_ts_cmd {
     eCMD_TS_GET_NEXT_PIC       = 0x7376F100, /* debug get next picture */
     eCMD_TS_GET_LAST_PIC       = 0x7376F102, /* debug get last pic status */
     eCMD_TS_READ_WRITE_MEM     = 0x7376F104, /* debug read write memory */
@@ -364,6 +358,6 @@ typedef enum {
 
     eNOTIFY_C011_ENC_CHAN_EVENT                = eCMD_C011_CMD_BASE + 0x210,
 
-} eC011_TS_CMD;
+};
 
 #endif