diff options
| -rw-r--r-- | drivers/staging/wilc1000/wilc_msgqueue.c | 9 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_msgqueue.h | 30 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_osconfig.h | 3 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_oswrapper.h | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_platform.h | 12 |
5 files changed, 0 insertions, 56 deletions
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c index c1d0dabed479..1113092398d1 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.c +++ b/drivers/staging/wilc1000/wilc_msgqueue.c @@ -1,8 +1,6 @@ #include "wilc_oswrapper.h" #include <linux/spinlock.h> -#ifdef CONFIG_WILC_MSG_QUEUE_FEATURE - /*! * @author syounan @@ -154,11 +152,6 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle, spin_unlock_irqrestore(&pHandle->strCriticalSection, flags); WILC_SemaphoreFillDefault(&strSemAttrs); - #ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT - if (pstrAttrs != WILC_NULL) { - strSemAttrs.u32TimeOut = pstrAttrs->u32Timeout; - } - #endif s32RetStatus = WILC_SemaphoreAcquire(&(pHandle->hSem), &strSemAttrs); if (s32RetStatus == WILC_TIMEOUT) { /* timed out, just exit without consumeing the message */ @@ -207,5 +200,3 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle, return s32RetStatus; } - -#endif diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h b/drivers/staging/wilc1000/wilc_msgqueue.h index a48be533aad9..84157368335d 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.h +++ b/drivers/staging/wilc1000/wilc_msgqueue.h @@ -10,10 +10,6 @@ * @version 1.0 */ -#ifndef CONFIG_WILC_MSG_QUEUE_FEATURE -#error the feature CONFIG_WILC_MSG_QUEUE_FEATURE must be supported to include this file -#endif - /*! * @struct tstrWILC_MsgQueueAttrs * @brief Message Queue API options @@ -22,38 +18,12 @@ * @version 1.0 */ typedef struct { - #ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME - WILC_Char *pcName; - #endif - - #ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT - WILC_Uint32 u32Timeout; - #endif - /* a dummy member to avoid compiler errors*/ WILC_Uint8 dummy; } tstrWILC_MsgQueueAttrs; /*! - * @brief Fills the MsgQueueAttrs with default parameters - * @param[out] pstrAttrs structure to be filled - * @sa WILC_TimerAttrs - * @author syounan - * @date 30 Aug 2010 - * @version 1.0 - */ -static void WILC_MsgQueueFillDefault(tstrWILC_MsgQueueAttrs *pstrAttrs) -{ - #ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME - pstrAttrs->pcName = WILC_NULL; - #endif - - #ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT - pstrAttrs->u32Timeout = WILC_OS_INFINITY; - #endif -} -/*! * @brief Creates a new Message queue * @details Creates a new Message queue, if the feature * CONFIG_WILC_MSG_QUEUE_IPC_NAME is enabled and pstrAttrs->pcName diff --git a/drivers/staging/wilc1000/wilc_osconfig.h b/drivers/staging/wilc1000/wilc_osconfig.h index f18615e09400..d89864c7697c 100644 --- a/drivers/staging/wilc1000/wilc_osconfig.h +++ b/drivers/staging/wilc1000/wilc_osconfig.h @@ -20,9 +20,6 @@ /* #define CONFIG_WILC_MEMORY_POOLS 1 */ /* #define CONFIG_WILC_MEMORY_DEBUG 1 */ /* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */ -#define CONFIG_WILC_MSG_QUEUE_FEATURE -/* #define CONFIG_WILC_MSG_QUEUE_IPC_NAME */ -/* #define CONFIG_WILC_MSG_QUEUE_TIMEOUT */ /* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */ /* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */ /* #define CONFIG_WILC_FILE_OPERATIONS_PATH_API */ diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h index c4e97ae03ae0..8b4c3dced981 100644 --- a/drivers/staging/wilc1000/wilc_oswrapper.h +++ b/drivers/staging/wilc1000/wilc_oswrapper.h @@ -78,9 +78,7 @@ typedef WILC_Uint16 WILC_WideChar; #include "wilc_strutils.h" /* Message Queue */ -#ifdef CONFIG_WILC_MSG_QUEUE_FEATURE #include "wilc_msgqueue.h" -#endif /* File operations */ #ifdef CONFIG_WILC_FILE_OPERATIONS_FEATURE diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h index b20bbb839e5a..2f6484989565 100644 --- a/drivers/staging/wilc1000/wilc_platform.h +++ b/drivers/staging/wilc1000/wilc_platform.h @@ -50,18 +50,6 @@ #error This feature is not supported by this OS #endif -/* CONFIG_WILC_MSG_QUEUE_FEATURE is implemented */ - -/* remove the following block when implementing its feature */ -#ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME -#error This feature is not supported by this OS -#endif - -/* remove the following block when implementing its feature */ -/*#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT - * #error This feature is not supported by this OS - #endif*/ - /* CONFIG_WILC_FILE_OPERATIONS_FEATURE is implemented */ /* CONFIG_WILC_FILE_OPERATIONS_STRING_API is implemented */ |