lkml.org 
[lkml]   [2010]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/7] staging:ft1000: Remove DSPINITMSG typedef usage.
    Date
    Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
    ---
    drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 +++---
    drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 24 ++++++++++++------------
    2 files changed, 15 insertions(+), 15 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    index f88dcf0..519f578 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    @@ -1837,7 +1837,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
    u16 msgtype;
    u16 tempword;
    struct media_msg *pmediamsg;
    - PDSPINITMSG pdspinitmsg;
    + struct dsp_init_msg *pdspinitmsg;
    PDRVMSG pdrvmsg;
    u16 i;
    PPSEUDO_HDR ppseudo_hdr;
    @@ -1924,7 +1924,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
    case DSP_INIT_MSG: {
    DEBUG("ft1000_proc_drvmsg:Command message type = DSP_INIT_MSG");

    - pdspinitmsg = (PDSPINITMSG)&cmdbuffer[2];
    + pdspinitmsg = (struct dsp_init_msg *)&cmdbuffer[2];
    memcpy(info->DspVer, pdspinitmsg->DspVer, DSPVERSZ);
    DEBUG("DSPVER = 0x%2x 0x%2x 0x%2x 0x%2x\n", info->DspVer[0], info->DspVer[1], info->DspVer[2], info->DspVer[3]);
    memcpy(info->HwSerNum, pdspinitmsg->HwSerNum, HWSERNUMSZ);
    @@ -1938,7 +1938,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) {
    dev->net->dev_addr[4] = info->eui64[6];
    dev->net->dev_addr[5] = info->eui64[7];

    - if (ntohs(pdspinitmsg->length) == (sizeof(DSPINITMSG) - 20) ) {
    + if (ntohs(pdspinitmsg->length) == (sizeof(struct dsp_init_msg) - 20)) {
    memcpy(info->ProductMode, pdspinitmsg->ProductMode, MODESZ);
    memcpy(info->RfCalVer, pdspinitmsg->RfCalVer, CALVERSZ);
    memcpy(info->RfCalDate, pdspinitmsg->RfCalDate, CALDATESZ);
    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    index bfd43fd..200f3c0 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
    @@ -63,18 +63,18 @@ struct media_msg {
    u32 dns_2;
    } __attribute__ ((packed));

    -typedef struct _DSPINITMSG {
    - PSEUDO_HDR pseudo;
    - u16 type;
    - u16 length;
    - u8 DspVer[DSPVERSZ]; // DSP version number
    - u8 HwSerNum[HWSERNUMSZ]; // Hardware Serial Number
    - u8 Sku[SKUSZ]; // SKU
    - u8 eui64[EUISZ]; // EUI64
    - u8 ProductMode[MODESZ]; // Product Mode (Market/Production)
    - u8 RfCalVer[CALVERSZ]; // Rf Calibration version
    - u8 RfCalDate[CALDATESZ]; // Rf Calibration date
    -} __attribute__ ((packed)) DSPINITMSG, *PDSPINITMSG;
    +struct dsp_init_msg {
    + PSEUDO_HDR pseudo;
    + u16 type;
    + u16 length;
    + u8 DspVer[DSPVERSZ]; // DSP version number
    + u8 HwSerNum[HWSERNUMSZ]; // Hardware Serial Number
    + u8 Sku[SKUSZ]; // SKU
    + u8 eui64[EUISZ]; // EUI64
    + u8 ProductMode[MODESZ]; // Product Mode (Market/Production)
    + u8 RfCalVer[CALVERSZ]; // Rf Calibration version
    + u8 RfCalDate[CALDATESZ]; // Rf Calibration date
    +} __attribute__ ((packed));


    typedef struct _APP_INFO_BLOCK
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-10-15 14:21    [W:0.046 / U:1.460 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site