lkml.org 
[lkml]   [2010]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/26] w35und: Convert T02_DESCRIPTOR typedef to struct wb35_T02_descriptor
    Date
    Cc: Pavel Machek <pavel@ucw.cz>
    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    ---
    drivers/staging/winbond/mds.c | 2 +-
    drivers/staging/winbond/mds_f.h | 2 +-
    drivers/staging/winbond/wb35tx.c | 2 +-
    drivers/staging/winbond/wbhal_s.h | 7 +++----
    4 files changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
    index b9dbb2c..403149f 100644
    --- a/drivers/staging/winbond/mds.c
    +++ b/drivers/staging/winbond/mds.c
    @@ -550,7 +550,7 @@ Mds_Tx(struct wbsoft_priv * adapter)
    }

    void
    -Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02)
    +Mds_SendComplete(struct wbsoft_priv * adapter, struct wb35_T02_descriptor * pT02)
    {
    struct wb35_mds *pMds = &adapter->Mds;
    struct hw_data * pHwData = &adapter->sHwData;
    diff --git a/drivers/staging/winbond/mds_f.h b/drivers/staging/winbond/mds_f.h
    index e09dd4b..e5e3b4e 100644
    --- a/drivers/staging/winbond/mds_f.h
    +++ b/drivers/staging/winbond/mds_f.h
    @@ -7,7 +7,7 @@
    unsigned char Mds_initial( struct wbsoft_priv *adapter );
    void Mds_Destroy( struct wbsoft_priv *adapter );
    void Mds_Tx( struct wbsoft_priv *adapter );
    -void Mds_SendComplete( struct wbsoft_priv *adapter, PT02_DESCRIPTOR pT02 );
    +void Mds_SendComplete( struct wbsoft_priv *adapter, struct wb35_T02_descriptor * pT02 );
    void Mds_MpduProcess( struct wbsoft_priv *adapter, struct wb35_descriptor *pRxDes );
    extern void DataDmp(u8 *pdata, u32 len, u32 offset);

    diff --git a/drivers/staging/winbond/wb35tx.c b/drivers/staging/winbond/wb35tx.c
    index 5869ef4..615e20e 100644
    --- a/drivers/staging/winbond/wb35tx.c
    +++ b/drivers/staging/winbond/wb35tx.c
    @@ -209,7 +209,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb)
    {
    struct wbsoft_priv *adapter = pUrb->context;
    struct hw_data * pHwData = &adapter->sHwData;
    - T02_DESCRIPTOR T02, TSTATUS;
    + struct wb35_T02_descriptor T02, TSTATUS;
    struct wb35_tx *pWb35Tx = &pHwData->Wb35Tx;
    u32 * pltmp = (u32 *)pWb35Tx->EP2_buf;
    u32 i;
    diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
    index 00329df..d8c32c0 100644
    --- a/drivers/staging/winbond/wbhal_s.h
    +++ b/drivers/staging/winbond/wbhal_s.h
    @@ -261,8 +261,7 @@ struct wb35_T01_descriptor {
    };
    };

    -typedef struct _T02_DESCRIPTOR
    -{
    +struct wb35_T02_descriptor {
    union
    {
    u32 value;
    @@ -308,7 +307,7 @@ typedef struct _T02_DESCRIPTOR
    };
    #endif
    };
    -} T02_DESCRIPTOR, *PT02_DESCRIPTOR;
    +};

    struct wb35_descriptor { // Skip length = 8 DWORD
    // ID for descriptor ---, The field doesn't be cleard in the operation of Descriptor definition
    @@ -343,7 +342,7 @@ struct wb35_descriptor { // Skip length = 8 DWORD
    union
    {
    u32 R02;
    - T02_DESCRIPTOR T02;
    + struct wb35_T02_descriptor T02;
    };

    // For R03 and T03 ----------------------------------------------
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2010-03-01 16:17    [W:4.540 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site