staging: ft1000: Remove DSPINITMSG typedef usage. (369e857e) · Commits · 戴 / test

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -2081,7 +2081,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;
		@@ -2171,7 +2171,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);
		@@ -2185,7 +2185,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);

+12 −12

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ struct media_msg {
		u32 dns_2;
		} __attribute__ ((packed));

		typedef struct _DSPINITMSG {
		struct dsp_init_msg {
		PSEUDO_HDR pseudo;
		u16 type;
		u16 length;
		@@ -74,7 +74,7 @@ typedef struct _DSPINITMSG {
		u8 ProductMode[MODESZ]; // Product Mode (Market/Production)
		u8 RfCalVer[CALVERSZ]; // Rf Calibration version
		u8 RfCalDate[CALDATESZ]; // Rf Calibration date
		} __attribute__ ((packed)) DSPINITMSG, *PDSPINITMSG;
		} __attribute__ ((packed));


		typedef struct _APP_INFO_BLOCK