diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-22 08:34:49 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-22 08:34:49 -0700 |
commit | bf3146c8652c32bd5c9b12eaf5e133e6fb4d0739 (patch) | |
tree | cf10ac7581d62f09c4663def54c483759ff99600 | |
parent | 43589a832d3189afaaa0efd30a10a16f15891425 (diff) |
Staging: ft1000: remove trailing whitespace
Lots of trailing whitespace was removed
Cc: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/ft1000/Kconfig | 4 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/boot.h | 26 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 60 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 14 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h | 18 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 28 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 82 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 4 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 212 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_download.c | 202 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 756 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 30 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 64 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 52 |
14 files changed, 776 insertions, 776 deletions
diff --git a/drivers/staging/ft1000/Kconfig b/drivers/staging/ft1000/Kconfig index 7c8af886dd5..c54b4e83d6e 100644 --- a/drivers/staging/ft1000/Kconfig +++ b/drivers/staging/ft1000/Kconfig @@ -5,7 +5,7 @@ if FT1000 config FT1000_USB tristate "Driver for ft1000 usb devices." - depends on USB + depends on USB depends on NET help Say Y if you want to have support for Qleadtek FLASH-OFDM USB Modem [LR7F04], @@ -13,7 +13,7 @@ config FT1000_USB config FT1000_PCMCIA tristate "Driver for ft1000 pcmcia device." - depends on PCMCIA + depends on PCMCIA depends on NET help Say Y if you want to have support for Flarion card also called diff --git a/drivers/staging/ft1000/ft1000-pcmcia/boot.h b/drivers/staging/ft1000/ft1000-pcmcia/boot.h index c376daeec0c..1fc4ac12e24 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/boot.h +++ b/drivers/staging/ft1000/ft1000-pcmcia/boot.h @@ -3,21 +3,21 @@ // // Copyright (C) 2002 Flarion Technologies, All rights reserved. // -// This program is free software; you can redistribute it and/or modify it +// 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. +// 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: boot.h // -// Description: boatloader +// Description: boatloader // // History: // 1/11/05 Whc Ported to Linux. @@ -27,7 +27,7 @@ #define _BOOTH_ // Official bootloader -unsigned char bootimage [] = { +unsigned char bootimage [] = { 0x00,0x00,0x01,0x5E,0x00,0x00 ,0x00,0x00,0x00,0x00,0x02,0xD7 ,0x00,0x00,0x01,0x5E,0x46,0xB3 @@ -152,7 +152,7 @@ unsigned char bootimage [] = { ,0x01,0x00,0x00,0xAE,0x62,0xE4 ,0xE5,0x61,0x04,0x48,0x04,0xE5 ,0x63,0x05,0x48,0x04,0x20,0x20 -,0x00,0x00,0x00,0x00 -}; +,0x00,0x00,0x00,0x00 +}; #endif diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h index 93b0ad35102..61e1cfc8044 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000.h @@ -3,16 +3,16 @@ // // Copyright (C) 2002 Flarion Technologies, All rights reserved. // -// This program is free software; you can redistribute it and/or modify it +// 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. +// 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.h @@ -41,7 +41,7 @@ #define CALVERSZ 2 #define CALDATESZ 6 -// Pseudo Header structure +// Pseudo Header structure typedef struct _PSEUDO_HDR { unsigned short length; // length of msg body @@ -58,7 +58,7 @@ typedef struct _PSEUDO_HDR // Dsp Loader = 0xa0 // Dsp MIP = 0xb0 unsigned char portsrc; // software source port id (refer to portdest) - unsigned short sh_str_id; // not used + unsigned short sh_str_id; // not used unsigned char control; // not used unsigned char rsvd1; unsigned char seq_num; // message sequence number @@ -78,7 +78,7 @@ typedef struct _PSEUDO_HDR #define PCHAR u8 * #define UINT u32 -#define ELECTRABUZZ_ID 0 // ASIC ID for Electrabuzz +#define ELECTRABUZZ_ID 0 // ASIC ID for Electrabuzz #define MAGNEMITE_ID 0x1a01 // ASIC ID for Magnemite // MEMORY MAP common to both ELECTRABUZZ and MAGNEMITE @@ -89,7 +89,7 @@ typedef struct _PSEUDO_HDR #define FT1000_REG_SUP_ISR 0x0026 // HISR - Host Interrupt Status Register #define FT1000_REG_SUP_IMASK 0x0028 // HIMASK - Host Interrupt Mask #define FT1000_REG_DOORBELL 0x002a // DBELL - Door Bell Register -#define FT1000_REG_ASIC_ID 0x002e // ASICID - ASIC Identification Number +#define FT1000_REG_ASIC_ID 0x002e // ASICID - ASIC Identification Number // (Electrabuzz=0 Magnemite=0x1A01) // MEMORY MAP FOR ELECTRABUZZ ASIC @@ -113,10 +113,10 @@ typedef struct _PSEUDO_HDR #define FT1000_REG_MAG_DFRL 0x0008 // DFRL - Downlink FIFO Register low-word (16-bits) #define FT1000_REG_MAG_DFRH 0x000a // DFRH - Downlink FIFO Register high-word (16-bits) #define FT1000_REG_MAG_DFSR 0x000c // DFSR - Downlink FIFO Status Register -#define FT1000_REG_MAG_DPDATA 0x0010 // DPDATA - Dual Port RAM Indirect Data Register (32-bits) +#define FT1000_REG_MAG_DPDATA 0x0010 // DPDATA - Dual Port RAM Indirect Data Register (32-bits) #define FT1000_REG_MAG_DPDATAL 0x0010 // DPDATAL - Dual Port RAM Indirect Data Register low-word (16-bits) #define FT1000_REG_MAG_DPDATAH 0x0012 // DPDATAH - Dual Port RAM Indirect Data Register high-word (16-bits) -#define FT1000_REG_MAG_WATERMARK 0x002c // WMARK - Watermark Register +#define FT1000_REG_MAG_WATERMARK 0x002c // WMARK - Watermark Register // Reserved Dual Port RAM offsets for Electrabuzz #define FT1000_DPRAM_TX_BASE 0x0002 // Host to PC Card Messaging Area @@ -136,7 +136,7 @@ typedef struct _PSEUDO_HDR #define FT1000_DPRAM_MAG_TX_BASE 0x0000 // Host to PC Card Messaging Area #define FT1000_DPRAM_MAG_RX_BASE 0x0200 // PC Card to Host Messaging Area #define FT1000_MAG_FIFO_LEN 0x1FF // total length for DSP FIFO tracking -#define FT1000_MAG_FIFO_LEN_INDX 0x1 // low-word index +#define FT1000_MAG_FIFO_LEN_INDX 0x1 // low-word index #define FT1000_MAG_HI_HO 0x1FF // heartbeat with HI/HO #define FT1000_MAG_HI_HO_INDX 0x0 // high-word index #define FT1000_MAG_DSP_LED 0x3FE // dsp led status for PAD device @@ -161,7 +161,7 @@ typedef struct _PSEUDO_HDR #define FT1000_MAG_DSP_TIMER3_INDX 0x0 #define FT1000_MAG_TOTAL_LEN 0x200 -#define FT1000_MAG_TOTAL_LEN_INDX 0x1 +#define FT1000_MAG_TOTAL_LEN_INDX 0x1 #define FT1000_MAG_PH_LEN 0x200 #define FT1000_MAG_PH_LEN_INDX 0x0 @@ -173,17 +173,17 @@ typedef struct _PSEUDO_HDR #define HOST_INTF_BE 0x1 // Host interface big endian mode // PC Card to Host Doorbell assignments -#define FT1000_DB_DPRAM_RX 0x0001 // this value indicates that DSP has - // data for host in DPRAM +#define FT1000_DB_DPRAM_RX 0x0001 // this value indicates that DSP has + // data for host in DPRAM #define FT1000_ASIC_RESET_REQ 0x0004 // DSP requesting host to reset the ASIC #define FT1000_DSP_ASIC_RESET 0x0008 // DSP indicating host that it will reset the ASIC #define FT1000_DB_COND_RESET 0x0010 // DSP request for a card reset. // Host to PC Card Doorbell assignments -#define FT1000_DB_DPRAM_TX 0x0100 // this value indicates that host has - // data for DSP in DPRAM. +#define FT1000_DB_DPRAM_TX 0x0100 // this value indicates that host has + // data for DSP in DPRAM. #define FT1000_ASIC_RESET_DSP 0x0400 // Responds to FT1000_ASIC_RESET_REQ -#define FT1000_DB_HB 0x1000 // Indicates that supervisor +#define FT1000_DB_HB 0x1000 // Indicates that supervisor // has a heartbeat message for DSP. #define FT1000_DPRAM_BASE 0x0000 // Dual Port RAM starting offset @@ -201,27 +201,27 @@ typedef struct _PSEUDO_HDR // Indicate the cause of an interrupt. // #define ISR_EMPTY 0x00 // no bits set -#define ISR_DOORBELL_ACK 0x01 // Doorbell acknowledge from DSP +#define ISR_DOORBELL_ACK 0x01 // Doorbell acknowledge from DSP #define ISR_DOORBELL_PEND 0x02 // Doorbell pending from DSP #define ISR_RCV 0x04 // Packet available in Downlink FIFO -#define ISR_WATERMARK 0x08 // Watermark requirements satisfied +#define ISR_WATERMARK 0x08 // Watermark requirements satisfied // Bit field definition for Host Interrupt Mask #define ISR_MASK_NONE 0x0000 // no bits set #define ISR_MASK_DOORBELL_ACK 0x0001 // Doorbell acknowledge mask #define ISR_MASK_DOORBELL_PEND 0x0002 // Doorbell pending mask #define ISR_MASK_RCV 0x0004 // Downlink Packet available mask -#define ISR_MASK_WATERMARK 0x0008 // Watermark interrupt mask +#define ISR_MASK_WATERMARK 0x0008 // Watermark interrupt mask #define ISR_MASK_ALL 0xffff // Mask all interrupts // Bit field definition for Host Control Register #define DSP_RESET_BIT 0x0001 // Bit field to control dsp reset state // (0 = out of reset 1 = reset) #define ASIC_RESET_BIT 0x0002 // Bit field to control ASIC reset state - // (0 = out of reset 1 = reset) + // (0 = out of reset 1 = reset) -// Default interrupt mask (Enable Doorbell pending and Packet available interrupts) -#define ISR_DEFAULT_MASK 0x7ff9 +// Default interrupt mask (Enable Doorbell pending and Packet available interrupts) +#define ISR_DEFAULT_MASK 0x7ff9 // Application specific IDs #define DSPID 0x20 @@ -241,7 +241,7 @@ typedef struct _PSEUDO_HDR #define MAX_DSP_SESS_REC 1024 -#define DSP_QID_OFFSET 4 +#define DSP_QID_OFFSET 4 #define PSEUDOSZ 16 #define PSEUDOSZWRD 8 @@ -299,7 +299,7 @@ typedef struct _MEDIAMSG { u16 state; u32 ip_addr; u32 net_mask; - u32 gateway; + u32 gateway; u32 dns_1; u32 dns_2; } __attribute__ ((packed)) MEDIAMSG, *PMEDIAMSG; diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c index 20a663ddc90..2163eae295f 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c @@ -13,7 +13,7 @@ by Wai Chan (w.chan@flarion.com). Port for kernel 2.6 created by Patrik Ostrihon (patrik.ostrihon@pwc.sk) - + 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 @@ -182,7 +182,7 @@ static int get_tuple_next(struct pcmcia_device *link, tuple_t * tuple, /*====================================================================== - + ======================================================================*/ static int ft1000_attach(struct pcmcia_device *link) @@ -247,7 +247,7 @@ static void ft1000_detach(struct pcmcia_device *link) ft1000_config() is scheduled to run after a CARD_INSERTION event is received, to configure the PCMCIA socket, and to make the device available to the system. - + ======================================================================*/ #define CS_CHECK(fn, ret) \ @@ -348,7 +348,7 @@ static int ft1000_config(struct pcmcia_device * link) if (last_ret != CS_SUCCESS) { cs_error(link, RequestIO, last_ret); goto failed; - } + } /* Allocate an interrupt line. Note that this does not assign a @@ -415,7 +415,7 @@ failed: After a card is removed, ft1000_release() will unregister the device, and release the PCMCIA configuration. If the device is still open, this will be postponed until it is closed. - + ======================================================================*/ static void ft1000_release(struct pcmcia_device * link) @@ -434,7 +434,7 @@ static void ft1000_release(struct pcmcia_device * link) /* In a normal driver, additional code may be needed to release - other kernel data structures associated with this device. + other kernel data structures associated with this device. */ /* Don't bother checking to see if these succeed or not */ @@ -451,7 +451,7 @@ static void ft1000_release(struct pcmcia_device * link) private flag to block future accesses to this device. All the functions that actually access the device should check this flag to make sure the card is still present. - + ======================================================================*/ static int ft1000_suspend(struct pcmcia_device *link) diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h index 1c9d163ad3e..4a89bd1bbf7 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h @@ -3,16 +3,16 @@ // // Copyright (C) 2002 Flarion Technologies, All rights reserved. // -// This program is free software; you can redistribute it and/or modify it +// 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. +// 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_dev.h diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c index be9c749d5ed..0bf398d570d 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c @@ -1,23 +1,23 @@ /*--------------------------------------------------------------------------- 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 + + 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. + 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. -------------------------------------------------------------------------- - Description: This module will handshake with the DSP bootloader to + Description: This module will handshake with the DSP bootloader to download the DSP runtime image. - + ---------------------------------------------------------------------------*/ #define __KERNEL_SYSCALLS__ @@ -890,7 +890,7 @@ int card_download(struct net_device *dev, void *pFileStart, UINT FileLength) memcpy(pbuffer, (void *)pUcFile, (UINT) (usHdrLength + sizeof(PSEUDO_HDR))); - // link provisioning data + // link provisioning data pprov_record = kmalloc(sizeof(PROV_RECORD), GFP_ATOMIC); diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c index d168a73e4e4..a6ba84c242d 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c @@ -1,20 +1,20 @@ /*--------------------------------------------------------------------------- FT1000 driver for Flarion Flash OFDM NIC Device - + Copyright (C) 2002 Flarion Technologies, All rights reserved. Copyright (C) 2006 Patrik Ostrihon, All rights reserved. Copyright (C) 2006 ProWeb Consulting, a.s, All rights reserved. - - This program is free software; you can redistribute it and/or modify it + + 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. + 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. -----------------------------------------------------------------------------*/ #include <linux/kernel.h> @@ -86,7 +86,7 @@ MODULE_SUPPORTED_DEVICE("FT1000"); //--------------------------------------------------------------------------- // // Function: ft1000_asic_read -// Descripton: This function will retrieve the value of a specific ASIC +// Descripton: This function will retrieve the value of a specific ASIC // register. // Input: // dev - network device structure @@ -120,7 +120,7 @@ inline void ft1000_asic_write(struct net_device *dev, u16 offset, u16 value) //--------------------------------------------------------------------------- // // Function: ft1000_read_fifo_len -// Descripton: This function will read the ASIC Uplink FIFO status register +// Descripton: This function will read the ASIC Uplink FIFO status register // which will return the number of bytes remaining in the Uplink FIFO. // Sixteen bytes are subtracted to make sure that the ASIC does not // reach its threshold. @@ -409,7 +409,7 @@ static void ft1000_reset_asic(struct net_device *dev) // dev - device structure // Output: // status - FALSE (card reset fail) -// TRUE (card reset successful) +// TRUE (card reset successful) // //--------------------------------------------------------------------------- static int ft1000_reset_card(struct net_device *dev) @@ -449,7 +449,7 @@ static int ft1000_reset_card(struct net_device *dev) (DSP_RESET_BIT | ASIC_RESET_BIT)); } - // Copy DSP session record into info block if this is not a coldstart + // Copy DSP session record into info block if this is not a coldstart if (ft1000_card_present == 1) { spin_lock_irqsave(&info->dpram_lock, flags); if (info->AsicID == ELECTRABUZZ_ID) { @@ -573,7 +573,7 @@ static int ft1000_reset_card(struct net_device *dev) // dev - device structure // Output: // status - FALSE (device is not present) -// TRUE (device is present) +// TRUE (device is present) // //--------------------------------------------------------------------------- static int ft1000_chkcard(struct net_device *dev) @@ -640,7 +640,7 @@ static void ft1000_hbchk(u_long data) else { tempword = ntohs(ft1000_read_dpram_mag_16(dev, FT1000_MAG_HI_HO, FT1000_MAG_HI_HO_INDX)); } - } + } if (tempword != ho) { printk(KERN_INFO "ft1000: heartbeat failed - no ho detected\n"); @@ -689,7 +689,7 @@ static void ft1000_hbchk(u_long data) // Let's check doorbell again if fail if (tempword & FT1000_DB_HB) { tempword = ft1000_read_reg(dev, FT1000_REG_DOORBELL); - } + } if (tempword & FT1000_DB_HB) { printk(KERN_INFO "ft1000: heartbeat doorbell not clear by firmware\n"); @@ -733,7 +733,7 @@ static void ft1000_hbchk(u_long data) add_timer(&poll_timer); return; } - // Set dedicated area to hi and ring appropriate doorbell according + // Set dedicated area to hi and ring appropriate doorbell according // to hi/ho heartbeat protocol if (info->AsicID == ELECTRABUZZ_ID) { ft1000_write_dpram(dev, FT1000_HI_HO, hi); @@ -765,9 +765,9 @@ static void ft1000_hbchk(u_long data) else { tempword = ntohs(ft1000_read_dpram_mag_16(dev, FT1000_MAG_HI_HO, FT1000_MAG_HI_HO_INDX)); } - + } - + if (tempword != hi) { printk(KERN_INFO "ft1000: heartbeat failed - cannot write hi into DPRAM\n"); @@ -824,7 +824,7 @@ static void ft1000_hbchk(u_long data) //--------------------------------------------------------------------------- // // Function: ft1000_send_cmd -// Descripton: +// Descripton: // Input: // Output: // @@ -904,7 +904,7 @@ void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qt //--------------------------------------------------------------------------- // // Function: ft1000_receive_cmd -// Descripton: This function will read a message from the dpram area. +// Descripton: This function will read a message from the dpram area. // Input: // dev - network device structure // pbuffer - caller supply address to buffer @@ -1105,7 +1105,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) netif_carrier_off(dev); netif_stop_queue(dev); info->ConTm = 0; - } + } } } else { @@ -1196,7 +1196,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) ppseudo_hdr->qos_class = 0; // Insert slow queue sequence number ppseudo_hdr->seq_num = info->squeseqnum++; - // Insert application id + // Insert application id ppseudo_hdr->portsrc = 0; // Calculate new checksum ppseudo_hdr->checksum = *pmsg++; @@ -1244,7 +1244,7 @@ void ft1000_proc_drvmsg(struct net_device *dev) ppseudo_hdr->qos_class = 0; // Insert slow queue sequence number ppseudo_hdr->seq_num = info->squeseqnum++; - // Insert application id + // Insert application id ppseudo_hdr->portsrc = 0; // Calculate new checksum ppseudo_hdr->checksum = *pmsg++; @@ -1286,8 +1286,8 @@ void ft1000_proc_drvmsg(struct net_device *dev) // Input: // dev - device structure // Output: -// status - FAILURE -// SUCCESS +// status - FAILURE +// SUCCESS // //--------------------------------------------------------------------------- int ft1000_parse_dpram_msg(struct net_device *dev) @@ -1392,7 +1392,7 @@ int ft1000_parse_dpram_msg(struct net_device *dev) } if (doorbell & FT1000_DB_COND_RESET) { - // Reset ASIC and DSP + // Reset ASIC and DSP if (info->AsicID == ELECTRABUZZ_ID) { info->DSP_TIME[0] = ft1000_read_dpram(dev, FT1000_DSP_TIMER0); @@ -1583,14 +1583,14 @@ static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum) //--------------------------------------------------------------------------- // // Function: ft1000_copy_up_pkt -// Descripton: This function will pull Flarion packets out of the Downlink +// Descripton: This function will pull Flarion packets out of the Downlink // FIFO and convert it to an ethernet packet. The ethernet packet will // then be deliver to the TCP/IP stack. // Input: // dev - device structure // Output: -// status - FAILURE -// SUCCESS +// status - FAILURE +// SUCCESS // //--------------------------------------------------------------------------- int ft1000_copy_up_pkt(struct net_device *dev) @@ -1767,16 +1767,16 @@ int ft1000_copy_up_pkt(struct net_device *dev) //--------------------------------------------------------------------------- // // Function: ft1000_copy_down_pkt -// Descripton: This function will take an ethernet packet and convert it to -// a Flarion packet prior to sending it to the ASIC Downlink +// Descripton: This function will take an ethernet packet and convert it to +// a Flarion packet prior to sending it to the ASIC Downlink // FIFO. // Input: // dev - device structure // packet - address of ethernet packet // len - length of IP packet // Output: -// status - FAILURE -// SUCCESS +// status - FAILURE +// SUCCESS // //--------------------------------------------------------------------------- int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len) @@ -1792,7 +1792,7 @@ int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len) DEBUG(1, "ft1000_hw: copy_down_pkt()\n"); - // Check if there is room on the FIFO + // Check if there is room on the FIFO if (len > ft1000_read_fifo_len(dev)) { udelay(10); if (len > ft1000_read_fifo_len(dev)) { @@ -1841,12 +1841,12 @@ int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len) // Production Mode if (info->AsicID == ELECTRABUZZ_ID) { - // copy first word to UFIFO_BEG reg + // copy first word to UFIFO_BEG reg ft1000_write_reg(dev, FT1000_REG_UFIFO_BEG, pseudo.buff[0]); DEBUG(1, "ft1000_hw:ft1000_copy_down_pkt:data 0 BEG = 0x%04x\n", pseudo.buff[0]); - // copy subsequent words to UFIFO_MID reg + // copy subsequent words to UFIFO_MID reg ft1000_write_reg(dev, FT1000_REG_UFIFO_MID, pseudo.buff[1]); DEBUG(1, "ft1000_hw:ft1000_copy_down_pkt:data 1 MID = 0x%04x\n", pseudo.buff[1]); @@ -1879,7 +1879,7 @@ int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len) packet++; } - // Check for odd byte + // Check for odd byte if (len & 0x0001) { ft1000_write_reg(dev, FT1000_REG_UFIFO_MID, htons(*packet)); @@ -1923,7 +1923,7 @@ int ft1000_copy_down_pkt(struct net_device *dev, u16 * packet, u16 len) outl(*plong++, dev->base_addr + FT1000_REG_MAG_UFDR); } - // Check for odd alignment + // Check for odd alignment if (len & 0x0003) { DEBUG(1, "ft1000_hw:ft1000_copy_down_pkt:data = 0x%8x\n", diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c index 94b2755a335..b45de9bc1b2 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c @@ -1,9 +1,9 @@ /*--------------------------------------------------------------------------- FT1000 driver for Flarion Flash OFDM NIC Device - + Copyright (C) 2006 Patrik Ostrihon, All rights reserved. Copyright (C) 2006 ProWeb Consulting, a.s, 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 diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c index 5e75ee84486..65087cea302 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c @@ -3,16 +3,16 @@ // // Copyright (C) 2006 Flarion Technologies, All rights reserved. // -// This program is free software; you can redistribute it and/or modify it +// 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. +// 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_chdev.c @@ -49,10 +49,10 @@ extern inline u16 ft1000_asic_read (struct net_device *dev, u16 offset); extern inline void ft1000_asic_write (struct net_device *dev, u16 offset, u16 value); extern void CardSendCommand(struct ft1000_device *ft1000dev, unsigned short *ptempbuffer, int size); -static int ft1000_ChOpen (struct inode *Inode, struct file *File); +static int ft1000_ChOpen (struct inode *Inode, struct file *File); static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait); static int ft1000_ChIoctl(struct file *File, unsigned int Command, - unsigned long Argument); + unsigned long Argument); static int ft1000_ChRelease (struct inode *Inode, struct file *File); static int ft1000_flarion_cnt = 0; @@ -69,7 +69,7 @@ static struct ft1000_device *pdevobj[MAX_NUM_CARDS + 2]; struct list_head freercvpool; // lock to arbitrate free buffer list for receive command data -spinlock_t free_buff_lock; +spinlock_t free_buff_lock; int numofmsgbuf = 0; @@ -82,8 +82,8 @@ int numofmsgbuf = 0; static struct file_operations ft1000fops = { unlocked_ioctl: ft1000_ChIoctl, - poll: ft1000_ChPoll, - open: ft1000_ChOpen, + poll: ft1000_ChPoll, + open: ft1000_ChOpen, release: ft1000_ChRelease }; @@ -93,7 +93,7 @@ static struct file_operations ft1000fops = //--------------------------------------------------------------------------- // Function: exec_mknod // -// Parameters: +// Parameters: // // Returns: // @@ -102,12 +102,12 @@ static struct file_operations ft1000fops = // Notes: // //--------------------------------------------------------------------------- -static int exec_mknod (void *pdata) +static int exec_mknod (void *pdata) { PFT1000_INFO info; char mjnum[4]; char minornum[4]; - char temp[32]; + char temp[32]; int retcode; // int i; //aelias [-] reason : unused variable char *envp[] = { "HOME=/", "PATH=/usr/bin:/bin", NULL }; @@ -118,20 +118,20 @@ static int exec_mknod (void *pdata) sprintf(temp, "%s%s", "/dev/", info->DeviceName) ; sprintf(mjnum, "%d", info->DeviceMajor); sprintf(minornum, "%d", info->CardNumber); - + //char *argv[]={"mknod","-m 666",temp,"c",mjnum,minornum,NULL}; // char *argv[] |