lkml.org 
[lkml]   [2011]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 01/21] staging: ft1000: Replace camelcase CardSendCommand function name.
    Date
    Replace CardSendCommand by card_send_command.

    Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
    ---
    drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 +++---
    drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 18 +++++++++---------
    drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 2 +-
    3 files changed, 13 insertions(+), 13 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
    index 149ba59..19db23f 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
    @@ -471,14 +471,14 @@ static long ft1000_ioctl (struct file *file, unsigned int command,
    // Connect Message
    DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_CONNECT\n");
    ConnectionMsg[79] = 0xfc;
    - CardSendCommand(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
    + card_send_command(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);

    break;
    case IOCTL_DISCONNECT:
    // Disconnect Message
    DEBUG("FT1000:ft1000_ioctl: IOCTL_FT1000_DISCONNECT\n");
    ConnectionMsg[79] = 0xfd;
    - CardSendCommand(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
    + card_send_command(ft1000dev, (unsigned short *)ConnectionMsg, 0x4c);
    break;
    case IOCTL_GET_DSP_STAT_CMD:
    //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++;
    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++;
    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    index e3b9934..293a469 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    @@ -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
    // ptempbuffer - command buffer
    @@ -481,17 +481,17 @@ static void card_reset_dsp(struct ft1000_device *ft1000dev, bool value)
    // 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 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);
    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);

    @@ -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);
    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) ;
    msleep(1);

    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)
    {
    - //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++ = 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->DrvMsgPend = 0;
    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    index 88183fe..84ff53d 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    @@ -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);
    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);
    void ft1000_free_buffer(struct dpram_blk *pdpram_blk, struct list_head *plist);
    --
    1.7.1


    \
     
     \ /
      Last update: 2011-03-10 11:55    [W:0.046 / U:0.004 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site