samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: CONFIG_WIN Macros to be moved out of HIF/HTC

Browse Source 
Remove CONFIG_WIN from HIF and HTC module

Change-Id: If5001a16047f802b077e6cd9b211a912df5ca55e
CRs-Fixed: 2349905
This commit is contained in:
Akshay Kosigi
2019-04-08 17:50:05 +05:30
committed by nshrivas
parent 03c409d4a2
commit af98d7cbbe
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hif/configs/ap_hif.config
View File

@@ -1 +1,3 @@
EXTRA_CFLAGS += -DQCA_NAPI_DEF_SCALE_BIN_SHIFT=1 EXTRA_CFLAGS += -DQCA_NAPI_DEF_SCALE_BIN_SHIFT=1
EXTRA_CFLAGS += -DHIF_MAX_GROUP=12
EXTRA_CFLAGS += -DHTC_MSG_NACK_SUSPEND=7

4
hif/inc/hif.h
View File

@@ -114,9 +114,7 @@ struct CE_state;
#define CE_COUNT_MAX 12 #define CE_COUNT_MAX 12
#define HIF_MAX_GRP_IRQ 16 #define HIF_MAX_GRP_IRQ 16
#ifdef CONFIG_WIN #ifndef HIF_MAX_GROUP
#define HIF_MAX_GROUP 12
#else
#define HIF_MAX_GROUP 8 #define HIF_MAX_GROUP 8
#endif #endif

6
hif/src/ce/ce_main.c
View File

@@ -1279,7 +1279,7 @@ void free_mem_ce_debug_hist_data(struct hif_softc *scn, uint32_t ce_id)
} }
#endif /* HIF_CE_DEBUG_DATA_BUF */ #endif /* HIF_CE_DEBUG_DATA_BUF */
#if defined(CONFIG_MCL) #ifndef HIF_CE_DEBUG_DATA_DYNAMIC_BUF
#if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF) #if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF)
struct hif_ce_desc_event hif_ce_desc_history[CE_COUNT_MAX][HIF_CE_HISTORY_MAX]; struct hif_ce_desc_event hif_ce_desc_history[CE_COUNT_MAX][HIF_CE_HISTORY_MAX];
@@ -1336,7 +1336,7 @@ alloc_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id,
static inline void static inline void
free_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id) { } free_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id) { }
#endif /* (HIF_CONFIG_SLUB_DEBUG_ON) || (HIF_CE_DEBUG_DATA_BUF) */ #endif /* (HIF_CONFIG_SLUB_DEBUG_ON) || (HIF_CE_DEBUG_DATA_BUF) */
#elif defined(CONFIG_WIN) #else
#if defined(HIF_CE_DEBUG_DATA_BUF) #if defined(HIF_CE_DEBUG_DATA_BUF)
static QDF_STATUS static QDF_STATUS
@@ -1385,7 +1385,7 @@ alloc_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id,
static inline void static inline void
free_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id) { } free_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id) { }
#endif /* HIF_CE_DEBUG_DATA_BUF */ #endif /* HIF_CE_DEBUG_DATA_BUF */
#endif /* CONFIG_MCL */ #endif /* HIF_CE_DEBUG_DATA_DYNAMIC_BUF */
#if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF) #if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF)
/** /**

4
htc/htc_recv.c
View File

@@ -229,10 +229,6 @@ _failed:
} }
#endif #endif
#ifdef CONFIG_WIN
#define HTC_MSG_NACK_SUSPEND 7
#endif
QDF_STATUS htc_rx_completion_handler(void *Context, qdf_nbuf_t netbuf, QDF_STATUS htc_rx_completion_handler(void *Context, qdf_nbuf_t netbuf,
uint8_t pipeID) uint8_t pipeID)
{ {