---

yaml --- r: 220360 b: refs/heads/master c: 369e857 h: refs/heads/master v: v3
git-mirror · Oct 15, 2010 · cb81200 · cb81200
1 parent 492804d
commit cb81200
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b8a30121717c04ecd18a8d5f385530e039d7ac2
+refs/heads/master: 369e857e9610c9a2474df8817ab0087de5765f2d
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -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);

diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/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