drivers: staging: ft1000: Improve coding style
v2 cover drivers: staging: ft1000: Improve coding style
Hey Joe,
I've made the changes you requested. Each fix is now made in a separate patch.
This patch set fixes the ft1000 header files only. The inclusion of one .c file (ft1000_debug.c) is caused by typedef removal.
Patch set includes:
- Indentation fixes;
- Fixes of IOCTL_FT1000_* marcos;
- Using pr_info instead of printk;
- Removal of typedefs;
- Fix of lines over 80 characters.
Thanks,
-Artem
PATCH v2 1/5 drivers: staging: ft1000: Fix indentation
Indentation fixes in header files. Actually only in ft1000-usb/ft1000_ioctl.h. Other headers look good.
--- drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 92 +++++++++++----------- 1 file changed, 46 insertions(+), 46 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +46 -46
@@ -23,62 +23,62 @@* History: * 11/5/02 Whc Created. * -*---------------------------------------------------------------------------//--------------------------------------------------------------------------- +*--------------------------------------------------------------------------- */ #ifndef _FT1000IOCTLH_#define _FT1000IOCTLH_typedef struct _IOCTL_GET_VER { -unsigned long drv_ver; +unsigned long drv_ver; } __packed IOCTL_GET_VER, *PIOCTL_GET_VER;/* 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 */ } __packed IOCTL_GET_DSP_STAT, *PIOCTL_GET_DSP_STAT;/* Data structure for Dual Ported RAM messaging between Host and Dsp */ typedef struct _IOCTL_DPRAM_BLK { -unsigned short total_len; +unsigned short total_len;struct pseudo_hdr pseudohdr; -unsigned char buffer[1780 ]; +unsigned char buffer[1780 ]; } __packed IOCTL_DPRAM_BLK, *PIOCTL_DPRAM_BLK;typedef struct _IOCTL_DPRAM_COMMAND { -unsigned short extra; -IOCTL_DPRAM_BLK dpram_blk; +unsigned short extra; +IOCTL_DPRAM_BLK dpram_blk; } __packed IOCTL_DPRAM_COMMAND, *PIOCTL_DPRAM_COMMAND;/*
@@ -86,13 +86,13 @@ typedef struct _IOCTL_DPRAM_COMMAND {*/ #define FT1000_MAGIC_CODE 'F' -#define IOCTL_REGISTER_CMD 0 -#define IOCTL_SET_DPRAM_CMD 3 -#define IOCTL_GET_DPRAM_CMD 4 -#define IOCTL_GET_DSP_STAT_CMD 6 -#define IOCTL_GET_VER_CMD 7 -#define IOCTL_CONNECT 10 -#define IOCTL_DISCONNECT 11 +#define IOCTL_REGISTER_CMD 0 +#define IOCTL_SET_DPRAM_CMD 3 +#define IOCTL_GET_DPRAM_CMD 4 +#define IOCTL_GET_DSP_STAT_CMD 6 +#define IOCTL_GET_VER_CMD 7 +#define IOCTL_CONNECT 10 +#define IOCTL_DISCONNECT 11#define IOCTL_FT1000_GET_DSP_STAT _IOR(FT1000_MAGIC_CODE, IOCTL_GET_DSP_STAT_CMD, sizeof(IOCTL_GET_DSP_STAT)#define IOCTL_FT1000_GET_VER _IOR(FT1000_MAGIC_CODE, IOCTL_GET_VER_CMD, sizeof(IOCTL_GET_VER)
Signature · 1 line
1.7.10.4
PATCH v2 2/5 drivers: staging: ft1000: Fix IOCTL_FT1000_* marcos
In reply to Artem FetishevFixes include:
- Add closing brackets;
- Remove sizeof (_IOR and _IOW macro can accept types);
- Replace _IOW which size of 0 (the last arg) with _IO.
- Actually these macros are not used anywhere and might be removed.
--- drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +8 -8
@@ -94,12 +94,12 @@ typedef struct _IOCTL_DPRAM_COMMAND {#define IOCTL_CONNECT 10#define IOCTL_DISCONNECT 11 -#define IOCTL_FT1000_GET_DSP_STAT _IOR(FT1000_MAGIC_CODE, IOCTL_GET_DSP_STAT_CMD, sizeof(IOCTL_GET_DSP_STAT) -#define IOCTL_FT1000_GET_VER _IOR(FT1000_MAGIC_CODE, IOCTL_GET_VER_CMD, sizeof(IOCTL_GET_VER) -#define IOCTL_FT1000_CONNECT _IOW(FT1000_MAGIC_CODE, IOCTL_CONNECT, 0 -#define IOCTL_FT1000_DISCONNECT _IOW(FT1000_MAGIC_CODE, IOCTL_DISCONNECT, 0 -#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_ */ +#define IOCTL_FT1000_GET_DSP_STAT _IOR(FT1000_MAGIC_CODE, IOCTL_GET_DSP_STAT_CMD, IOCTL_GET_DSP_STAT) +#define IOCTL_FT1000_GET_VER _IOR(FT1000_MAGIC_CODE, IOCTL_GET_VER_CMD, IOCTL_GET_VER) +#define IOCTL_FT1000_CONNECT _IO(FT1000_MAGIC_CODE, IOCTL_CONNECT) +#define IOCTL_FT1000_DISCONNECT _IO(FT1000_MAGIC_CODE, IOCTL_DISCONNECT) +#define IOCTL_FT1000_SET_DPRAM _IOW(FT1000_MAGIC_CODE, IOCTL_SET_DPRAM_CMD, IOCTL_DPRAM_BLK) +#define IOCTL_FT1000_GET_DPRAM _IOR(FT1000_MAGIC_CODE, IOCTL_GET_DPRAM_CMD, IOCTL_DPRAM_BLK) +#define IOCTL_FT1000_REGISTER _IOW(FT1000_MAGIC_CODE, IOCTL_REGISTER_CMD, unsigned short *) +#endif /* _FT1000IOCTLH_ */
Signature · 1 line
1.7.10.4
PATCH v2 3/5 drivers: staging: ft1000: Use pr_info instead of printk
In reply to Artem FetishevImprove coding style by fixing this checkstyle warning:
WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...
--- drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +1 -1
@@ -24,7 +24,7 @@ struct app_info_block {struct list_head app_sqlist;/* link list of msgs for applicaton on slow queue */ } __packed; -#define DEBUG(args...) printk(KERN_INFO args) +#define DEBUG(args...) pr_info(args)#define FALSE 0#define TRUE 1
Signature · 1 line
1.7.10.4
PATCH v2 4/5 drivers: staging: ft1000: Remove typedefs
In reply to Artem FetishevRemove typedefs according to the "Chapter 5: Typedefs" from Documentation/CodingStyle.
--- drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 10 +++++----- drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +5 -5
@@ -417,8 +417,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,u16 tempword;unsigned long flags;struct timeval tv; -IOCTL_GET_VER get_ver_data; -IOCTL_GET_DSP_STAT get_stat_data; +struct IOCTL_GET_VER get_ver_data; +struct IOCTL_GET_DSP_STAT get_stat_data;u8 ConnectionMsg[] = {0x00 ,0x44 ,0x10 ,0x20 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x03 ,0x00 ,0x00 ,0x00 ,0x93 ,0x64 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x05 ,0x00 ,0x00 ,0x00 ,0x0a ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,
@@ -527,8 +527,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,break ;case IOCTL_SET_DPRAM_CMD : { -IOCTL_DPRAM_BLK *dpram_data =NULL ; -/* IOCTL_DPRAM_COMMAND dpram_command; */ +struct IOCTL_DPRAM_BLK *dpram_data =NULL ; +/* struct IOCTL_DPRAM_COMMAND dpram_command; */ u16 qtype;u16 msgsz;struct pseudo_hdr *ppseudo_hdr;
@@ -672,7 +672,7 @@ static long ft1000_ioctl(struct file *file, unsigned int command,case IOCTL_GET_DPRAM_CMD : {struct dpram_blk *pdpram_blk; -IOCTL_DPRAM_BLK __user *pioctl_dpram; +struct IOCTL_DPRAM_BLK __user *pioctl_dpram;int msglen;/* DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_DPRAM called\n"); */
drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +9 -9
@@ -28,12 +28,12 @@ #ifndef _FT1000IOCTLH_ #define _FT1000IOCTLH_ -typedef struct _IOCTL_GET_VER { +struct IOCTL_GET_VER { unsigned long drv_ver; -} __packed IOCTL_GET_VER, *PIOCTL_GET_VER; +} __packed; /* Data structure for Dsp statistics */ -typedef struct _IOCTL_GET_DSP_STAT { +struct IOCTL_GET_DSP_STAT { unsigned char DspVer[DSPVERSZ]; /* DSP version number */ unsigned char HwSerNum[HWSERNUMSZ]; /* Hardware Serial Number */ unsigned char Sku[SKUSZ]; /* SKU */
@@ -67,19 +67,19 @@ typedef struct _IOCTL_GET_DSP_STAT {unsigned long ConTm;/* Current session connection time in seconds */ unsigned char CalVer[CALVERSZ ];/* Proprietary Calibration Version */ unsigned char CalDate[CALDATESZ ];/* Proprietary Calibration Date */ -}__packed IOCTL_GET_DSP_STAT , *PIOCTL_GET_DSP_STAT ; +} __packed;/* Data structure for Dual Ported RAM messaging between Host and Dsp */ -typedef struct _IOCTL_DPRAM_BLK { +struct IOCTL_DPRAM_BLK {unsigned short total_len;struct pseudo_hdr pseudohdr;unsigned char buffer[1780 ]; -} __packed IOCTL_DPRAM_BLK, *PIOCTL_DPRAM_BLK; +} __packed; -typedef struct _IOCTL_DPRAM_COMMAND { +struct IOCTL_DPRAM_COMMAND {unsigned short extra; -IOCTL_DPRAM_BLK dpram_blk; -} __packed IOCTL_DPRAM_COMMAND, *PIOCTL_DPRAM_COMMAND; +struct IOCTL_DPRAM_BLK dpram_blk; +} __packed;/* * Custom IOCTL command codes
Signature · 1 line
1.7.10.4
PATCH v2 5/5 drivers: staging: ft1000: Fix lines over 80 characters
In reply to Artem Fetishev...plus some function arg indentation which I haven't noticed at first.
--- drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 15 +++++--- drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 40 ++++++++++++++++------ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 35 +++++++++++-------- drivers/staging/ft1000/ft1000.h | 7 ++-- 4 files changed, 64 insertions(+), 33 deletions(-)
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +10 -5
@@ -25,7 +25,10 @@#define FT1000_DPRAM_BASE 0x0000/* Dual Port RAM starting offset */ -/* Maximum number of occurrence of pseudo header errors before resetting PC Card. */ +/* +* Maximum number of occurrence of pseudo header errors before resetting PC +* Card. +*/ #define MAX_PH_ERR 300#define SUCCESS 0x00
@@ -40,16 +43,17 @@ struct ft1000_pcmcia {struct pcmcia_device ;struct net_device ;extern struct net_device *init_ft1000_card (struct pcmcia_device *link, -void *ft1000_reset); +void *ft1000_reset);extern void stop_ft1000_card (struct net_device *dev);extern int card_download (struct net_device *dev,const u8 *pFileStart, -size_t FileLength); +size_t FileLength);extern void ft1000InitProc (struct net_device *dev);extern void ft1000CleanupProc (struct net_device *dev);extern u16 ft1000_read_dpram (struct net_device *dev,int offset);extern void card_bootload (struct net_device *dev); -extern u16 ft1000_read_dpram_mag_16 (struct net_device *dev,int offset,int Index); +extern u16 ft1000_read_dpram_mag_16 (struct net_device *dev,int offset, +int Index);extern u32 ft1000_read_dpram_mag_32 (struct net_device *dev,int offset);void ft1000_write_dpram_mag_32 (struct net_device *dev,int offset,u32 value);
@@ -60,7 +64,8 @@ static inline u16 ft1000_read_reg(struct net_device *dev, u16 offset) }/* Set the value of a given ASIC register. */ -static inline void ft1000_write_reg (struct net_device *dev,u16 offset,u16 value) +static inline void ft1000_write_reg (struct net_device *dev,u16 offset, +u16 value) {outw (value, dev->base_addr + offset); }
drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h +29 -11
@@ -60,12 +60,24 @@ struct IOCTL_GET_DSP_STAT {/* 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 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 */ } __packed;
@@ -94,12 +106,18 @@ struct IOCTL_DPRAM_COMMAND {#define IOCTL_CONNECT 10#define IOCTL_DISCONNECT 11 -#define IOCTL_FT1000_GET_DSP_STAT _IOR(FT1000_MAGIC_CODE, IOCTL_GET_DSP_STAT_CMD, IOCTL_GET_DSP_STAT) -#define IOCTL_FT1000_GET_VER _IOR(FT1000_MAGIC_CODE, IOCTL_GET_VER_CMD, IOCTL_GET_VER) +#define IOCTL_FT1000_GET_DSP_STAT _IOR(FT1000_MAGIC_CODE, \ + IOCTL_GET_DSP_STAT_CMD, \ + IOCTL_GET_DSP_STAT) +#define IOCTL_FT1000_GET_VER _IOR(FT1000_MAGIC_CODE, IOCTL_GET_VER_CMD, \ + IOCTL_GET_VER)#define IOCTL_FT1000_CONNECT _IO(FT1000_MAGIC_CODE, IOCTL_CONNECT)#define IOCTL_FT1000_DISCONNECT _IO(FT1000_MAGIC_CODE, IOCTL_DISCONNECT) -#define IOCTL_FT1000_SET_DPRAM _IOW(FT1000_MAGIC_CODE, IOCTL_SET_DPRAM_CMD, IOCTL_DPRAM_BLK) -#define IOCTL_FT1000_GET_DPRAM _IOR(FT1000_MAGIC_CODE, IOCTL_GET_DPRAM_CMD, IOCTL_DPRAM_BLK) -#define IOCTL_FT1000_REGISTER _IOW(FT1000_MAGIC_CODE, IOCTL_REGISTER_CMD, unsigned short *) +#define IOCTL_FT1000_SET_DPRAM _IOW(FT1000_MAGIC_CODE, IOCTL_SET_DPRAM_CMD, \ + IOCTL_DPRAM_BLK) +#define IOCTL_FT1000_GET_DPRAM _IOR(FT1000_MAGIC_CODE, IOCTL_GET_DPRAM_CMD, \ + IOCTL_DPRAM_BLK) +#define IOCTL_FT1000_REGISTER _IOW(FT1000_MAGIC_CODE, IOCTL_REGISTER_CMD, \ + unsigned short *)#endif /* _FT1000IOCTLH_ */
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +20 -15
@@ -14,14 +14,18 @@struct app_info_block {u32 nTxMsg;/* DPRAM msg sent to DSP with app_id */ u32 nRxMsg;/* DPRAM msg rcv from dsp with app_id */ -u32 nTxMsgReject;/* DPRAM msg rejected due to DSP doorbell set */ +u32 nTxMsgReject;/* DPRAM msg rejected due to DSP doorbell +* set +*/ u32 nRxMsgMiss;/* DPRAM msg dropped due to overflow */ struct fown_struct *fileobject;/* Application's file object */ u16 app_id;/* Application id */ int DspBCMsgFlag;int NumOfMsg;/* number of messages queued up */ wait_queue_head_t wait_dpram_msg; -struct list_head app_sqlist;/* link list of msgs for applicaton on slow queue */ +struct list_head app_sqlist;/* link list of msgs for applicaton on +* slow queue +*/ } __packed; #define DEBUG(args...) pr_info(args)
@@ -41,7 +45,9 @@ struct app_info_block {/* MEMORY MAP FOR MAGNEMITE */ /* the indexes are swapped comparing to PCMCIA - is it OK or a bug? */ #undef FT1000_MAG_DSP_LED_INDX -#define FT1000_MAG_DSP_LED_INDX 0x1/* dsp led status for PAD device */ +#define FT1000_MAG_DSP_LED_INDX 0x1/* dsp led status for PAD +* device +*/ #undef FT1000_MAG_DSP_CON_STATE_INDX#define FT1000_MAG_DSP_CON_STATE_INDX 0x0/* DSP Connection Status Info */
@@ -99,21 +105,21 @@ struct dpram_blk { } __packed;int ft1000_read_register (struct ft1000_usb *ft1000dev, -u16 *Data,u16 nRegIndx); +u16 *Data,u16 nRegIndx);int ft1000_write_register (struct ft1000_usb *ft1000dev, -u16 value,u16 nRegIndx); +u16 value,u16 nRegIndx);int ft1000_read_dpram32 (struct ft1000_usb *ft1000dev,u16 indx,u8 *buffer,u16 cnt);int ft1000_write_dpram32 (struct ft1000_usb *ft1000dev, -u16 indx,u8 *buffer,u16 cnt); +u16 indx,u8 *buffer,u16 cnt);int ft1000_read_dpram16 (struct ft1000_usb *ft1000dev,u16 indx,u8 *buffer,u8 highlow);int ft1000_write_dpram16 (struct ft1000_usb *ft1000dev, -u16 indx,u16 value,u8 highlow); +u16 indx,u16 value,u8 highlow);int fix_ft1000_read_dpram32 (struct ft1000_usb *ft1000dev, -u16 indx,u8 *buffer); +u16 indx,u8 *buffer);int fix_ft1000_write_dpram32 (struct ft1000_usb *ft1000dev, -u16 indx,u8 *buffer); +u16 indx,u8 *buffer);extern void *pFileStart;extern size_t FileLength;
@@ -125,12 +131,13 @@ int scram_dnldr(struct ft1000_usb *ft1000dev, void *pFileStart,extern struct list_head freercvpool; -extern spinlock_t free_buff_lock;/* lock to arbitrate free buffer list for receive command data */ +/* lock to arbitrate free buffer list for receive command data */ +extern spinlock_t free_buff_lock;int ft1000_create_dev (struct ft1000_usb *dev);void ft1000_destroy_dev (struct net_device *dev);extern void card_send_command (struct ft1000_usb *ft1000dev, -void *ptempbuffer,int size); +void *ptempbuffer,int size);struct dpram_blk *ft1000_get_buffer (struct list_head *bufflist);void ft1000_free_buffer (struct dpram_blk *pdpram_blk,struct list_head *plist);
@@ -139,12 +146,10 @@ int dsp_reload(struct ft1000_usb *ft1000dev);int init_ft1000_netdev (struct ft1000_usb *ft1000dev);struct usb_interface ;int reg_ft1000_netdev (struct ft1000_usb *ft1000dev, -struct usb_interface *intf); +struct usb_interface *intf);int ft1000_poll (void *dev_id);int ft1000_init_proc (struct net_device *dev);void ft1000_cleanup_proc (struct ft1000_info *info); - - -#endif +#endif /* _FT1000_USB_H_ */
drivers/staging/ft1000/ft1000.h +5 -2
@@ -1,5 +1,6 @@/* -* Common structures and definitions for FT1000 Flarion Flash OFDM PCMCIA and USB devices +* Common structures and definitions for FT1000 Flarion Flash OFDM PCMCIA and +* USB devices. * * Originally copyright (c) 2002 Flarion Technologies *
@@ -17,7 +18,9 @@#define MAGNEMITE_ID 0x1a01/* ASIC ID for Magnemite */ /* MEMORY MAP common to both ELECTRABUZZ and MAGNEMITE */ -#define FT1000_REG_DPRAM_ADDR 0x000E/* DPADR - Dual Port Ram Indirect Address Register */ +#define FT1000_REG_DPRAM_ADDR 0x000E/* DPADR - Dual Port Ram Indirect +* Address Register +*/ #define FT1000_REG_SUP_CTRL 0x0020/* HCTR - Host Control Register */ #define FT1000_REG_SUP_STAT 0x0022/* HSTAT - Host Status Register */ #define FT1000_REG_RESET 0x0024/* HCTR - Host Control Register */
Signature · 1 line
1.7.10.4