From: Katja Collier Date: Fri, 17 May 2013 13:35:08 +0000 (+0200) Subject: staging: improved comment style in ft1000_ioctl.h X-Git-Tag: v3.11-rc1~158^2~574 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=312d261e12908ba7f877eb583406dec970907bcf;p=~emulex%2Finfiniband.git staging: improved comment style in ft1000_ioctl.h Replaced C99 style comments with C89 in "/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h". Signed-off-by: Katja Collier Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h b/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h index 3f4207fd159..39bd9c8e03f 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h @@ -1,28 +1,30 @@ -//--------------------------------------------------------------------------- -// FT1000 driver for Flarion Flash OFDM NIC Device -// -// Copyright (C) 2002 Flarion Technologies, All rights reserved. -// -// This program is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2 of the License, or (at your option) any -// later version. This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -// more details. You should have received a copy of the GNU General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - -// Suite 330, Boston, MA 02111-1307, USA. -//--------------------------------------------------------------------------- -// -// File: ft1000_ioctl.h -// -// Description: Common structures and defines relating to IOCTL -// -// History: -// 11/5/02 Whc Created. -// -//---------------------------------------------------------------------------//--------------------------------------------------------------------------- +/* +*--------------------------------------------------------------------------- +* FT1000 driver for Flarion Flash OFDM NIC Device +* +* Copyright (C) 2002 Flarion Technologies, All rights reserved. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the Free +* Software Foundation; either version 2 of the License, or (at your option) any +* later version. This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - +* Suite 330, Boston, MA 02111-1307, USA. +*--------------------------------------------------------------------------- +* +* File: ft1000_ioctl.h +* +* Description: Common structures and defines relating to IOCTL +* +* History: +* 11/5/02 Whc Created. +* +*---------------------------------------------------------------------------//--------------------------------------------------------------------------- +*/ #ifndef _FT1000IOCTLH_ #define _FT1000IOCTLH_ @@ -31,45 +33,45 @@ typedef struct _IOCTL_GET_VER unsigned long drv_ver; } __attribute__ ((packed)) IOCTL_GET_VER, *PIOCTL_GET_VER; -//Data structure for Dsp statistics +/* Data structure for Dsp statistics */ typedef struct _IOCTL_GET_DSP_STAT { - unsigned char DspVer[DSPVERSZ]; // DSP version number - unsigned char HwSerNum[HWSERNUMSZ]; // Hardware Serial Number - unsigned char Sku[SKUSZ]; // SKU - unsigned char eui64[EUISZ]; // EUI64 - unsigned short ConStat; // Connection Status - // Bits 0-3 = Connection Status Field - // 0000=Idle (Disconnect) - // 0001=Searching - // 0010=Active (Connected) - // 0011=Waiting for L2 down - // 0100=Sleep - unsigned short LedStat; // Led Status - // Bits 0-3 = Signal Strength Field - // 0000 = -105dBm to -92dBm - // 0001 = -92dBm to -85dBm - // 0011 = -85dBm to -75dBm - // 0111 = -75dBm to -50dBm - // 1111 = -50dBm to 0dBm - // Bits 4-7 = Reserved - // Bits 8-11 = SNR Field - // 0000 = <2dB - // 0001 = 2dB to 8dB - // 0011 = 8dB to 15dB - // 0111 = 15dB to 22dB - // 1111 = >22dB - // Bits 12-15 = Reserved - unsigned long nTxPkts; // Number of packets transmitted from host to dsp - unsigned long nRxPkts; // Number of packets received from dsp to host - unsigned long nTxBytes; // Number of bytes transmitted from host to dsp - unsigned long nRxBytes; // Number of bytes received from dsp to host - unsigned long ConTm; // Current session connection time in seconds - unsigned char CalVer[CALVERSZ]; // Proprietary Calibration Version - unsigned char CalDate[CALDATESZ]; // Proprietary Calibration Date + unsigned char DspVer[DSPVERSZ]; /* DSP version number */ + unsigned char HwSerNum[HWSERNUMSZ]; /* Hardware Serial Number */ + unsigned char Sku[SKUSZ]; /* SKU */ + unsigned char eui64[EUISZ]; /* EUI64 */ + unsigned short ConStat; /* Connection Status */ + /* Bits 0-3 = Connection Status Field */ + /* 0000=Idle (Disconnect) */ + /* 0001=Searching */ + /* 0010=Active (Connected) */ + /* 0011=Waiting for L2 down */ + /* 0100=Sleep */ + unsigned short LedStat; /* Led Status */ + /* Bits 0-3 = Signal Strength Field */ + /* 0000 = -105dBm to -92dBm */ + /* 0001 = -92dBm to -85dBm */ + /* 0011 = -85dBm to -75dBm */ + /* 0111 = -75dBm to -50dBm */ + /* 1111 = -50dBm to 0dBm */ + /* Bits 4-7 = Reserved */ + /* Bits 8-11 = SNR Field */ + /* 0000 = <2dB */ + /* 0001 = 2dB to 8dB */ + /* 0011 = 8dB to 15dB */ + /* 0111 = 15dB to 22dB */ + /* 1111 = >22dB */ + /* Bits 12-15 = Reserved */ + unsigned long nTxPkts; /* Number of packets transmitted from host to dsp */ + unsigned long nRxPkts; /* Number of packets received from dsp to host */ + unsigned long nTxBytes; /* Number of bytes transmitted from host to dsp */ + unsigned long nRxBytes; /* Number of bytes received from dsp to host */ + unsigned long ConTm; /* Current session connection time in seconds */ + unsigned char CalVer[CALVERSZ]; /* Proprietary Calibration Version */ + unsigned char CalDate[CALDATESZ]; /* Proprietary Calibration Date */ } __attribute__ ((packed)) IOCTL_GET_DSP_STAT, *PIOCTL_GET_DSP_STAT; -//Data structure for Dual Ported RAM messaging between Host and Dsp +/* Data structure for Dual Ported RAM messaging between Host and Dsp */ typedef struct _IOCTL_DPRAM_BLK { unsigned short total_len; @@ -83,9 +85,9 @@ typedef struct _IOCTL_DPRAM_COMMAND IOCTL_DPRAM_BLK dpram_blk; } __attribute__ ((packed)) IOCTL_DPRAM_COMMAND, *PIOCTL_DPRAM_COMMAND; -// -// Custom IOCTL command codes -// +/* +* Custom IOCTL command codes +*/ #define FT1000_MAGIC_CODE 'F' #define IOCTL_REGISTER_CMD 0 @@ -103,5 +105,5 @@ typedef struct _IOCTL_DPRAM_COMMAND #define IOCTL_FT1000_SET_DPRAM _IOW (FT1000_MAGIC_CODE, IOCTL_SET_DPRAM_CMD, sizeof(IOCTL_DPRAM_BLK) ) #define IOCTL_FT1000_GET_DPRAM _IOR (FT1000_MAGIC_CODE, IOCTL_GET_DPRAM_CMD, sizeof(IOCTL_DPRAM_BLK) ) #define IOCTL_FT1000_REGISTER _IOW (FT1000_MAGIC_CODE, IOCTL_REGISTER_CMD, sizeof(unsigned short *) ) -#endif // _FT1000IOCTLH_ +#endif /* _FT1000IOCTLH_ */