From patchwork Mon Feb 19 13:19:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 10227845 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4082E60392 for ; Mon, 19 Feb 2018 13:31:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30B5D28687 for ; Mon, 19 Feb 2018 13:31:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2595D28770; Mon, 19 Feb 2018 13:31:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B688028687 for ; Mon, 19 Feb 2018 13:31:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbeBSNbN (ORCPT ); Mon, 19 Feb 2018 08:31:13 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:44099 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752737AbeBSNbK (ORCPT ); Mon, 19 Feb 2018 08:31:10 -0500 Received: by mail-pf0-f193.google.com with SMTP id 17so2147577pfw.11; Mon, 19 Feb 2018 05:31:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LN8Aha8cXnZ64/u34PtE+OWal+/as61xDKCJ8oFACWw=; b=D1Vv+U4bD0AD0mKJt+mBm4nK0xBHVCPaADw5TTV0jbYDLNaMfbeCDtWko//b+SkAo9 gWed/UyV5diuI8eEZ21L7IGUBqlFjNe8nUCh/lAGtJcG8cILSE7V6Uc3AIl/zHiRQ1// F05pPsESWKCaIuHx3qlhw6DMl3G8R98Rteqa5OVM88Lne0A74Tka20O7DLeLt03PVEQt sPbuOUQF3HvBl8zcG9fITi7QCwZ7EqBwzRpZ5BKAvNmFycR3Fo/1mK9YeN7h9jbqPhBZ +piqIvIEz7bAWBVcWkp7lBPbjpjHunfGduHTduhYusaV8tffjNG9ufhxa/ctK874Qzs8 M0fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LN8Aha8cXnZ64/u34PtE+OWal+/as61xDKCJ8oFACWw=; b=LUKl/hhChKIQrkXSRzbu7aRN23X8u7T76j2rvYj8fdDvxxz+MFmIlQSca9zDBYMqPx cTn4iP6dYVZ1k3XVdu8XJfH7y17pZO3vsM9ufqCVpv+yDk0rJdHl/cW3ETvkwTSx63D+ sZd81E/JWeI/Hu0QMn+lv0pJzb8tH/qq5SqtsRo/7pdMZc58RE7vCGXJ3utUsg7DtpUZ 2FFREDGU/Pbq47mAjMn1n0ju67CnpikyzCQVdNcLyLcCtHTKSMzWO3gbsvWp41Qq9otX sM+XP3B5EE/47m1V33IRrWhiqLNHW6Ywe4wd6XsbkPvPULaiQ+oFssa1uOmWcMtEsjbN +NZw== X-Gm-Message-State: APf1xPDmRE87IABI3kdgCn6iInTe0hExJm167rqBn42KjSQllbtvj02T U7X7n6cVMTdfDRx5++3XtnY= X-Google-Smtp-Source: AH8x225VFIzWLIU0X0RyUK+CUItgYv5VAv578lJ0y8e04JpYtIYnPxJ0PlqDEaYm/lCZ4EtlJqoTBA== X-Received: by 10.98.103.69 with SMTP id b66mr9870717pfc.114.1519047069667; Mon, 19 Feb 2018 05:31:09 -0800 (PST) Received: from cpu185.redpinesignals.com ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id m24sm32584982pgv.14.2018.02.19.05.31.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Feb 2018 05:31:08 -0800 (PST) From: Amitkumar Karwar To: Kalle Valo , marcel@holtmann.org Cc: linux-wireless@vger.kernel.org, Amitkumar Karwar , Prameela Rani Garnepudi , linux-bluetooth@vger.kernel.org, Siva Rebbagondla Subject: [v7 3/8] rsi: add header file rsi_91x Date: Mon, 19 Feb 2018 18:49:34 +0530 Message-Id: <1519046379-10068-4-git-send-email-amitkarwar@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519046379-10068-1-git-send-email-amitkarwar@gmail.com> References: <1519046379-10068-1-git-send-email-amitkarwar@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Prameela Rani Garnepudi The common parameters used by wlan and bt modules are add to a new header file "rsi_91x.h" defined in 'include/net' Signed-off-by: Prameela Rani Garnepudi Signed-off-by: Siva Rebbagondla Signed-off-by: Amitkumar Karwar --- v7: Same as v6 v6: Renamed rsi_header.h to rsi_91x.h and moved to include/net from include/linux(Kalle) v5: Same as earlier versions --- drivers/net/wireless/rsi/rsi_main.h | 12 ++---------- include/net/rsi_91x.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 include/net/rsi_91x.h diff --git a/drivers/net/wireless/rsi/rsi_main.h b/drivers/net/wireless/rsi/rsi_main.h index ee469dc..b0f4e2c 100644 --- a/drivers/net/wireless/rsi/rsi_main.h +++ b/drivers/net/wireless/rsi/rsi_main.h @@ -20,6 +20,7 @@ #include #include #include +#include struct rsi_sta { struct ieee80211_sta *sta; @@ -85,10 +86,6 @@ extern __printf(2, 3) void rsi_dbg(u32 zone, const char *fmt, ...); #define MGMT_HW_Q 10 #define BEACON_HW_Q 11 -/* Queue information */ -#define RSI_COEX_Q 0x0 -#define RSI_WIFI_MGMT_Q 0x4 -#define RSI_WIFI_DATA_Q 0x5 #define IEEE80211_MGMT_FRAME 0x00 #define IEEE80211_CTL_FRAME 0x04 @@ -293,11 +290,6 @@ struct rsi_common { struct ieee80211_vif *roc_vif; }; -enum host_intf { - RSI_HOST_INTF_SDIO = 0, - RSI_HOST_INTF_USB -}; - struct eepromrw_info { u32 offset; u32 length; @@ -322,7 +314,7 @@ struct rsi_hw { struct device *device; u8 sc_nvifs; - enum host_intf rsi_host_intf; + enum rsi_host_intf rsi_host_intf; u16 block_size; enum ps_state ps_state; struct rsi_ps_info ps_info; diff --git a/include/net/rsi_91x.h b/include/net/rsi_91x.h new file mode 100644 index 0000000..16a447b --- /dev/null +++ b/include/net/rsi_91x.h @@ -0,0 +1,34 @@ +/** + * Copyright (c) 2017 Redpine Signals Inc. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef __RSI_HEADER_H__ +#define __RSI_HEADER_H__ + +/* HAL queue information */ +#define RSI_COEX_Q 0x0 +#define RSI_BT_Q 0x2 +#define RSI_WLAN_Q 0x3 +#define RSI_WIFI_MGMT_Q 0x4 +#define RSI_WIFI_DATA_Q 0x5 +#define RSI_BT_MGMT_Q 0x6 +#define RSI_BT_DATA_Q 0x7 + +enum rsi_host_intf { + RSI_HOST_INTF_SDIO = 0, + RSI_HOST_INTF_USB +}; + +#endif