Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1674983 authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman
Browse files

staging: ft1000: GEt rid of PUSHORT typedef usage. 



Signed-off-by: default avatarMarek Belisko <marek.belisko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c8f775c8

drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c

+3 −3
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command, 
            USHORT qtype;

            USHORT msgsz;

		struct pseudo_hdr *ppseudo_hdr;

            PUSHORT pmsg;

            u16 *pmsg;

            USHORT total_len;

            USHORT app_index;

            u16 status;
@@ -766,8 +766,8 @@ static long ft1000_ChIoctl (struct file *File, unsigned int Command, 
                        // Make sure we are within the limits of the slow queue memory limitation

                        if ( (msgsz < MAX_CMD_SQSIZE) && (msgsz > PSEUDOSZ) ) {

                            // Need to put sequence number plus new checksum for message

                            //pmsg = (PUSHORT)&dpram_command.dpram_blk.pseudohdr;

                            pmsg = (PUSHORT)&dpram_data->pseudohdr;

                            //pmsg = (u16 *)&dpram_command.dpram_blk.pseudohdr;

                            pmsg = (u16 *)&dpram_data->pseudohdr;

				ppseudo_hdr = (struct pseudo_hdr *)pmsg;

                            total_len = msgsz+2;

                            if (total_len & 0x1) {

drivers/staging/ft1000/ft1000-usb/ft1000_hw.c

+9 −9
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ static int ft1000_copy_up_pkt (struct urb *urb) 
    //DEBUG("ft1000_copy_up_pkt: transfer_buffer_length=%d, actual_buffer_len=%d\n",

      //       urb->transfer_buffer_length, urb->actual_length);



    chksum = (PUSHORT)ft1000dev->rx_buf;

    chksum = (u16 *)ft1000dev->rx_buf;



    tempword = *chksum++;

    for (i=1; i<7; i++)
@@ -1541,7 +1541,7 @@ static int ft1000_dsp_prov(void *arg) 
    u16 i=0;

	struct prov_record *ptr;

	struct pseudo_hdr *ppseudo_hdr;

    PUSHORT pmsg;

    u16 *pmsg;

    u16 status;

    USHORT TempShortBuf [256];
@@ -1579,7 +1579,7 @@ static int ft1000_dsp_prov(void *arg) 
            len = htons(len);

            len += PSEUDOSZ;



            pmsg = (PUSHORT)ptr->pprov_data;

            pmsg = (u16 *)ptr->pprov_data;

		ppseudo_hdr = (struct pseudo_hdr *)pmsg;

            // Insert slow queue sequence number

            ppseudo_hdr->seq_num = info->squeseqnum++;
@@ -1626,7 +1626,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { 
	struct drv_msg *pdrvmsg;

    u16 i;

	struct pseudo_hdr *ppseudo_hdr;

    PUSHORT pmsg;

    u16 *pmsg;

    u16 status;

    union {

        u8  byte[2];
@@ -1758,7 +1758,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { 
                tempword = ntohs(pdrvmsg->length);

                info->DSPInfoBlklen = tempword;

                if (tempword < (MAX_DSP_SESS_REC-4) ) {

                    pmsg = (PUSHORT)&pdrvmsg->data[0];

                    pmsg = (u16 *)&pdrvmsg->data[0];

                    for (i=0; i<((tempword+1)/2); i++) {

                        DEBUG("FT1000:drivermsg:dsp info data = 0x%x\n", *pmsg);

                        info->DSPInfoBlk[i+10] = *pmsg++;
@@ -1790,10 +1790,10 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { 


                // Put message into Slow Queue

                // Form Pseudo header

                pmsg = (PUSHORT)info->DSPInfoBlk;

                pmsg = (u16 *)info->DSPInfoBlk;

                *pmsg++ = 0;

                *pmsg++ = htons(info->DSPInfoBlklen+20+info->DSPInfoBlklen);

		ppseudo_hdr = (struct pseudo_hdr *)(PUSHORT)&info->DSPInfoBlk[2];

		ppseudo_hdr = (struct pseudo_hdr *)(u16 *)&info->DSPInfoBlk[2];

                ppseudo_hdr->length = htons(info->DSPInfoBlklen+4+info->DSPInfoBlklen);

                ppseudo_hdr->source = 0x10;

                ppseudo_hdr->destination = 0x20;
@@ -1840,7 +1840,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { 
              if ( (tempword & FT1000_DB_DPRAM_TX) == 0) {

                  // Put message into Slow Queue

                  // Form Pseudo header

                  pmsg = (PUSHORT)&tempbuffer[0];

                  pmsg = (u16 *)&tempbuffer[0];

			ppseudo_hdr = (struct pseudo_hdr *)pmsg;

                  ppseudo_hdr->length = htons(0x0012);

                  ppseudo_hdr->source = 0x10;
@@ -1861,7 +1861,7 @@ static int ft1000_proc_drvmsg (struct ft1000_device *dev, u16 size) { 
                  for (i=1; i<7; i++) {

                      ppseudo_hdr->checksum ^= *pmsg++;

                  }

                  pmsg = (PUSHORT)&tempbuffer[16];

                  pmsg = (u16 *)&tempbuffer[16];

                  *pmsg++ = htons(RSP_DRV_ERR_RPT_MSG);

                  *pmsg++ = htons(0x000e);

                  *pmsg++ = htons(info->DSP_TIME[0]);

drivers/staging/ft1000/ft1000-usb/ft1000_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include "ft1000_usb.h"



extern u16 ft1000_read_register(struct usb_device *dev, PUSHORT Data, u8 nRegIndx);

extern u16 ft1000_read_register(struct usb_device *dev, u16 *Data, u8 nRegIndx);

extern u16 ft1000_write_register(struct usb_device *dev, USHORT value, u8 nRegIndx);



#endif

drivers/staging/ft1000/ft1000-usb/ft1000_usb.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct prov_record { 
#define ULONG               u32 /* WTF ??? */

#define BOOLEAN             u8

#define PULONG              u32 *

#define PUSHORT             u16 *

#define PCHAR               u8 *

#define UINT                u32