UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: ft1000: Replace camelcase CardSendCommand function name. 

Replace CardSendCommand by card_send_command.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marek Belisko 2011-03-10 11:51:15 +01:00 committed by Greg Kroah-Hartman
parent 2b61535a6e
commit a209efadf0
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
View File

@ -471,14 +471,14 @@ static long ft1000_ioctl (struct file *file, unsigned int command,
// Connect Message // Connect Message
DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_CONNECT\n"); DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_CONNECT\n");
ConnectionMsg[79] = 0xfc; ConnectionMsg[79] = 0xfc;
CardSendCommand(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c); card_send_command(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
break; break;
case IOCTL_DISCONNECT: case IOCTL_DISCONNECT:
// Disconnect Message // Disconnect Message
DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_DISCONNECT\n"); DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_DISCONNECT\n");
ConnectionMsg[79] = 0xfd; ConnectionMsg[79] = 0xfd;
CardSendCommand(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c); card_send_command(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
break; break;
case IOCTL_GET_DSP_STAT_CMD: case IOCTL_GET_DSP_STAT_CMD:
//DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_DSP_STAT called\n"); //DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_GET_DSP_STAT called\n");
@ -642,7 +642,7 @@ static long ft1000_ioctl (struct file *file, unsigned int command,
} }
pmsg++; pmsg++;
ppseudo_hdr = (struct pseudo_hdr *)pmsg; ppseudo_hdr = (struct pseudo_hdr *)pmsg;
CardSendCommand(ft1000dev,(unsigned short*)dpram_data,total_len+2); card_send_command(ft1000dev,(unsigned short*)dpram_data,total_len+2);
info->app_info[app_index].nTxMsg++; info->app_info[app_index].nTxMsg++;

18
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View File

@ -467,7 +467,7 @@ static void card_reset_dsp(struct ft1000_device *ft1000dev, bool value)
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Function: CardSendCommand // Function: card_send_command
// //
// Parameters: ft1000_device - device structure // Parameters: ft1000_device - device structure
// ptempbuffer - command buffer // ptempbuffer - command buffer
@ -481,17 +481,17 @@ static void card_reset_dsp(struct ft1000_device *ft1000dev, bool value)
// Notes: // Notes:
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void CardSendCommand(struct ft1000_device *ft1000dev, void *ptempbuffer, int size) void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer, int size)
{ {
unsigned short temp; unsigned short temp;
unsigned char *commandbuf; unsigned char *commandbuf;
DEBUG("CardSendCommand: enter CardSendCommand... size=%d\n", size); DEBUG("card_send_command: enter card_send_command... size=%d\n", size);
commandbuf =(unsigned char*) kmalloc(size+2, GFP_KERNEL); commandbuf =(unsigned char*) kmalloc(size+2, GFP_KERNEL);
memcpy((void*)commandbuf+2, (void*)ptempbuffer, size); memcpy((void*)commandbuf+2, (void*)ptempbuffer, size);
//DEBUG("CardSendCommand: Command Send\n"); //DEBUG("card_send_command: Command Send\n");
ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL); ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
@ -509,18 +509,18 @@ void CardSendCommand(struct ft1000_device *ft1000dev, void *ptempbuffer, int siz
} }
//DEBUG("CardSendCommand: write dpram ... size=%d\n", size); //DEBUG("card_send_command: write dpram ... size=%d\n", size);
ft1000_write_dpram32(ft1000dev, 0,commandbuf, size); ft1000_write_dpram32(ft1000dev, 0,commandbuf, size);
msleep(1); msleep(1);
//DEBUG("CardSendCommand: write into doorbell ...\n"); //DEBUG("card_send_command: write into doorbell ...\n");
ft1000_write_register(ft1000dev, FT1000_DB_DPRAM_TX ,FT1000_REG_DOORBELL) ; ft1000_write_register(ft1000dev, FT1000_DB_DPRAM_TX ,FT1000_REG_DOORBELL) ;
msleep(1); msleep(1);
ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL); ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
//DEBUG("CardSendCommand: read doorbell ...temp=%x\n", temp); //DEBUG("card_send_command: read doorbell ...temp=%x\n", temp);
if ( (temp & 0x0100) == 0) if ( (temp & 0x0100) == 0)
{ {
//DEBUG("CardSendCommand: Message sent\n"); //DEBUG("card_send_command: Message sent\n");
} }
} }
@ -1811,7 +1811,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
*pmsg++ = convert.wrd; *pmsg++ = convert.wrd;
*pmsg++ = htons(info->DrvErrNum); *pmsg++ = htons(info->DrvErrNum);
CardSendCommand (dev, (unsigned char*)&tempbuffer[0], (u16)(0x0012 + PSEUDOSZ)); card_send_command (dev, (unsigned char*)&tempbuffer[0], (u16)(0x0012 + PSEUDOSZ));
info->DrvErrNum = 0; info->DrvErrNum = 0;
} }
info->DrvMsgPend = 0; info->DrvMsgPend = 0;

2
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
View File

@ -581,7 +581,7 @@ extern spinlock_t free_buff_lock; // lock to arbitrate free buffer list for re
int ft1000_create_dev(struct ft1000_device *dev); int ft1000_create_dev(struct ft1000_device *dev);
void ft1000_destroy_dev(struct net_device *dev); void ft1000_destroy_dev(struct net_device *dev);
extern void CardSendCommand(struct ft1000_device *ft1000dev, void *ptempbuffer, int size); extern void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer, int size);
struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist); struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist);
void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist); void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist);