aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/ft1000/ft1000-usb/ft1000_download.c')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_download.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index ee32f40b359..4dd456fbab9 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -205,7 +205,7 @@ static USHORT get_handshake(struct ft1000_device *ft1000dev, USHORT expected_val
205 USHORT handshake; 205 USHORT handshake;
206 int loopcnt; 206 int loopcnt;
207 ULONG status=0; 207 ULONG status=0;
208 PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); 208 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
209 209
210 loopcnt = 0; 210 loopcnt = 0;
211 while (loopcnt < 100) 211 while (loopcnt < 100)
@@ -294,7 +294,7 @@ static USHORT get_handshake_usb(struct ft1000_device *ft1000dev, USHORT expected
294 USHORT temp; 294 USHORT temp;
295 ULONG status=0; 295 ULONG status=0;
296 296
297 PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); 297 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
298 loopcnt = 0; 298 loopcnt = 0;
299 handshake = 0; 299 handshake = 0;
300 while (loopcnt < 100) 300 while (loopcnt < 100)
@@ -352,7 +352,7 @@ static USHORT get_request_type(struct ft1000_device *ft1000dev)
352 ULONG status; 352 ULONG status;
353 USHORT tempword; 353 USHORT tempword;
354 ULONG tempx; 354 ULONG tempx;
355 PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); 355 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
356 356
357 if ( pft1000info->bootmode == 1) 357 if ( pft1000info->bootmode == 1)
358 { 358 {
@@ -380,7 +380,7 @@ static USHORT get_request_type_usb(struct ft1000_device *ft1000dev)
380 ULONG status; 380 ULONG status;
381 USHORT tempword; 381 USHORT tempword;
382 ULONG tempx; 382 ULONG tempx;
383 PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); 383 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
384 if ( pft1000info->bootmode == 1) 384 if ( pft1000info->bootmode == 1)
385 { 385 {
386 status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (PUCHAR)&tempx); 386 status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (PUCHAR)&tempx);
@@ -423,7 +423,7 @@ static long get_request_value(struct ft1000_device *ft1000dev)
423 ULONG value; 423 ULONG value;
424 USHORT tempword; 424 USHORT tempword;
425 ULONG status; 425 ULONG status;
426 PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); 426 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
427 427
428 428
429 if ( pft1000info->bootmode == 1) 429 if ( pft1000info->bootmode == 1)
@@ -452,7 +452,7 @@ static long get_request_value_usb(struct ft1000_device *ft1000dev)
452 ULONG value; 452 ULONG value;
453 USHORT tempword; 453 USHORT tempword;
454 ULONG status; 454 ULONG status;
455 PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); 455 struct ft1000_info * pft1000info = netdev_priv(ft1000dev->net);
456 456
457 if (pft1000info->usbboot == 2) { 457 if (pft1000info->usbboot == 2) {
458 value = pft1000info->tempbuf[4]; 458 value = pft1000info->tempbuf[4];
@@ -556,7 +556,7 @@ static ULONG write_blk (struct ft1000_device *ft1000dev, USHORT **pUsFile, UCHAR
556 USHORT tempword; 556 USHORT tempword;
557 USHORT tempbuffer[64]; 557 USHORT tempbuffer[64];
558 USHORT resultbuffer[64]; 558 USHORT resultbuffer[64];
559 PFT1000_INFO pft1000info = netdev_priv(ft1000dev->net); 559 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
560 560
561 //DEBUG("FT1000:download:start word_length = %d\n",(int)word_length); 561 //DEBUG("FT1000:download:start word_length = %d\n",(int)word_length);
562 dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC; 562 dpram = (USHORT)DWNLD_MAG1_PS_HDR_LOC;
@@ -801,7 +801,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
801 USHORT dpram = 0; 801 USHORT dpram = 0;
802 PUCHAR pbuffer; 802 PUCHAR pbuffer;
803 struct prov_record *pprov_record; 803 struct prov_record *pprov_record;
804 FT1000_INFO *pft1000info = netdev_priv(ft1000dev->net); 804 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
805 805
806 DEBUG("Entered scram_dnldr...\n"); 806 DEBUG("Entered scram_dnldr...\n");
807 807