lkml.org 
[lkml]   [2011]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/21] staging: ft1000: Fix coding style in ft1000_dsp_prov function.
    Date
    Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
    ---
    drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 161 +++++++++++++------------
    1 files changed, 83 insertions(+), 78 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    index 9e0b696..deefefd 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    @@ -1439,92 +1439,97 @@ static bool ft1000_receive_cmd(struct ft1000_device *dev, u16 *pbuffer,
    }
    }

    -
    static int ft1000_dsp_prov(void *arg)
    {
    - struct ft1000_device *dev = (struct ft1000_device *)arg;
    + struct ft1000_device *dev = (struct ft1000_device *)arg;
    struct ft1000_info *info = netdev_priv(dev->net);
    - u16 tempword;
    - u16 len;
    - u16 i=0;
    + u16 tempword;
    + u16 len;
    + u16 i = 0;
    struct prov_record *ptr;
    struct pseudo_hdr *ppseudo_hdr;
    - u16 *pmsg;
    - u16 status;
    - u16 TempShortBuf [256];
    + u16 *pmsg;
    + u16 status;
    + u16 TempShortBuf[256];

    - DEBUG("*** DspProv Entered\n");
    + DEBUG("*** DspProv Entered\n");

    - while (list_empty(&info->prov_list) == 0)
    - {
    - DEBUG("DSP Provisioning List Entry\n");
    -
    - // Check if doorbell is available
    - DEBUG("check if doorbell is cleared\n");
    - status = ft1000_read_register (dev, &tempword, FT1000_REG_DOORBELL);
    - if (status)
    - {
    - DEBUG("ft1000_dsp_prov::ft1000_read_register error\n");
    - break;
    - }
    + while (list_empty(&info->prov_list) == 0) {
    + DEBUG("DSP Provisioning List Entry\n");
    +
    + /* Check if doorbell is available */
    + DEBUG("check if doorbell is cleared\n");
    + status =
    + ft1000_read_register(dev, &tempword, FT1000_REG_DOORBELL);
    + if (status) {
    + DEBUG("ft1000_dsp_prov::ft1000_read_register error\n");
    + break;
    + }

    - while (tempword & FT1000_DB_DPRAM_TX) {
    - mdelay(10);
    - i++;
    - if (i==10) {
    - DEBUG("FT1000:ft1000_dsp_prov:message drop\n");
    - return STATUS_FAILURE;
    - }
    - ft1000_read_register(dev, &tempword, FT1000_REG_DOORBELL);
    - }
    + while (tempword & FT1000_DB_DPRAM_TX) {
    + mdelay(10);
    + i++;
    + if (i == 10) {
    + DEBUG("FT1000:ft1000_dsp_prov:message drop\n");
    + return STATUS_FAILURE;
    + }
    + ft1000_read_register(dev, &tempword,
    + FT1000_REG_DOORBELL);
    + }

    - if ( !(tempword & FT1000_DB_DPRAM_TX) ) {
    - DEBUG("*** Provision Data Sent to DSP\n");
    -
    - // Send provisioning data
    - ptr = list_entry(info->prov_list.next, struct prov_record, list);
    - len = *(u16 *)ptr->pprov_data;
    - len = htons(len);
    - len += PSEUDOSZ;
    -
    - pmsg = (u16 *)ptr->pprov_data;
    - ppseudo_hdr = (struct pseudo_hdr *)pmsg;
    - // Insert slow queue sequence number
    - ppseudo_hdr->seq_num = info->squeseqnum++;
    - ppseudo_hdr->portsrc = 0;
    - // Calculate new checksum
    - ppseudo_hdr->checksum = *pmsg++;
    - //DEBUG("checksum = 0x%x\n", ppseudo_hdr->checksum);
    - for (i=1; i<7; i++) {
    - ppseudo_hdr->checksum ^= *pmsg++;
    - //DEBUG("checksum = 0x%x\n", ppseudo_hdr->checksum);
    - }
    + if (!(tempword & FT1000_DB_DPRAM_TX)) {
    + DEBUG("*** Provision Data Sent to DSP\n");

    - TempShortBuf[0] = 0;
    - TempShortBuf[1] = htons (len);
    - memcpy(&TempShortBuf[2], ppseudo_hdr, len);
    + /* Send provisioning data */
    + ptr =
    + list_entry(info->prov_list.next, struct prov_record,
    + list);
    + len = *(u16 *) ptr->pprov_data;
    + len = htons(len);
    + len += PSEUDOSZ;

    - status = ft1000_write_dpram32 (dev, 0, (u8 *)&TempShortBuf[0], (unsigned short)(len+2));
    - status = ft1000_write_register (dev, FT1000_DB_DPRAM_TX, FT1000_REG_DOORBELL);
    + pmsg = (u16 *) ptr->pprov_data;
    + ppseudo_hdr = (struct pseudo_hdr *)pmsg;
    + /* Insert slow queue sequence number */
    + ppseudo_hdr->seq_num = info->squeseqnum++;
    + ppseudo_hdr->portsrc = 0;
    + /* Calculate new checksum */
    + ppseudo_hdr->checksum = *pmsg++;
    + //DEBUG("checksum = 0x%x\n", ppseudo_hdr->checksum);
    + for (i = 1; i < 7; i++) {
    + ppseudo_hdr->checksum ^= *pmsg++;
    + //DEBUG("checksum = 0x%x\n", ppseudo_hdr->checksum);
    + }

    - list_del(&ptr->list);
    - kfree(ptr->pprov_data);
    - kfree(ptr);
    - }
    - msleep(10);
    - }
    + TempShortBuf[0] = 0;
    + TempShortBuf[1] = htons(len);
    + memcpy(&TempShortBuf[2], ppseudo_hdr, len);
    +
    + status =
    + ft1000_write_dpram32(dev, 0,
    + (u8 *) &TempShortBuf[0],
    + (unsigned short)(len + 2));
    + status =
    + ft1000_write_register(dev, FT1000_DB_DPRAM_TX,
    + FT1000_REG_DOORBELL);
    +
    + list_del(&ptr->list);
    + kfree(ptr->pprov_data);
    + kfree(ptr);
    + }
    + msleep(10);
    + }

    - DEBUG("DSP Provisioning List Entry finished\n");
    + DEBUG("DSP Provisioning List Entry finished\n");

    - msleep(100);
    + msleep(100);

    - info->fProvComplete = 1;
    - info->CardReady = 1;
    - return STATUS_SUCCESS;
    + info->fProvComplete = 1;
    + info->CardReady = 1;

    + return STATUS_SUCCESS;
    }

    -
    static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
    struct ft1000_info *info = netdev_priv(dev->net);
    u16 msgtype;
    --
    1.7.1


    \
     
     \ /
      Last update: 2011-03-07 09:25    [W:0.058 / U:0.260 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site