staging: ft1000-pcmcia: remove DRVMSG typedefs
PATCH 4/15 staging: ft1000-pcmcia: remove DRVMSG typedefs
Remove DRVMSG typedefs.
Signed-off-by Ondrej Zary <[email protected]>
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +2 -2
@@ -285,12 +285,12 @@ struct pseudo_hdr#define MAXIMUM_ASIC_HB_CNT 15 -typedef struct _DRVMSG { +struct drv_msg {struct pseudo_hdr pseudo;u16 type;u16 length;u8 data[0 ]; -} __attribute__ ((packed))DRVMSG , *PDRVMSG ; +} __attribute__ ((packed)); typedef struct _MEDIAMSG { struct pseudo_hdr pseudo;
drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c +2 -2
@@ -328,7 +328,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)PDSP_IMAGE_INFO_V6 pDspImageInfoV6 =NULL ;long requested_version;BOOLEAN bGoodVersion =0 ; -PDRVMSG pMailBoxData; +struct drv_msg *pMailBoxData;USHORT *pUsData =NULL ;USHORT *pUsFile =NULL ;UCHAR *pUcFile =NULL ;
@@ -605,7 +605,7 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength) (long )(info->DSPInfoBlklen +1 ) /2 ;put_request_value (dev, word_length); pMailBoxData = - (PDRVMSG ) & info->DSPInfoBlk[0 ]; + (struct drv_msg *) & info->DSPInfoBlk[0 ]; pUsData = (USHORT *) & pMailBoxData->data[0 ];// Provide mutual exclusive access while reading ASIC registers.
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +2 -2
@@ -1017,7 +1017,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)u16 tempword;PMEDIAMSG pmediamsg;PDSPINITMSG pdspinitmsg; -PDRVMSG pdrvmsg; +struct drv_msg *pdrvmsg;u16 len;u16 i;PPROV_RECORD ptr;
@@ -1038,7 +1038,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)if (ft1000_receive_cmd (dev, &cmdbuffer[0 ],MAX_CMD_SQSIZE , &tempword) ) {// Get the message type which is total_len + PSEUDO header + msgtype + message body - pdrvmsg = (PDRVMSG ) & cmdbuffer[0 ]; + pdrvmsg = (struct drv_msg *) & cmdbuffer[0 ]; msgtype =ntohs (pdrvmsg->type);DEBUG (1 ,"Command message type = 0x%x\n" , msgtype);switch (msgtype) {
Signature · 1 line
Ondrej Zary