tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Staging: winbond: mto.h Coding style fixes
I fixed all problems reported by checkpatch.pl except for a couple of
long lines. I also removed version comments and removed "commented away"
code.
Signed-off-by: Lars Lindley <lindley@coyote.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
authored by
Lars Lindley
and committed by
Greg Kroah-Hartman
75df20e0
20dbe695
+82
-97
+82
-97
drivers/staging/winbond/mto.h
+82
-97
drivers/staging/winbond/mto.h
···
1
-
//==================================================================
2
-
// MTO.H
3
-
//
4
-
// Revision history
5
-
//=================================
6
-
// 20030110 UN20 Pete Chao
7
-
// Initial Release
8
-
//
9
-
// Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.
10
-
//==================================================================
1
+
/*
2
+
* ==================================================================
3
+
* MTO.H
4
+
*
5
+
* Copyright (c) 2003 Winbond Electronics Corp. All rights reserved.
6
+
* ==================================================================
7
+
*/
11
8
#ifndef __MTO_H__
12
9
#define __MTO_H__
13
10
···
12
15
13
16
struct wbsoft_priv;
14
17
15
-
// LA20040210_DTO kevin
16
-
//#define MTO_PREAMBLE_LONG 0
17
-
//#define MTO_PREAMBLE_SHORT 1
18
18
#define MTO_PREAMBLE_LONG WLAN_PREAMBLE_TYPE_LONG
19
19
#define MTO_PREAMBLE_SHORT WLAN_PREAMBLE_TYPE_SHORT
20
20
21
-
//============================================================================
22
-
// struct _MTOParameters --
23
-
//
24
-
// Defines the parameters used in the MAC Throughput Optimization algorithm
25
-
//============================================================================
21
+
/* Defines the parameters used in the MAC Throughput Optimization algorithm */
26
22
struct wb35_mto_params {
27
-
//--------- wkchen added -------------
28
-
u32 TxFlowCount; //to judge what kind the tx flow(sparse or busy) is
29
-
//------------------------------------------------
23
+
u32 TxFlowCount; /* to judge what kind the tx flow(sparse or busy) is */
30
24
31
-
//--------- DTO threshold parameters -------------
32
-
u16 DTO_PeriodicCheckCycle;
33
-
u16 DTO_RssiThForAntDiv;
25
+
/* --------- DTO threshold parameters ------------- */
26
+
u16 DTO_PeriodicCheckCycle;
27
+
u16 DTO_RssiThForAntDiv;
34
28
35
-
u16 DTO_TxCountThForCalcNewRate;
36
-
u16 DTO_TxRateIncTh;
29
+
u16 DTO_TxCountThForCalcNewRate;
30
+
u16 DTO_TxRateIncTh;
37
31
38
-
u16 DTO_TxRateDecTh;
39
-
u16 DTO_TxRateEqTh;
32
+
u16 DTO_TxRateDecTh;
33
+
u16 DTO_TxRateEqTh;
40
34
41
-
u16 DTO_TxRateBackOff;
42
-
u16 DTO_TxRetryRateReduce;
35
+
u16 DTO_TxRateBackOff;
36
+
u16 DTO_TxRetryRateReduce;
43
37
44
-
u16 DTO_TxPowerIndex; //0 ~ 31
45
-
u16 reserved_1;
46
-
//------------------------------------------------
38
+
u16 DTO_TxPowerIndex; /* 0 ~ 31 */
39
+
u16 reserved_1;
40
+
/* ------------------------------------------------ */
47
41
48
-
u8 PowerChangeEnable;
49
-
u8 AntDiversityEnable;
50
-
u8 CCA_Mode;
51
-
u8 CCA_Mode_Setup;
52
-
u8 Preamble_Type;
53
-
u8 PreambleChangeEnable;
42
+
u8 PowerChangeEnable;
43
+
u8 AntDiversityEnable;
44
+
u8 CCA_Mode;
45
+
u8 CCA_Mode_Setup;
46
+
u8 Preamble_Type;
47
+
u8 PreambleChangeEnable;
54
48
55
-
u8 DataRateLevel;
56
-
u8 DataRateChangeEnable;
57
-
u8 FragThresholdLevel;
58
-
u8 FragThresholdChangeEnable;
49
+
u8 DataRateLevel;
50
+
u8 DataRateChangeEnable;
51
+
u8 FragThresholdLevel;
52
+
u8 FragThresholdChangeEnable;
59
53
60
-
u16 RTSThreshold;
61
-
u16 RTSThreshold_Setup;
54
+
u16 RTSThreshold;
55
+
u16 RTSThreshold_Setup;
62
56
63
-
u32 AvgIdleSlot;
64
-
u32 Pr_Interf;
65
-
u32 AvgGapBtwnInterf;
57
+
u32 AvgIdleSlot;
58
+
u32 Pr_Interf;
59
+
u32 AvgGapBtwnInterf;
66
60
67
-
u8 RTSChangeEnable;
68
-
u8 Ant_sel;
69
-
u8 aging_timeout;
70
-
u8 reserved_2;
61
+
u8 RTSChangeEnable;
62
+
u8 Ant_sel;
63
+
u8 aging_timeout;
64
+
u8 reserved_2;
71
65
72
-
u32 Cnt_Ant[2];
73
-
u32 SQ_Ant[2];
66
+
u32 Cnt_Ant[2];
67
+
u32 SQ_Ant[2];
74
68
75
-
// 20040510 remove from globe vairable
76
-
u8 FallbackRateLevel;
77
-
u8 OfdmRateLevel;
69
+
u8 FallbackRateLevel;
70
+
u8 OfdmRateLevel;
78
71
79
-
u8 RatePolicy;
80
-
u8 reserved_3[3];
72
+
u8 RatePolicy;
73
+
u8 reserved_3[3];
81
74
82
-
// For RSSI turning
83
-
s32 RSSI_high;
84
-
s32 RSSI_low;
85
-
75
+
/* For RSSI turning */
76
+
s32 RSSI_high;
77
+
s32 RSSI_low;
86
78
};
87
79
88
80
89
-
#define MTO_DATA() (adapter->sMtoPara)
90
-
#define MTO_HAL() (&adapter->sHwData)
91
-
#define MTO_SET_PREAMBLE_TYPE(x) // 20040511 Turbo mark LM_PREAMBLE_TYPE(&pcore_data->lm_data) = (x)
92
-
#define MTO_ENABLE (adapter->sLocalPara.TxRateMode == RATE_AUTO)
93
-
#define MTO_TXPOWER_FROM_EEPROM (adapter->sHwData.PowerIndexFromEEPROM)
94
-
#define LOCAL_ANTENNA_NO() (adapter->sLocalPara.bAntennaNo)
95
-
#define LOCAL_IS_CONNECTED() (adapter->sLocalPara.wConnectedSTAindex != 0)
96
-
#define MTO_INITTXRATE_MODE (adapter->sHwData.SoftwareSet&0x2) //bit 1
81
+
#define MTO_DATA() (adapter->sMtoPara)
82
+
#define MTO_HAL() (&adapter->sHwData)
83
+
#define MTO_SET_PREAMBLE_TYPE(x) /* Turbo mark LM_PREAMBLE_TYPE(&pcore_data->lm_data) = (x) */
84
+
#define MTO_ENABLE (adapter->sLocalPara.TxRateMode == RATE_AUTO)
85
+
#define MTO_TXPOWER_FROM_EEPROM (adapter->sHwData.PowerIndexFromEEPROM)
86
+
#define LOCAL_ANTENNA_NO() (adapter->sLocalPara.bAntennaNo)
87
+
#define LOCAL_IS_CONNECTED() (adapter->sLocalPara.wConnectedSTAindex != 0)
88
+
#define MTO_INITTXRATE_MODE (adapter->sHwData.SoftwareSet&0x2) /* bit 1 */
97
89
98
-
#define MTO_POWER_CHANGE_ENABLE() MTO_DATA().PowerChangeEnable
99
-
#define MTO_CCA_MODE() MTO_DATA().CCA_Mode
100
-
#define MTO_CCA_MODE_SETUP() MTO_DATA().CCA_Mode_Setup
101
-
#define MTO_PREAMBLE_TYPE() MTO_DATA().Preamble_Type
102
-
#define MTO_PREAMBLE_CHANGE_ENABLE() MTO_DATA().PreambleChangeEnable
90
+
#define MTO_POWER_CHANGE_ENABLE() MTO_DATA().PowerChangeEnable
91
+
#define MTO_CCA_MODE() MTO_DATA().CCA_Mode
92
+
#define MTO_CCA_MODE_SETUP() MTO_DATA().CCA_Mode_Setup
93
+
#define MTO_PREAMBLE_TYPE() MTO_DATA().Preamble_Type
94
+
#define MTO_PREAMBLE_CHANGE_ENABLE() MTO_DATA().PreambleChangeEnable
103
95
104
-
#define MTO_RATE_LEVEL() MTO_DATA().DataRateLevel
96
+
#define MTO_RATE_LEVEL() MTO_DATA().DataRateLevel
105
97
#define MTO_OFDM_RATE_LEVEL() MTO_DATA().OfdmRateLevel
106
-
#define MTO_RATE_CHANGE_ENABLE() MTO_DATA().DataRateChangeEnable
107
-
#define MTO_FRAG_TH_LEVEL() MTO_DATA().FragThresholdLevel
108
-
#define MTO_FRAG_CHANGE_ENABLE() MTO_DATA().FragThresholdChangeEnable
109
-
#define MTO_RTS_THRESHOLD() MTO_DATA().RTSThreshold
110
-
#define MTO_RTS_CHANGE_ENABLE() MTO_DATA().RTSChangeEnable
111
-
#define MTO_RTS_THRESHOLD_SETUP() MTO_DATA().RTSThreshold_Setup
98
+
#define MTO_RATE_CHANGE_ENABLE() MTO_DATA().DataRateChangeEnable
99
+
#define MTO_FRAG_TH_LEVEL() MTO_DATA().FragThresholdLevel
100
+
#define MTO_FRAG_CHANGE_ENABLE() MTO_DATA().FragThresholdChangeEnable
101
+
#define MTO_RTS_THRESHOLD() MTO_DATA().RTSThreshold
102
+
#define MTO_RTS_CHANGE_ENABLE() MTO_DATA().RTSChangeEnable
103
+
#define MTO_RTS_THRESHOLD_SETUP() MTO_DATA().RTSThreshold_Setup
112
104
113
-
#define MTO_AVG_IDLE_SLOT() MTO_DATA().AvgIdleSlot
114
-
#define MTO_PR_INTERF() MTO_DATA().Pr_Interf
115
-
#define MTO_AVG_GAP_BTWN_INTERF() MTO_DATA().AvgGapBtwnInterf
105
+
#define MTO_AVG_IDLE_SLOT() MTO_DATA().AvgIdleSlot
106
+
#define MTO_PR_INTERF() MTO_DATA().Pr_Interf
107
+
#define MTO_AVG_GAP_BTWN_INTERF() MTO_DATA().AvgGapBtwnInterf
116
108
117
-
#define MTO_CNT_ANT(x) MTO_DATA().Cnt_Ant[(x)]
118
-
#define MTO_SQ_ANT(x) MTO_DATA().SQ_Ant[(x)]
119
-
#define MTO_AGING_TIMEOUT() MTO_DATA().aging_timeout
109
+
#define MTO_CNT_ANT(x) MTO_DATA().Cnt_Ant[(x)]
110
+
#define MTO_SQ_ANT(x) MTO_DATA().SQ_Ant[(x)]
111
+
#define MTO_AGING_TIMEOUT() MTO_DATA().aging_timeout
120
112
113
+
#define MTO_TXFLOWCOUNT() MTO_DATA().TxFlowCount
121
114
122
-
#define MTO_TXFLOWCOUNT() MTO_DATA().TxFlowCount
123
-
//--------- DTO threshold parameters -------------
115
+
/* --------- DTO threshold parameters ------------- */
124
116
#define MTOPARA_PERIODIC_CHECK_CYCLE() MTO_DATA().DTO_PeriodicCheckCycle
125
117
#define MTOPARA_RSSI_TH_FOR_ANTDIV() MTO_DATA().DTO_RssiThForAntDiv
126
118
#define MTOPARA_TXCOUNT_TH_FOR_CALC_RATE() MTO_DATA().DTO_TxCountThForCalcNewRate
···
119
133
#define MTOPARA_TXRATE_BACKOFF() MTO_DATA().DTO_TxRateBackOff
120
134
#define MTOPARA_TXRETRYRATE_REDUCE() MTO_DATA().DTO_TxRetryRateReduce
121
135
#define MTOPARA_TXPOWER_INDEX() MTO_DATA().DTO_TxPowerIndex
122
-
//------------------------------------------------
136
+
/* ------------------------------------------------ */
123
137
124
138
125
-
extern u16 MTO_Frag_Th_Tbl[];
139
+
extern u16 MTO_Frag_Th_Tbl[];
126
140
127
-
#define MTO_DATA_RATE() MTO_Data_Rate_Tbl[MTO_RATE_LEVEL()]
128
-
#define MTO_FRAG_TH() MTO_Frag_Th_Tbl[MTO_FRAG_TH_LEVEL()]
141
+
#define MTO_DATA_RATE() MTO_Data_Rate_Tbl[MTO_RATE_LEVEL()]
142
+
#define MTO_FRAG_TH() MTO_Frag_Th_Tbl[MTO_FRAG_TH_LEVEL()]
129
143
130
144
extern void MTO_Init(struct wbsoft_priv *);
131
145
extern void MTO_PeriodicTimerExpired(struct wbsoft_priv *);
···
134
148
extern u8 MTO_GetTxFallbackRate(struct wbsoft_priv *adapter);
135
149
extern void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 t0, u8 index);
136
150
137
-
#endif //__MTO_H__
138
-
151
+
#endif /* __MTO_H__ */
139
152