From 12b79518fb67f22a8d4b93213e3dd0caf7c6697f Mon Sep 17 00:00:00 2001 From: Emrys Bayliss Date: Fri, 16 Jan 2015 03:29:27 +1100 Subject: [PATCH] Staging: vt6655: Checkpatch fix: c99 comment headings This patch fixes some of the following checkpatch.pl errors in mac.h ERROR: do not use C99 // comments This patch reformats all single line c99 style comments to the preferred style. Signed-off-by: Emrys Bayliss Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 122 +++++++++++++++++------------------ 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 9be9bf838a1a..8e0200a78b19 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -38,11 +38,11 @@ #include "upc.h" /*--------------------- Export Definitions -------------------------*/ -// Registers in the MAC +/* Registers in the MAC */ #define MAC_MAX_CONTEXT_SIZE_PAGE0 256 #define MAC_MAX_CONTEXT_SIZE_PAGE1 128 -// Registers not related to 802.11b +/* Registers not related to 802.11b */ #define MAC_REG_BCFG0 0x00 #define MAC_REG_BCFG1 0x01 #define MAC_REG_FCR0 0x02 @@ -68,7 +68,7 @@ #define MAC_REG_TMCTL1 0x19 #define MAC_REG_TMDATA0 0x1C -// MAC Parameter related +/* MAC Parameter related */ #define MAC_REG_LRT 0x20 #define MAC_REG_SRT 0x21 #define MAC_REG_SIFS 0x22 @@ -85,13 +85,13 @@ #define MAC_REG_ACKFAILCNT 0x2E #define MAC_REG_FCSERRCNT 0x2F -// TSF Related +/* TSF Related */ #define MAC_REG_TSFCNTR 0x30 #define MAC_REG_NEXTTBTT 0x38 #define MAC_REG_TSFOFST 0x40 #define MAC_REG_TFTCTL 0x48 -// WMAC Control/Status Related +/* WMAC Control/Status Related */ #define MAC_REG_ENCFG 0x4C #define MAC_REG_PAGE1SEL 0x4F #define MAC_REG_CFG 0x50 @@ -103,7 +103,7 @@ #define MAC_REG_IMR 0x58 #define MAC_REG_ISR 0x5C -// Power Saving Related +/* Power Saving Related */ #define MAC_REG_PSCFG 0x60 #define MAC_REG_PSCTL 0x61 #define MAC_REG_PSPWRSIG 0x62 @@ -115,7 +115,7 @@ #define MAC_REG_SYNSPACCNT 0x6A #define MAC_REG_WAKSYNOPT 0x6B -// Baseband/IF Control Group +/* Baseband/IF Control Group */ #define MAC_REG_BBREGCTL 0x6C #define MAC_REG_CHANNEL 0x6D #define MAC_REG_BBREGADR 0x6E @@ -128,7 +128,7 @@ #define MAC_REG_GPIOCTL0 0x7A #define MAC_REG_GPIOCTL1 0x7B -// MAC DMA Related Group +/* MAC DMA Related Group */ #define MAC_REG_TXDMACTL0 0x7C #define MAC_REG_TXDMAPTR0 0x80 #define MAC_REG_AC0DMACTL 0x84 @@ -144,15 +144,15 @@ #define MAC_REG_ATIMDMACTL 0xAC #define MAC_REG_ATIMDMAPTR 0xB0 -// MiscFF PIO related +/* MiscFF PIO related */ #define MAC_REG_MISCFFNDEX 0xB4 #define MAC_REG_MISCFFCTL 0xB6 #define MAC_REG_MISCFFDATA 0xB8 -// Extend SW Timer +/* Extend SW Timer */ #define MAC_REG_TMDATA1 0xBC -// WOW Related Group +/* WOW Related Group */ #define MAC_REG_WAKEUPEN0 0xC0 #define MAC_REG_WAKEUPEN1 0xC1 #define MAC_REG_WAKEUPSR0 0xC2 @@ -162,13 +162,13 @@ #define MAC_REG_WAKE128_2 0xE4 #define MAC_REG_WAKE128_3 0xF4 -/////////////// Page 1 /////////////////// +/************** Page 1 ******************/ #define MAC_REG_CRC_128_0 0x04 #define MAC_REG_CRC_128_1 0x06 #define MAC_REG_CRC_128_2 0x08 #define MAC_REG_CRC_128_3 0x0A -// MAC Configuration Group +/* MAC Configuration Group */ #define MAC_REG_PAR0 0x0C #define MAC_REG_PAR4 0x10 #define MAC_REG_BSSID0 0x14 @@ -176,7 +176,7 @@ #define MAC_REG_MAR0 0x1C #define MAC_REG_MAR4 0x20 -// MAC RSPPKT INFO Group +/* MAC RSPPKT INFO Group */ #define MAC_REG_RSPINF_B_1 0x24 #define MAC_REG_RSPINF_B_2 0x28 #define MAC_REG_RSPINF_B_5 0x2C @@ -191,7 +191,7 @@ #define MAC_REG_RSPINF_A_54 0x42 #define MAC_REG_RSPINF_A_72 0x44 -// 802.11h relative +/* 802.11h relative */ #define MAC_REG_QUIETINIT 0x60 #define MAC_REG_QUIETGAP 0x62 #define MAC_REG_QUIETDUR 0x64 @@ -203,7 +203,7 @@ #define MAC_REG_PWRCCK 0x73 #define MAC_REG_PWROFDM 0x7C -// Bits in the BCFG0 register +/* Bits in the BCFG0 register */ #define BCFG0_PERROFF 0x40 #define BCFG0_MRDMDIS 0x20 #define BCFG0_MRDLDIS 0x10 @@ -211,7 +211,7 @@ #define BCFG0_VSERREN 0x02 #define BCFG0_LATMEN 0x01 -// Bits in the BCFG1 register +/* Bits in the BCFG1 register */ #define BCFG1_CFUNOPT 0x80 #define BCFG1_CREQOPT 0x40 #define BCFG1_DMA8 0x10 @@ -220,7 +220,7 @@ #define BCFG1_MIOEN 0x02 #define BCFG1_CISDLYEN 0x01 -// Bits in RAMBIST registers +/* Bits in RAMBIST registers */ #define BISTCMD_TSTPAT5 0x00 #define BISTCMD_TSTPATA 0x80 #define BISTCMD_TSTERR 0x20 @@ -236,7 +236,7 @@ #define BISTSR2_CMDPRTEN 0x02 #define BISTSR2_RAMTSTEN 0x01 -// Bits in the I2MCFG EEPROM register +/* Bits in the I2MCFG EEPROM register */ #define I2MCFG_BOUNDCTL 0x80 #define I2MCFG_WAITCTL 0x20 #define I2MCFG_SCLOECTL 0x10 @@ -245,28 +245,28 @@ #define I2MCFG_I2MLDSEQ 0x02 #define I2MCFG_I2CMFAST 0x01 -// Bits in the I2MCSR EEPROM register +/* Bits in the I2MCSR EEPROM register */ #define I2MCSR_EEMW 0x80 #define I2MCSR_EEMR 0x40 #define I2MCSR_AUTOLD 0x08 #define I2MCSR_NACK 0x02 #define I2MCSR_DONE 0x01 -// Bits in the PMC1 register +/* Bits in the PMC1 register */ #define SPS_RST 0x80 #define PCISTIKY 0x40 #define PME_OVR 0x02 -// Bits in the STICKYHW register +/* Bits in the STICKYHW register */ #define STICKHW_DS1_SHADOW 0x02 #define STICKHW_DS0_SHADOW 0x01 -// Bits in the TMCTL register +/* Bits in the TMCTL register */ #define TMCTL_TSUSP 0x04 #define TMCTL_TMD 0x02 #define TMCTL_TE 0x01 -// Bits in the TFTCTL register +/* Bits in the TFTCTL register */ #define TFTCTL_HWUTSF 0x80 #define TFTCTL_TBTTSYNC 0x40 #define TFTCTL_HWUTSFEN 0x20 @@ -276,7 +276,7 @@ #define TFTCTL_TSFCNTRST 0x02 #define TFTCTL_TSFCNTREN 0x01 -// Bits in the EnhanceCFG register +/* Bits in the EnhanceCFG register */ #define EnCFG_BarkerPream 0x00020000 #define EnCFG_NXTBTTCFPSTR 0x00010000 #define EnCFG_BcnSusClr 0x00000200 @@ -290,10 +290,10 @@ #define EnCFG_BBType_b 0x00000001 #define EnCFG_BBType_a 0x00000000 -// Bits in the Page1Sel register +/* Bits in the Page1Sel register */ #define PAGE1_SEL 0x01 -// Bits in the CFG register +/* Bits in the CFG register */ #define CFG_TKIPOPT 0x80 #define CFG_RXDMAOPT 0x40 #define CFG_TMOT_SW 0x20 @@ -304,7 +304,7 @@ #define CFG_NOTXTIMEOUT 0x02 #define CFG_NOBUFOPT 0x01 -// Bits in the TEST register +/* Bits in the TEST register */ #define TEST_LBEXT 0x80 #define TEST_LBINT 0x40 #define TEST_LBNONE 0x00 @@ -315,7 +315,7 @@ #define TEST_NOCTS 0x02 #define TEST_NOACK 0x01 -// Bits in the HOSTCR register +/* Bits in the HOSTCR register */ #define HOSTCR_TXONST 0x80 #define HOSTCR_RXONST 0x40 #define HOSTCR_ADHOC 0x20 /* Network Type 1 = Ad-hoc */ @@ -325,17 +325,17 @@ #define HOSTCR_MACEN 0x02 /* 0000 0010 */ #define HOSTCR_SOFTRST 0x01 /* 0000 0001 */ -// Bits in the MACCR register +/* Bits in the MACCR register */ #define MACCR_SYNCFLUSHOK 0x04 #define MACCR_SYNCFLUSH 0x02 #define MACCR_CLRNAV 0x01 -// Bits in the MAC_REG_GPIOCTL0 register +/* Bits in the MAC_REG_GPIOCTL0 register */ #define LED_ACTSET 0x01 #define LED_RFOFF 0x02 #define LED_NOCONNECT 0x04 -// Bits in the RCR register +/* Bits in the RCR register */ #define RCR_SSID 0x80 #define RCR_RXALLTYPE 0x40 #define RCR_UNICAST 0x20 @@ -345,11 +345,11 @@ #define RCR_ERRCRC 0x02 #define RCR_BSSID 0x01 -// Bits in the TCR register +/* Bits in the TCR register */ #define TCR_SYNCDCFOPT 0x02 #define TCR_AUTOBCNTX 0x01 /* Beacon automatically transmit enable */ -// Bits in the IMR register +/* Bits in the IMR register */ #define IMR_MEASURESTART 0x80000000 #define IMR_QUIETSTART 0x20000000 #define IMR_RADARDETECT 0x10000000 @@ -369,7 +369,7 @@ #define IMR_AC0DMA 0x00000002 #define IMR_TXDMA0 0x00000001 -// Bits in the ISR register +/* Bits in the ISR register */ #define ISR_MEASURESTART 0x80000000 #define ISR_QUIETSTART 0x20000000 #define ISR_RADARDETECT 0x10000000 @@ -389,7 +389,7 @@ #define ISR_AC0DMA 0x00000002 #define ISR_TXDMA0 0x00000001 -// Bits in the PSCFG register +/* Bits in the PSCFG register */ #define PSCFG_PHILIPMD 0x40 #define PSCFG_WAKECALEN 0x20 #define PSCFG_WAKETMREN 0x10 @@ -398,7 +398,7 @@ #define PSCFG_SLEEPSYN 0x02 #define PSCFG_AUTOSLEEP 0x01 -// Bits in the PSCTL register +/* Bits in the PSCTL register */ #define PSCTL_WAKEDONE 0x20 #define PSCTL_PS 0x10 #define PSCTL_GO2DOZE 0x08 @@ -406,7 +406,7 @@ #define PSCTL_ALBCN 0x02 #define PSCTL_PSEN 0x01 -// Bits in the PSPWSIG register +/* Bits in the PSPWSIG register */ #define PSSIG_WPE3 0x80 #define PSSIG_WPE2 0x40 #define PSSIG_WPE1 0x20 @@ -416,17 +416,17 @@ #define PSSIG_SPE1 0x02 #define PSSIG_SRADIOPE 0x01 -// Bits in the BBREGCTL register +/* Bits in the BBREGCTL register */ #define BBREGCTL_DONE 0x04 #define BBREGCTL_REGR 0x02 #define BBREGCTL_REGW 0x01 -// Bits in the IFREGCTL register +/* Bits in the IFREGCTL register */ #define IFREGCTL_DONE 0x04 #define IFREGCTL_IFRF 0x02 #define IFREGCTL_REGW 0x01 -// Bits in the SOFTPWRCTL register +/* Bits in the SOFTPWRCTL register */ #define SOFTPWRCTL_RFLEOPT 0x0800 #define SOFTPWRCTL_TXPEINV 0x0200 #define SOFTPWRCTL_SWPECTI 0x0100 @@ -437,63 +437,63 @@ #define SOFTPWRCTL_SWPE1 0x0002 #define SOFTPWRCTL_SWPE3 0x0001 -// Bits in the GPIOCTL1 register +/* Bits in the GPIOCTL1 register */ #define GPIO1_DATA1 0x20 #define GPIO1_MD1 0x10 #define GPIO1_DATA0 0x02 #define GPIO1_MD0 0x01 -// Bits in the DMACTL register +/* Bits in the DMACTL register */ #define DMACTL_CLRRUN 0x00080000 #define DMACTL_RUN 0x00000008 #define DMACTL_WAKE 0x00000004 #define DMACTL_DEAD 0x00000002 #define DMACTL_ACTIVE 0x00000001 -// Bits in the RXDMACTL0 register +/* Bits in the RXDMACTL0 register */ #define RX_PERPKT 0x00000100 #define RX_PERPKTCLR 0x01000000 -// Bits in the BCNDMACTL register +/* Bits in the BCNDMACTL register */ #define BEACON_READY 0x01 -// Bits in the MISCFFCTL register +/* Bits in the MISCFFCTL register */ #define MISCFFCTL_WRITE 0x0001 -// Bits in WAKEUPEN0 +/* Bits in WAKEUPEN0 */ #define WAKEUPEN0_DIRPKT 0x10 #define WAKEUPEN0_LINKOFF 0x08 #define WAKEUPEN0_ATIMEN 0x04 #define WAKEUPEN0_TIMEN 0x02 #define WAKEUPEN0_MAGICEN 0x01 -// Bits in WAKEUPEN1 +/* Bits in WAKEUPEN1 */ #define WAKEUPEN1_128_3 0x08 #define WAKEUPEN1_128_2 0x04 #define WAKEUPEN1_128_1 0x02 #define WAKEUPEN1_128_0 0x01 -// Bits in WAKEUPSR0 +/* Bits in WAKEUPSR0 */ #define WAKEUPSR0_DIRPKT 0x10 #define WAKEUPSR0_LINKOFF 0x08 #define WAKEUPSR0_ATIMEN 0x04 #define WAKEUPSR0_TIMEN 0x02 #define WAKEUPSR0_MAGICEN 0x01 -// Bits in WAKEUPSR1 +/* Bits in WAKEUPSR1 */ #define WAKEUPSR1_128_3 0x08 #define WAKEUPSR1_128_2 0x04 #define WAKEUPSR1_128_1 0x02 #define WAKEUPSR1_128_0 0x01 -// Bits in the MAC_REG_GPIOCTL register +/* Bits in the MAC_REG_GPIOCTL register */ #define GPIO0_MD 0x01 #define GPIO0_DATA 0x02 #define GPIO0_INTMD 0x04 #define GPIO1_MD 0x10 #define GPIO1_DATA 0x20 -// Bits in the MSRCTL register +/* Bits in the MSRCTL register */ #define MSRCTL_FINISH 0x80 #define MSRCTL_READY 0x40 #define MSRCTL_RADARDETECT 0x20 @@ -503,26 +503,26 @@ #define MSRCTL_QUIETINT 0x02 #define MSRCTL_QUIETEN 0x01 -// Bits in the MSRCTL1 register +/* Bits in the MSRCTL1 register */ #define MSRCTL1_TXPWR 0x08 #define MSRCTL1_CSAPAREN 0x04 #define MSRCTL1_TXPAUSE 0x01 -// Loopback mode +/* Loopback mode */ #define MAC_LB_EXT 0x02 #define MAC_LB_INTERNAL 0x01 #define MAC_LB_NONE 0x00 #define Default_BI 0x200 -// MiscFIFO Offset +/* MiscFIFO Offset */ #define MISCFIFO_KEYETRY0 32 #define MISCFIFO_KEYENTRYSIZE 22 #define MISCFIFO_SYNINFO_IDX 10 #define MISCFIFO_SYNDATA_IDX 11 #define MISCFIFO_SYNDATASIZE 21 -// enabled mask value of irq +/* enabled mask value of irq */ #define IMR_MASK_VALUE (IMR_SOFTTIMER1 | \ IMR_RXDMA1 | \ IMR_RXNOBUF | \ @@ -538,13 +538,13 @@ IMR_AC0DMA | \ IMR_TXDMA0) -// max time out delay time +/* max time out delay time */ #define W_MAX_TIMEOUT 0xFFF0U -// wait time within loop +/* wait time within loop */ #define CB_DELAY_LOOP_WAIT 10 /* 10ms */ -// revision id +/* revision id */ #define REV_ID_VT3253_A0 0x00 #define REV_ID_VT3253_A1 0x01 #define REV_ID_VT3253_B0 0x08 @@ -628,12 +628,12 @@ do { \ VNSvInPortD(dwIoBase + MAC_REG_ATIMDMAPTR, \ (unsigned long *)pdwCurrDescAddr) -// set the chip with current BCN tx descriptor address +/* set the chip with current BCN tx descriptor address */ #define MACvSetCurrBCNTxDescAddr(dwIoBase, dwCurrDescAddr) \ VNSvOutPortD(dwIoBase + MAC_REG_BCNDMAPTR, \ dwCurrDescAddr) -// set the chip with current BCN length +/* set the chip with current BCN length */ #define MACvSetCurrBCNLength(dwIoBase, wCurrBCNLength) \ VNSvOutPortW(dwIoBase + MAC_REG_BCNDMACTL+2, \ wCurrBCNLength) -- 2.39.5