d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mwl: clean up empty lines in .c and .h files

Browse Source
This commit is contained in:
mjg 2020-09-01 22:05:39 +00:00
parent 382e0b00ca
commit 33739433e5
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/mwl/if_mwl.c
View File

@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
#include <sys/taskqueue.h> #include <sys/taskqueue.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <net/if.h> #include <net/if.h>
#include <net/if_var.h> #include <net/if_var.h>
#include <net/if_dl.h> #include <net/if_dl.h>

4
sys/dev/mwl/if_mwl_pci.c
View File

@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h> #include <sys/rman.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <net/if.h> #include <net/if.h>
#include <net/if_media.h> #include <net/if_media.h>
@ -98,7 +98,6 @@ static const struct mwl_pci_ident mwl_pci_ids[] = {
{ 0x11ab, 0x2a0c, "Marvell 88W8363" }, { 0x11ab, 0x2a0c, "Marvell 88W8363" },
{ 0x11ab, 0x2a21, "Marvell 88W8363" }, { 0x11ab, 0x2a21, "Marvell 88W8363" },
{ 0x11ab, 0x2a24, "Marvell 88W8363" }, { 0x11ab, 0x2a24, "Marvell 88W8363" },
{ 0, 0, NULL } { 0, 0, NULL }
}; };
@ -280,7 +279,6 @@ static device_method_t mwl_pci_methods[] = {
DEVMETHOD(device_shutdown, mwl_pci_shutdown), DEVMETHOD(device_shutdown, mwl_pci_shutdown),
DEVMETHOD(device_suspend, mwl_pci_suspend), DEVMETHOD(device_suspend, mwl_pci_suspend),
DEVMETHOD(device_resume, mwl_pci_resume), DEVMETHOD(device_resume, mwl_pci_resume),
{ 0,0 } { 0,0 }
}; };
static driver_t mwl_pci_driver = { static driver_t mwl_pci_driver = {

16
sys/dev/mwl/mwlreg.h
View File

@ -57,7 +57,6 @@
#define MACREG_REG_A2H_INTERRUPT_CLEAR_SEL 0x00000C38 // (From ARM to host) #define MACREG_REG_A2H_INTERRUPT_CLEAR_SEL 0x00000C38 // (From ARM to host)
#define MACREG_REG_A2H_INTERRUPT_STATUS_MASK 0x00000C3C // (From ARM to host) #define MACREG_REG_A2H_INTERRUPT_STATUS_MASK 0x00000C3C // (From ARM to host)
// Map to 0x80000000 on BAR1 // Map to 0x80000000 on BAR1
#define MACREG_REG_GEN_PTR 0x00000C10 #define MACREG_REG_GEN_PTR 0x00000C10
#define MACREG_REG_INT_CODE 0x00000C14 #define MACREG_REG_INT_CODE 0x00000C14
@ -101,7 +100,6 @@
#define MACREG_A2HRIC_BIT_MASK ISR_SRC_BITS #define MACREG_A2HRIC_BIT_MASK ISR_SRC_BITS
// Bit definitio for MACREG_REG_H2A_INTERRUPT_CAUSE (H2ARIC) // Bit definitio for MACREG_REG_H2A_INTERRUPT_CAUSE (H2ARIC)
#define MACREG_H2ARIC_BIT_PPA_READY 0x00000001 // bit 0 #define MACREG_H2ARIC_BIT_PPA_READY 0x00000001 // bit 0
#define MACREG_H2ARIC_BIT_DOOR_BELL 0x00000002 // bit 1 #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_BUSY 0x0004 // System is busy (command ignored)
#define HostCmd_RESULT_PARTIAL_DATA 0x0005 // Data buffer is not big enough #define HostCmd_RESULT_PARTIAL_DATA 0x0005 // Data buffer is not big enough
/* /*
// Definition of action or option for each command // Definition of action or option for each command
// //
@ -377,7 +374,6 @@ struct mwl_rxdesc {
#define HostCmd_WEP_KEY_INDEX_MASK 0x3fffffff #define HostCmd_WEP_KEY_INDEX_MASK 0x3fffffff
// Define action or option for HostCmd_CMD_802_11_RESET // Define action or option for HostCmd_CMD_802_11_RESET
#define HostCmd_ACT_HALT 0x0001 #define HostCmd_ACT_HALT 0x0001
#define HostCmd_ACT_RESTART 0x0002 #define HostCmd_ACT_RESTART 0x0002
@ -485,7 +481,6 @@ typedef struct {
u_int32_t Enable; /* FALSE: Disable or TRUE: Enable */ u_int32_t Enable; /* FALSE: Disable or TRUE: Enable */
} __packed HostCmd_DS_BSS_START; } __packed HostCmd_DS_BSS_START;
typedef struct { typedef struct {
u_int8_t ElemId; u_int8_t ElemId;
u_int8_t Len; u_int8_t Len;
@ -704,7 +699,7 @@ typedef struct {
uint32_t FixedRate; // legacy rate(not index) or an MCS code. uint32_t FixedRate; // legacy rate(not index) or an MCS code.
uint32_t RetryCount; uint32_t RetryCount;
} __packed FIXED_RATE_ENTRY; } __packed FIXED_RATE_ENTRY;
typedef struct { typedef struct {
FWCmdHdr CmdHdr; FWCmdHdr CmdHdr;
uint32_t Action; //HostCmd_ACT_GEN_GET 0x0000 uint32_t Action; //HostCmd_ACT_GEN_GET 0x0000
@ -723,7 +718,7 @@ typedef struct {
uint32_t EntryCount; uint32_t EntryCount;
FIXED_RATE_ENTRY FixedRateTable[4]; FIXED_RATE_ENTRY FixedRateTable[4];
} __packed USE_FIXED_RATE_INFO; } __packed USE_FIXED_RATE_INFO;
typedef struct { typedef struct {
FWCmdHdr CmdHdr; FWCmdHdr CmdHdr;
uint32_t Action; uint32_t Action;
@ -745,7 +740,6 @@ typedef struct {
uint8_t Slot; // Slot=0 if regular, Slot=1 if short. uint8_t Slot; // Slot=0 if regular, Slot=1 if short.
} __packed HostCmd_FW_SET_SLOT; } __packed HostCmd_FW_SET_SLOT;
// Define data structure for HostCmd_CMD_802_11_GET_STAT // Define data structure for HostCmd_CMD_802_11_GET_STAT
typedef struct { typedef struct {
FWCmdHdr CmdHdr; FWCmdHdr CmdHdr;
@ -778,7 +772,6 @@ typedef struct {
uint32_t RxExcludedFrames; uint32_t RxExcludedFrames;
} __packed HostCmd_DS_802_11_GET_STAT; } __packed HostCmd_DS_802_11_GET_STAT;
// Define data structure for HostCmd_CMD_MAC_REG_ACCESS // Define data structure for HostCmd_CMD_MAC_REG_ACCESS
typedef struct { typedef struct {
FWCmdHdr CmdHdr; FWCmdHdr CmdHdr;
@ -806,7 +799,6 @@ typedef struct {
uint8_t Reserverd[3]; uint8_t Reserverd[3];
} __packed HostCmd_DS_RF_REG_ACCESS; } __packed HostCmd_DS_RF_REG_ACCESS;
// Define data structure for HostCmd_CMD_802_11_RADIO_CONTROL // Define data structure for HostCmd_CMD_802_11_RADIO_CONTROL
typedef struct { typedef struct {
FWCmdHdr CmdHdr; FWCmdHdr CmdHdr;
@ -815,7 +807,6 @@ typedef struct {
uint16_t RadioOn; uint16_t RadioOn;
} __packed HostCmd_DS_802_11_RADIO_CONTROL; } __packed HostCmd_DS_802_11_RADIO_CONTROL;
#define TX_POWER_LEVEL_TOTAL 8 #define TX_POWER_LEVEL_TOTAL 8
// Define data structure for HostCmd_CMD_802_11_RF_TX_POWER // Define data structure for HostCmd_CMD_802_11_RF_TX_POWER
typedef struct { typedef struct {
@ -1141,7 +1132,6 @@ typedef struct {
uint8_t ActionData[1]; uint8_t ActionData[1];
} __packed HostCmd_FW_UPDATE_ENCRYPTION; } __packed HostCmd_FW_UPDATE_ENCRYPTION;
typedef struct { typedef struct {
FWCmdHdr CmdHdr; FWCmdHdr CmdHdr;
uint32_t ActionType; // ENCR_ACTION_TYPE uint32_t ActionType; // ENCR_ACTION_TYPE
@ -1272,8 +1262,6 @@ typedef struct {
uint8_t Watchdogbitmap; // for SW/BA uint8_t Watchdogbitmap; // for SW/BA
} __packed HostCmd_FW_GET_WATCHDOG_BITMAP; } __packed HostCmd_FW_GET_WATCHDOG_BITMAP;
// Define data structure for HostCmd_CMD_SET_REGION_POWER // Define data structure for HostCmd_CMD_SET_REGION_POWER
typedef struct { typedef struct {
FWCmdHdr CmdHdr; FWCmdHdr CmdHdr;