From owner-svn-src-all@freebsd.org Tue Sep 1 22:05:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7401337E1F9; Tue, 1 Sep 2020 22:05:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1NN2XlFz4dSg; Tue, 1 Sep 2020 22:05:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BEC0202C2; Tue, 1 Sep 2020 22:05:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M5etA055461; Tue, 1 Sep 2020 22:05:40 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M5dxH055459; Tue, 1 Sep 2020 22:05:39 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012205.081M5dxH055459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:05:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365198 - head/sys/dev/mwl X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mwl X-SVN-Commit-Revision: 365198 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:05:40 -0000 Author: mjg Date: Tue Sep 1 22:05:39 2020 New Revision: 365198 URL: https://svnweb.freebsd.org/changeset/base/365198 Log: mwl: clean up empty lines in .c and .h files Modified: head/sys/dev/mwl/if_mwl.c head/sys/dev/mwl/if_mwl_pci.c head/sys/dev/mwl/mwlreg.h Modified: head/sys/dev/mwl/if_mwl.c ============================================================================== --- head/sys/dev/mwl/if_mwl.c Tue Sep 1 22:05:21 2020 (r365197) +++ head/sys/dev/mwl/if_mwl.c Tue Sep 1 22:05:39 2020 (r365198) @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include - + #include #include #include Modified: head/sys/dev/mwl/if_mwl_pci.c ============================================================================== --- head/sys/dev/mwl/if_mwl_pci.c Tue Sep 1 22:05:21 2020 (r365197) +++ head/sys/dev/mwl/if_mwl_pci.c Tue Sep 1 22:05:39 2020 (r365198) @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include - + #include #include #include @@ -98,7 +98,6 @@ static const struct mwl_pci_ident mwl_pci_ids[] = { { 0x11ab, 0x2a0c, "Marvell 88W8363" }, { 0x11ab, 0x2a21, "Marvell 88W8363" }, { 0x11ab, 0x2a24, "Marvell 88W8363" }, - { 0, 0, NULL } }; @@ -280,7 +279,6 @@ static device_method_t mwl_pci_methods[] = { DEVMETHOD(device_shutdown, mwl_pci_shutdown), DEVMETHOD(device_suspend, mwl_pci_suspend), DEVMETHOD(device_resume, mwl_pci_resume), - { 0,0 } }; static driver_t mwl_pci_driver = { Modified: head/sys/dev/mwl/mwlreg.h ============================================================================== --- head/sys/dev/mwl/mwlreg.h Tue Sep 1 22:05:21 2020 (r365197) +++ head/sys/dev/mwl/mwlreg.h Tue Sep 1 22:05:39 2020 (r365198) @@ -57,7 +57,6 @@ #define MACREG_REG_A2H_INTERRUPT_CLEAR_SEL 0x00000C38 // (From ARM to host) #define MACREG_REG_A2H_INTERRUPT_STATUS_MASK 0x00000C3C // (From ARM to host) - // Map to 0x80000000 on BAR1 #define MACREG_REG_GEN_PTR 0x00000C10 #define MACREG_REG_INT_CODE 0x00000C14 @@ -101,7 +100,6 @@ #define MACREG_A2HRIC_BIT_MASK ISR_SRC_BITS - // Bit definitio for MACREG_REG_H2A_INTERRUPT_CAUSE (H2ARIC) #define MACREG_H2ARIC_BIT_PPA_READY 0x00000001 // bit 0 #define MACREG_H2ARIC_BIT_DOOR_BELL 0x00000002 // bit 1 @@ -341,7 +339,6 @@ struct mwl_rxdesc { #define HostCmd_RESULT_BUSY 0x0004 // System is busy (command ignored) #define HostCmd_RESULT_PARTIAL_DATA 0x0005 // Data buffer is not big enough - /* // Definition of action or option for each command // @@ -377,7 +374,6 @@ struct mwl_rxdesc { #define HostCmd_WEP_KEY_INDEX_MASK 0x3fffffff - // Define action or option for HostCmd_CMD_802_11_RESET #define HostCmd_ACT_HALT 0x0001 #define HostCmd_ACT_RESTART 0x0002 @@ -485,7 +481,6 @@ typedef struct { u_int32_t Enable; /* FALSE: Disable or TRUE: Enable */ } __packed HostCmd_DS_BSS_START; - typedef struct { u_int8_t ElemId; u_int8_t Len; @@ -704,7 +699,7 @@ typedef struct { uint32_t FixedRate; // legacy rate(not index) or an MCS code. uint32_t RetryCount; } __packed FIXED_RATE_ENTRY; - + typedef struct { FWCmdHdr CmdHdr; uint32_t Action; //HostCmd_ACT_GEN_GET 0x0000 @@ -723,7 +718,7 @@ typedef struct { uint32_t EntryCount; FIXED_RATE_ENTRY FixedRateTable[4]; } __packed USE_FIXED_RATE_INFO; - + typedef struct { FWCmdHdr CmdHdr; uint32_t Action; @@ -745,7 +740,6 @@ typedef struct { uint8_t Slot; // Slot=0 if regular, Slot=1 if short. } __packed HostCmd_FW_SET_SLOT; - // Define data structure for HostCmd_CMD_802_11_GET_STAT typedef struct { FWCmdHdr CmdHdr; @@ -778,7 +772,6 @@ typedef struct { uint32_t RxExcludedFrames; } __packed HostCmd_DS_802_11_GET_STAT; - // Define data structure for HostCmd_CMD_MAC_REG_ACCESS typedef struct { FWCmdHdr CmdHdr; @@ -806,7 +799,6 @@ typedef struct { uint8_t Reserverd[3]; } __packed HostCmd_DS_RF_REG_ACCESS; - // Define data structure for HostCmd_CMD_802_11_RADIO_CONTROL typedef struct { FWCmdHdr CmdHdr; @@ -815,7 +807,6 @@ typedef struct { uint16_t RadioOn; } __packed HostCmd_DS_802_11_RADIO_CONTROL; - #define TX_POWER_LEVEL_TOTAL 8 // Define data structure for HostCmd_CMD_802_11_RF_TX_POWER typedef struct { @@ -1141,7 +1132,6 @@ typedef struct { uint8_t ActionData[1]; } __packed HostCmd_FW_UPDATE_ENCRYPTION; - typedef struct { FWCmdHdr CmdHdr; uint32_t ActionType; // ENCR_ACTION_TYPE @@ -1271,8 +1261,6 @@ typedef struct { FWCmdHdr CmdHdr; uint8_t Watchdogbitmap; // for SW/BA } __packed HostCmd_FW_GET_WATCHDOG_BITMAP; - - // Define data structure for HostCmd_CMD_SET_REGION_POWER typedef struct {