ccdev33[73]$ diff ./middleware/gandalf/include/stdhal.h /vobs/src_tree/app/include/stdhal.h
84a85
>    ,HAL_DESCRAMBLER                         /*mem to mem DVB descrambler     */
198,199c199,202
<    HAL_FILL,                                /* osd                           */
<    HAL_OFFSCREEN_CREATE,                    /* osd                           */
---
>    HAL_DESCRAMBLE,                          /* memory to memory DVB descrmbling*/
>    HAL_CHKLOCK,                             /* tuner                         */
>    HAL_PLAY_IP_START,
>    HAL_PLAY_IP_STOP,
235c238,240
<    HAL_ERR_MODEM
---
>    HAL_ERR_MODEM,
>    HAL_DEMOD_NOT_RUN,
>    HAL_DEMOD_BUSY
644,649d648
< #ifdef MODEL_VIP612
<  /*Following definition is needed as ST's HAL uses them.*/
<  #define HAL_PLAY_DECODE_MPEG4 1
<  #define HAL_PLAY_DECODE_MPEG2 0
< #endif /*MODEL_VIP612*/
<
665,666d663
< #define BAND_A (0x0A) /* value returned by remote.c */
< #define BAND_B (0x0B)
671c668
< #ifndef SINGLE_DECODE_MODE
---
> #if (MAX_USERS > 1)
672a670
> #endif /* #if (MAX_USERS > 1) */
675,676c673,674
< #endif // MULTI_FREQ_REMOTE
< #endif /* SINGLE_DECODE_MODE */
---
> #endif /* MULTI_FREQ_REMOTE */
>
710,715d707
< #define HAL_SIGNAL_SCALE_143 (143)
< #define HAL_SIGNAL_SCALE_142 (142)
< #define HAL_SIGNAL_SCALE_140 (140)
< #define HAL_SIGNAL_SCALE_136 (136)
< #define HAL_SIGNAL_SCALE_135 (135)
< #define HAL_SIGNAL_SCALE_133 (133)
822c814
< #ifdef SINGLE_USER_MODE
---
> #ifdef PIP_SUPPORT
833c825
< #endif /* SINGLE_USER_MODE */
---
> #endif //PIP_SUPPORT
981a974,977
> #ifdef CHK_LOCKBITS
>  typedef BOOLEAN HAL_LOCKSTATE;
> #endif /* CHK_LOCKBITS */
>
983a980,982
> typedef UINT16 HAL_DESCRAMBLER_HANDLE;
>
>
1074d1072
<
1094c1092
< #define NULL_SECTION_SIZE (0)
---
> #define EMPTY_SECTION_SIZE (0)
1117a1116
>    HAL_FLASH_OFFSET  offset;
1347c1346
<   #ifdef SINGLE_USER_MODE
---
>   #ifdef PIP_SUPPORT
1349c1348
<   #endif /* SINGLE_USER_MODE */
---
>   #endif //PIP_SUPPORT
1513,1516c1512,1515
< #ifdef PGUP_PGDN_KEY_FOR_ASPECT_RATIO
< #define HD_OUTPUT 0  /**< used for tv_mode in HAL_PLAY_DISPLAY_INFO - output is HD */
< #define SD_OUTPUT 1  /**< used for tv_mode in HAL_PLAY_DISPLAY_INFO - output is SD */
< #endif /* PGUP_PGDN_KEY_FOR_ASPECT_RATIO */
---
> #ifdef DUAL_AR_SUPPORT
> #define HD_OUTPUT 0
> #define SD_OUTPUT 1
> #endif /* DUAL_AR_SUPPORT */
1525,1527c1524,1526
<   #ifdef PGUP_PGDN_KEY_FOR_ASPECT_RATIO
<    UINT8                tv_mode;  /**< used to help determine upon which output to perform zoom modes */
<   #endif /* PGUP_PGDN_KEY_FOR_ASPECT_RATIO */
---
>   #ifdef DUAL_AR_SUPPORT
>    UINT8                tv_mode;
>   #endif /* DUAL_AR_SUPPORT */
1751a1751,1776
> /***************************** DVB descrmbler structures **********************/
> /*Note: Currently VIP612 only using this hal DECRAMBLER descriptor. This descriptor
>  *will be used for memory to memory dvb descrambling. Please refer HAL vendor spec
>  *1.54 or above for more details.
>  */
> typedef struct
> {
>     HAL_PLAY_KEYS even_key;
>     HAL_PLAY_KEYS odd_key;
> }HAL_DESCRAMBLER_KEYS;
>
> typedef struct
> {
>     HAL_DESCRAMBLER_HANDLE handle;
>     HAL_DESCRAMBLER_KEYS   *cw_keys;
> }HAL_DESCRAMBLER_CTRL;
>
> typedef struct
> {
>     unsigned long  src_phys_addr;
>     unsigned long  dest_phys_addr;
>     unsigned int   length;
>     HAL_DESCRAMBLER_HANDLE handle;
> } HAL_DESCRAMBLER_DATA_INFO;
>
>
1911a1937,1943
> #ifdef CHK_LOCKBITS
>  typedef struct
>  {
>     HAL_TUNERS     tuner;
>     HAL_LOCKSTATE  lockstate;
>  } HAL_TUNER_LOCKSTATE;
> #endif /* CHK_LOCKBITS */
1918c1950,1956
<
---
> /**
>  *  This Corresponds to the actual number of CC devices supported by a
>  *  specific platforms.  For certain STBs, like the VIP612/VIP211, there
>  *  is only a single output device (the main with no PIP at all).  For
>  *  certain STBs like the VIP622/VIP422, there are two independent
>  *  output devices, and hence more than 1 CC device.
>  */
1921a1960
>  #if (MAX_USERS > 1)
1922a1962,1963
>  #endif /* MAX_USERS > 1 */
>
2024c2065
< #if defined(MODEL_DP962) || defined(MODEL_DP922)
---
> #if defined(MODEL_DP962) || defined(MODEL_DP922) || defined(MODEL_DP411)
2110a2152,2166
> /***************************** HDCP ****************************************/
>  typedef struct
>  {
>     UINT8      ksv[5];        // Tx Key Selection Vector
>     UINT8      ksv_pad[3];    // Zero padding
>     UINT8      keys[1120];    // Encrypted Hdcp Tx Keys
>     UINT8      checksum[20];  // Checksum to insure validity
>  } HAL_HDMI_HDCP_KEYBLOCK;
>
>  typedef struct
>  {
>        HAL_HDMI_HDCP_KEYBLOCK hdcp_keyblock;
>        UINT32                 *hdcp_iv;   /*hdcp_iv is only used in ST hal*/
>  }HAL_HDMI_HDCP_KEY_CTRL;
>
2216a2273,2285
>   #ifdef SERVICE_MODE_SUPPORT
>    ,
>    HAL_TUNER_NONE,
>    HAL_PHILIPS_TD1336_BCM3520,
>    HAL_LG_TDVEHD52F_BCM3520,
>    HAL_SAMSUNG_DTVS223CH301B_BCM3520,
>    HAL_RF4400,
>    HAL_THOMSON_DTT7605,
>    HAL_THOMSON_DTT7605A,
>    HAL_THOMSON_DTT7605BC,
>    HAL_THOMSON_DTT76610_STV0372_MC44BC375,
>    HAL_THOMSON_DTT76600_STV0372_MC44BC375
>   #endif
2224a2294
>
2245a2316,2337
> /* AV over IP structures */
> typedef enum
> {
>    HAL_PLAY_IP_UDP   = 0,
>    HAL_PLAY_IP_RTP   = 1,
>    HAL_PLAY_IP_DTCP  = 2,
> } HAL_PLAY_IP_OUTPUT_TYPE;
>
> typedef struct
> {
>    HAL_PLAY_HANDLE            handle;
>    UINT32                     ip_address;
>    UINT16                     ip_port;
>    HAL_PLAY_IP_OUTPUT_TYPE    output_type;
> } HAL_PLAY_IP_START_ARG;
>
> typedef struct
> {
>    HAL_PLAY_HANDLE handle;
> } HAL_PLAY_IP_STOP_ARG;
>
>
2333,2337d2424
<
< #ifdef OLD_HAL_RW
< HAL_SIZE   hal_read    ( HAL_DESC, HAL_BUFR, HAL_SIZE );
< HAL_SIZE   hal_write   ( HAL_DESC, HAL_BUFR, HAL_SIZE );
< #else
2340c2427,2428
< #endif // OLD_HAL_RW
---
>
>