Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: rt28x0: fix comments in chip/mac_pci.h

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Bartlomiej Zolnierkiewicz and committed by
Greg Kroah-Hartman
956cd45d ee1f1fa4

+36 -36
+36 -36
drivers/staging/rt2860/chip/mac_pci.h
··· 43 43 #include "../rtmp_iface.h" 44 44 #include "../rtmp_dot11.h" 45 45 46 - // 47 - // Device ID & Vendor ID related definitions, 48 - // NOTE: you should not add the new VendorID/DeviceID here unless you not sure it belongs to what chip. 49 - // 46 + /* */ 47 + /* Device ID & Vendor ID related definitions, */ 48 + /* NOTE: you should not add the new VendorID/DeviceID here unless you not sure it belongs to what chip. */ 49 + /* */ 50 50 #define NIC_PCI_VENDOR_ID 0x1814 51 51 #define PCIBUS_INTEL_VENDOR 0x8086 52 52 ··· 66 66 67 67 #define AUX_CTRL 0x10c 68 68 69 - // 70 - // TX descriptor format, Tx ring, Mgmt Ring 71 - // 69 + /* */ 70 + /* TX descriptor format, Tx ring, Mgmt Ring */ 71 + /* */ 72 72 struct PACKED rt_txd { 73 - // Word 0 73 + /* Word 0 */ 74 74 u32 SDPtr0; 75 - // Word 1 75 + /* Word 1 */ 76 76 u32 SDLen1:14; 77 77 u32 LastSec1:1; 78 78 u32 Burst:1; 79 79 u32 SDLen0:14; 80 80 u32 LastSec0:1; 81 81 u32 DMADONE:1; 82 - //Word2 82 + /*Word2 */ 83 83 u32 SDPtr1; 84 - //Word3 84 + /*Word3 */ 85 85 u32 rsv2:24; 86 86 u32 WIV:1; /* Wireless Info Valid. 1 if Driver already fill WI, o if DMA needs to copy WI to correctposition */ 87 87 u32 QSEL:2; /* select on-chip FIFO ID for 2nd-stage output scheduler.0:MGMT, 1:HCCA 2:EDCA */ ··· 91 91 u32 ICO:1; /* */ 92 92 }; 93 93 94 - // 95 - // Rx descriptor format, Rx Ring 96 - // 94 + /* */ 95 + /* Rx descriptor format, Rx Ring */ 96 + /* */ 97 97 typedef struct PACKED rt_rxd { 98 - // Word 0 98 + /* Word 0 */ 99 99 u32 SDP0; 100 - // Word 1 100 + /* Word 1 */ 101 101 u32 SDL1:14; 102 102 u32 Rsv:2; 103 103 u32 SDL0:14; 104 104 u32 LS0:1; 105 105 u32 DDONE:1; 106 - // Word 2 106 + /* Word 2 */ 107 107 u32 SDP1; 108 - // Word 3 108 + /* Word 3 */ 109 109 u32 BA:1; 110 110 u32 DATA:1; 111 111 u32 NULLDATA:1; ··· 141 141 142 142 /* ----------------- EEPROM Related MACRO ----------------- */ 143 143 144 - // 8051 firmware image for RT2860 - base address = 0x4000 144 + /* 8051 firmware image for RT2860 - base address = 0x4000 */ 145 145 #define FIRMWARE_IMAGE_BASE 0x2000 146 - #define MAX_FIRMWARE_IMAGE_SIZE 0x2000 // 8kbyte 146 + #define MAX_FIRMWARE_IMAGE_SIZE 0x2000 /* 8kbyte */ 147 147 148 148 /* ----------------- Frimware Related MACRO ----------------- */ 149 149 #define RTMP_WRITE_FIRMWARE(_pAd, _pFwImage, _FwLen) \ ··· 222 222 /* ----------------- RX Related MACRO ----------------- */ 223 223 224 224 /* ----------------- ASIC Related MACRO ----------------- */ 225 - // reset MAC of a station entry to 0x000000000000 225 + /* reset MAC of a station entry to 0x000000000000 */ 226 226 #define RTMP_STA_ENTRY_MAC_RESET(pAd, Wcid) \ 227 227 AsicDelWcidTab(pAd, Wcid); 228 228 229 - // add this entry into ASIC RX WCID search table 229 + /* add this entry into ASIC RX WCID search table */ 230 230 #define RTMP_STA_ENTRY_ADD(pAd, pEntry) \ 231 231 AsicUpdateRxWCIDTable(pAd, pEntry->Aid, pEntry->Addr); 232 232 233 - // add by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet 234 - // Set MAC register value according operation mode 233 + /* add by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet */ 234 + /* Set MAC register value according operation mode */ 235 235 #define RTMP_UPDATE_PROTECT(pAd) \ 236 236 AsicUpdateProtect(pAd, 0, (ALLN_SETPROTECT), TRUE, 0); 237 - // end johnli 237 + /* end johnli */ 238 238 239 - // remove Pair-wise key material from ASIC 239 + /* remove Pair-wise key material from ASIC */ 240 240 #define RTMP_STA_ENTRY_KEY_DEL(pAd, BssIdx, Wcid) \ 241 241 AsicRemovePairwiseKeyEntry(pAd, BssIdx, (u8)Wcid); 242 242 243 - // add Client security information into ASIC WCID table and IVEIV table 243 + /* add Client security information into ASIC WCID table and IVEIV table */ 244 244 #define RTMP_STA_SECURITY_INFO_ADD(pAd, apidx, KeyID, pEntry) \ 245 245 RTMPAddWcidAttributeEntry(pAd, apidx, KeyID, \ 246 246 pAd->SharedKey[apidx][KeyID].CipherAlg, pEntry); ··· 257 257 pAd->SharedKey[apidx][KeyID].CipherAlg, \ 258 258 pEntry); } 259 259 260 - // Insert the BA bitmap to ASIC for the Wcid entry 260 + /* Insert the BA bitmap to ASIC for the Wcid entry */ 261 261 #define RTMP_ADD_BA_SESSION_TO_ASIC(_pAd, _Aid, _TID) \ 262 262 do{ \ 263 263 u32 _Value = 0, _Offset; \ ··· 267 267 RTMP_IO_WRITE32((_pAd), _Offset, _Value);\ 268 268 }while(0) 269 269 270 - // Remove the BA bitmap from ASIC for the Wcid entry 271 - // bitmap field starts at 0x10000 in ASIC WCID table 270 + /* Remove the BA bitmap from ASIC for the Wcid entry */ 271 + /* bitmap field starts at 0x10000 in ASIC WCID table */ 272 272 #define RTMP_DEL_BA_SESSION_FROM_ASIC(_pAd, _Wcid, _TID) \ 273 273 do{ \ 274 274 u32 _Value = 0, _Offset; \ ··· 280 280 281 281 /* ----------------- Interface Related MACRO ----------------- */ 282 282 283 - // 284 - // Enable & Disable NIC interrupt via writing interrupt mask register 285 - // Since it use ADAPTER structure, it have to be put after structure definition. 286 - // 283 + /* */ 284 + /* Enable & Disable NIC interrupt via writing interrupt mask register */ 285 + /* Since it use ADAPTER structure, it have to be put after structure definition. */ 286 + /* */ 287 287 #define RTMP_ASIC_INTERRUPT_DISABLE(_pAd) \ 288 288 do{ \ 289 289 RTMP_IO_WRITE32((_pAd), INT_MASK_CSR, 0x0); /* 0: disable */ \ ··· 324 324 /* ----------------- Power Save Related MACRO ----------------- */ 325 325 #define RTMP_PS_POLL_ENQUEUE(pAd) EnqueuePsPoll(pAd) 326 326 327 - // For RTMPPCIePowerLinkCtrlRestore () function 327 + /* For RTMPPCIePowerLinkCtrlRestore () function */ 328 328 #define RESTORE_HALT 1 329 329 #define RESTORE_WAKEUP 2 330 330 #define RESTORE_CLOSE 3 ··· 352 352 #define RTMP_MLME_RADIO_OFF(pAd) \ 353 353 RT28xxPciMlmeRadioOFF(pAd); 354 354 355 - #endif //__MAC_PCI_H__ // 355 + #endif /*__MAC_PCI_H__ // */