qcacmn: Address compilation issues for WIN new fw headers

Address compilation issues for WIN with new Lithium Firmware headers.
Also removed dependency on htt.h from header files, which may need to
add explicit dependency on htt.h in .c files.

Change-Id: Ia5027963837e645bc3f81a3db98c2ea06789aea8
CRs-Fixed: 1061096

hif/inc/hif.h

@@ -68,6 +68,7 @@ typedef void *hif_handle_t;
  * moved to latest copy of fw common header files.
  */
 #ifdef CONFIG_WIN
+#if ENABLE_10_4_FW_HDR
 #define TARGET_TYPE_UNKNOWN   0
 #define TARGET_TYPE_AR6001    1
 #define TARGET_TYPE_AR6002    2
@@ -90,9 +91,10 @@ typedef void *hif_handle_t;
 #define TARGET_TYPE_AR6320V3    16
 /* For Tufello1.0 target_reg_tbl ID*/
 #define TARGET_TYPE_QCA9377V1   17
+#endif /* ENABLE_10_4_FW_HDR */
 /* For Adrastea target */
 #define TARGET_TYPE_ADRASTEA     19
-#endif
+#endif /* CONFIG_WIN */
 
 struct CE_state;
 #define CE_COUNT_MAX 12

hif/src/ce/ce_main.c

@@ -75,10 +75,12 @@ static int hif_post_recv_buffers_for_pipe(struct HIF_CE_pipe_info *pipe_info);
 #endif
 
 #ifdef CONFIG_WIN
+#if ENABLE_10_4_FW_HDR
 #define WDI_IPA_SERVICE_GROUP 5
 #define WDI_IPA_TX_SVC MAKE_SERVICE_ID(WDI_IPA_SERVICE_GROUP, 0)
 #define HTT_DATA2_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP, 1)
 #define HTT_DATA3_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP, 2)
+#endif /* ENABLE_10_4_FW_HDR */
 #endif
 
 static int hif_post_recv_buffers(struct hif_softc *scn);