From patchwork Tue Jun 2 08:55:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kholmanskikh X-Patchwork-Id: 6527621 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4B9DEC0020 for ; Tue, 2 Jun 2015 08:55:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E122204AB for ; Tue, 2 Jun 2015 08:55:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D0F4204A7 for ; Tue, 2 Jun 2015 08:55:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755550AbbFBIzc (ORCPT ); Tue, 2 Jun 2015 04:55:32 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:36441 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755085AbbFBIzW (ORCPT ); Tue, 2 Jun 2015 04:55:22 -0400 Received: by wibdq8 with SMTP id dq8so52171107wib.1; Tue, 02 Jun 2015 01:55:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EC0xcqO5xhEl2RwODUQE0Y+SNn2ctv9DR5zhaHmO3y4=; b=ORSTLMNOyhObqYDHySDKgUD4CJa8qiQDpamx2FC1Smxc2lsSztofMBuMu/ZbhqQbf8 b9xOuleIEaFmPhDDPsujU10NTJi/NTLY//Xq3QeKDw+z3jF4PH9PbnPR/JfVjEderIYK tap60ySK5YcNUW64aDCZBss0WsH3MsIgw/Yw4Oslv0Mz6f5EYXl1Kj1X2toz7Hoh01iR CAbscWwoBRrGhujxiK5e7gf8DPZvYDjzQS8oMq5eZ2qfQZEC+GKroJ5mExr6fOIP8jlb tribaLyhXwypD+dqLeF6H8Gd4XcfIl80cKd+qpe9EgxcsrfjZTevsYatOxBW6OcRp9wV fsJg== X-Received: by 10.195.11.168 with SMTP id ej8mr49431267wjd.150.1433235321206; Tue, 02 Jun 2015 01:55:21 -0700 (PDT) Received: from ubuntu-pc.ru.oracle.com (ukc1-proxy-mwg01-o.oracle.com. [144.24.20.226]) by mx.google.com with ESMTPSA id u7sm20521061wif.3.2015.06.02.01.55.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Jun 2015 01:55:20 -0700 (PDT) From: Stanislav Kholmanskikh To: gregkh@linuxfoundation.org, johnny.kim@atmel.com, rachel.kim@atmel.com, dean.lee@atmel.com, chris.park@atmel.com, devel@driverdev.osuosl.org Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Stanislav Kholmanskikh Subject: [PATCH v3 2/2] staging: wilc1000: Align enum members in coreconfigurator Date: Tue, 2 Jun 2015 12:55:07 +0400 Message-Id: <1433235307-13146-2-git-send-email-kholmanskikh.s.s@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433235307-13146-1-git-send-email-kholmanskikh.s.s@gmail.com> References: <1433235307-13146-1-git-send-email-kholmanskikh.s.s@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, UPPERCASE_50_75 autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Aligned enum members to follow a common style per enum. Signed-off-by: Stanislav Kholmanskikh --- drivers/staging/wilc1000/coreconfigurator.c | 29 +++++++------- drivers/staging/wilc1000/coreconfigurator.h | 62 ++++++++++++++--------------- 2 files changed, 46 insertions(+), 45 deletions(-) diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 43864dc..c55ed9d 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -40,11 +40,12 @@ /*****************************************************************************/ /* Basic Frame Type Codes (2-bit) */ -typedef enum {FRAME_TYPE_CONTROL = 0x04, - FRAME_TYPE_DATA = 0x08, - FRAME_TYPE_MANAGEMENT = 0x00, - FRAME_TYPE_RESERVED = 0x0C, - FRAME_TYPE_FORCE_32BIT = 0xFFFFFFFF +typedef enum { + FRAME_TYPE_CONTROL = 0x04, + FRAME_TYPE_DATA = 0x08, + FRAME_TYPE_MANAGEMENT = 0x00, + FRAME_TYPE_RESERVED = 0x0C, + FRAME_TYPE_FORCE_32BIT = 0xFFFFFFFF } tenuBasicFrmType; /* Frame Type and Subtype Codes (6-bit) */ @@ -188,7 +189,7 @@ static tstrWID gastrWIDs[] = { {WID_QOS_ENABLE, WID_CHAR}, {WID_11I_MODE, WID_CHAR}, {WID_CURRENT_TX_RATE, WID_CHAR}, - {WID_LINKSPEED, WID_CHAR}, + {WID_LINKSPEED, WID_CHAR}, {WID_RTS_THRESHOLD, WID_SHORT}, {WID_FRAG_THRESHOLD, WID_SHORT}, {WID_SSID, WID_STR}, @@ -223,14 +224,14 @@ static tstrWID gastrWIDs[] = { {WID_MEMORY_ACCESS_32BIT, WID_INT}, {WID_MEMORY_ACCESS_16BIT, WID_SHORT}, {WID_MEMORY_ACCESS_8BIT, WID_CHAR}, - {WID_SITE_SURVEY_RESULTS, WID_STR}, - {WID_PMKID_INFO, WID_STR}, - {WID_ASSOC_RES_INFO, WID_STR}, - {WID_MANUFACTURER, WID_STR}, /* 4 Wids added for the CAPI tool*/ - {WID_MODEL_NAME, WID_STR}, - {WID_MODEL_NUM, WID_STR}, - {WID_DEVICE_NAME, WID_STR}, - {WID_SSID_PROBE_REQ, WID_STR}, + {WID_SITE_SURVEY_RESULTS, WID_STR}, + {WID_PMKID_INFO, WID_STR}, + {WID_ASSOC_RES_INFO, WID_STR}, + {WID_MANUFACTURER, WID_STR}, /* 4 Wids added for the CAPI tool*/ + {WID_MODEL_NAME, WID_STR}, + {WID_MODEL_NUM, WID_STR}, + {WID_DEVICE_NAME, WID_STR}, + {WID_SSID_PROBE_REQ, WID_STR}, #ifdef MAC_802_11N {WID_11N_ENABLE, WID_CHAR}, diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 73cdbef..b8e5241 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -19,9 +19,9 @@ /*****************************************************************************/ /* Number of WID Options Supported */ #define NUM_BASIC_SWITCHES 45 -#define NUM_FHSS_SWITCHES 0 +#define NUM_FHSS_SWITCHES 0 -#define NUM_RSSI 5 +#define NUM_RSSI 5 #ifdef MAC_802_11N #define NUM_11N_BASIC_SWITCHES 25 @@ -51,14 +51,14 @@ extern WILC_Uint16 g_num_total_switches; #define MAX_PACKET_BUFF_SIZE 1596 -#define MAX_STRING_LEN 256 -#define MAX_SURVEY_RESULT_FRAG_SIZE MAX_STRING_LEN -#define SURVEY_RESULT_LENGTH 44 -#define MAX_ASSOC_RESP_FRAME_SIZE MAX_STRING_LEN +#define MAX_STRING_LEN 256 +#define MAX_SURVEY_RESULT_FRAG_SIZE MAX_STRING_LEN +#define SURVEY_RESULT_LENGTH 44 +#define MAX_ASSOC_RESP_FRAME_SIZE MAX_STRING_LEN -#define STATUS_MSG_LEN 12 -#define MAC_CONNECTED 1 -#define MAC_DISCONNECTED 0 +#define STATUS_MSG_LEN 12 +#define MAC_CONNECTED 1 +#define MAC_DISCONNECTED 0 @@ -327,10 +327,10 @@ typedef enum { WID_SUPP_PASSWORD = 0x3011, WID_SITE_SURVEY_RESULTS = 0x3012, WID_RX_POWER_LEVEL = 0x3013, - WID_MANUFACTURER = 0x3026, /*Added for CAPI tool */ - WID_MODEL_NAME = 0x3027, /*Added for CAPI tool */ - WID_MODEL_NUM = 0x3028, /*Added for CAPI tool */ - WID_DEVICE_NAME = 0x3029, /*Added for CAPI tool */ + WID_MANUFACTURER = 0x3026, /*Added for CAPI tool */ + WID_MODEL_NAME = 0x3027, /*Added for CAPI tool */ + WID_MODEL_NUM = 0x3028, /*Added for CAPI tool */ + WID_DEVICE_NAME = 0x3029, /*Added for CAPI tool */ WID_ASSOC_RES_INFO = 0x3020, @@ -362,9 +362,9 @@ typedef enum { WID_HUT_LOG_STATS = 0x4083, /*BugID_3746 WID to add IE to be added in next probe request*/ - WID_INFO_ELEMENT_PROBE = 0x4085, + WID_INFO_ELEMENT_PROBE = 0x4085, /*BugID_3746 WID to add IE to be added in next associate request*/ - WID_INFO_ELEMENT_ASSOCIATE = 0x4086, + WID_INFO_ELEMENT_ASSOCIATE = 0x4086, /* Miscellaneous WIDs */ WID_ALL = 0x7FFE, @@ -374,22 +374,22 @@ typedef enum { /* Status Codes for Authentication and Association Frames */ typedef enum { - SUCCESSFUL_STATUSCODE = 0, - UNSPEC_FAIL = 1, - UNSUP_CAP = 10, - REASOC_NO_ASOC = 11, - FAIL_OTHER = 12, - UNSUPT_ALG = 13, - AUTH_SEQ_FAIL = 14, - CHLNG_FAIL = 15, - AUTH_TIMEOUT = 16, - AP_FULL = 17, - UNSUP_RATE = 18, - SHORT_PREAMBLE_UNSUP = 19, - PBCC_UNSUP = 20, - CHANNEL_AGIL_UNSUP = 21, - SHORT_SLOT_UNSUP = 25, - OFDM_DSSS_UNSUP = 26, + SUCCESSFUL_STATUSCODE = 0, + UNSPEC_FAIL = 1, + UNSUP_CAP = 10, + REASOC_NO_ASOC = 11, + FAIL_OTHER = 12, + UNSUPT_ALG = 13, + AUTH_SEQ_FAIL = 14, + CHLNG_FAIL = 15, + AUTH_TIMEOUT = 16, + AP_FULL = 17, + UNSUP_RATE = 18, + SHORT_PREAMBLE_UNSUP = 19, + PBCC_UNSUP = 20, + CHANNEL_AGIL_UNSUP = 21, + SHORT_SLOT_UNSUP = 25, + OFDM_DSSS_UNSUP = 26, CONNECT_STS_FORCE_16_BIT = 0xFFFF } tenuConnectSts;