diff options
author | Marek Belisko <marek.belisko@open-nandra.com> | 2011-03-10 05:51:33 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:51:21 -0400 |
commit | 8b2dab1cf8dec78aecaf1b4cf65fb316562699ca (patch) | |
tree | aa9f5b222709a91043dfe4717b8ea06221bc4bd3 /drivers | |
parent | 53cd3aa6194cf0f2970dd85e51b64e915e6ba99c (diff) |
staging: ft1000: Fix coding style in ft1000_receive_cmd function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 108 |
1 files changed, 61 insertions, 47 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index 3f70283d6ec..f1b4ce15daa 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | |||
@@ -1373,56 +1373,70 @@ static int ft1000_chkcard(struct ft1000_device *dev) | |||
1373 | // = 1 (successful) | 1373 | // = 1 (successful) |
1374 | // | 1374 | // |
1375 | //--------------------------------------------------------------------------- | 1375 | //--------------------------------------------------------------------------- |
1376 | static bool ft1000_receive_cmd (struct ft1000_device *dev, u16 *pbuffer, int maxsz, u16 *pnxtph) { | 1376 | static bool ft1000_receive_cmd(struct ft1000_device *dev, u16 *pbuffer, |
1377 | u16 size, ret; | 1377 | int maxsz, u16 *pnxtph) |
1378 | u16 *ppseudohdr; | 1378 | { |
1379 | int i; | 1379 | u16 size, ret; |
1380 | u16 tempword; | 1380 | u16 *ppseudohdr; |
1381 | int i; | ||
1382 | u16 tempword; | ||
1381 | 1383 | ||
1382 | ret = ft1000_read_dpram16(dev, FT1000_MAG_PH_LEN, (u8 *)&size, FT1000_MAG_PH_LEN_INDX); | 1384 | ret = |
1383 | size = ntohs(size) + PSEUDOSZ; | 1385 | ft1000_read_dpram16(dev, FT1000_MAG_PH_LEN, (u8 *) &size, |
1384 | if (size > maxsz) { | 1386 | FT1000_MAG_PH_LEN_INDX); |
1385 | DEBUG("FT1000:ft1000_receive_cmd:Invalid command length = %d\n", size); | 1387 | size = ntohs(size) + PSEUDOSZ; |
1386 | return FALSE; | 1388 | if (size > maxsz) { |
1387 | } | 1389 | DEBUG("FT1000:ft1000_receive_cmd:Invalid command length = %d\n", |
1388 | else { | 1390 | size); |
1389 | ppseudohdr = (u16 *)pbuffer; | 1391 | return FALSE; |
1390 | ft1000_write_register(dev, FT1000_DPRAM_MAG_RX_BASE, FT1000_REG_DPRAM_ADDR); | 1392 | } else { |
1391 | ret = ft1000_read_register(dev, pbuffer, FT1000_REG_MAG_DPDATAH); | 1393 | ppseudohdr = (u16 *) pbuffer; |
1392 | //DEBUG("ft1000_hw:received data = 0x%x\n", *pbuffer); | 1394 | ft1000_write_register(dev, FT1000_DPRAM_MAG_RX_BASE, |
1393 | pbuffer++; | 1395 | FT1000_REG_DPRAM_ADDR); |
1394 | ft1000_write_register(dev, FT1000_DPRAM_MAG_RX_BASE+1, FT1000_REG_DPRAM_ADDR); | 1396 | ret = |
1395 | for (i=0; i<=(size>>2); i++) { | 1397 | ft1000_read_register(dev, pbuffer, FT1000_REG_MAG_DPDATAH); |
1396 | ret = ft1000_read_register(dev, pbuffer, FT1000_REG_MAG_DPDATAL); | 1398 | //DEBUG("ft1000_hw:received data = 0x%x\n", *pbuffer); |
1397 | pbuffer++; | 1399 | pbuffer++; |
1398 | ret = ft1000_read_register(dev, pbuffer, FT1000_REG_MAG_DPDATAH); | 1400 | ft1000_write_register(dev, FT1000_DPRAM_MAG_RX_BASE + 1, |
1399 | pbuffer++; | 1401 | FT1000_REG_DPRAM_ADDR); |
1400 | } | 1402 | for (i = 0; i <= (size >> 2); i++) { |
1401 | //copy odd aligned word | 1403 | ret = |
1402 | ret = ft1000_read_register(dev, pbuffer, FT1000_REG_MAG_DPDATAL); | 1404 | ft1000_read_register(dev, pbuffer, |
1403 | //DEBUG("ft1000_hw:received data = 0x%x\n", *pbuffer); | 1405 | FT1000_REG_MAG_DPDATAL); |
1404 | pbuffer++; | 1406 | pbuffer++; |
1405 | ret = ft1000_read_register(dev, pbuffer, FT1000_REG_MAG_DPDATAH); | 1407 | ret = |
1406 | //DEBUG("ft1000_hw:received data = 0x%x\n", *pbuffer); | 1408 | ft1000_read_register(dev, pbuffer, |
1407 | pbuffer++; | 1409 | FT1000_REG_MAG_DPDATAH); |
1408 | if (size & 0x0001) { | 1410 | pbuffer++; |
1409 | //copy odd byte from fifo | 1411 | } |
1410 | ret = ft1000_read_register(dev, &tempword, FT1000_REG_DPRAM_DATA); | 1412 | /* copy odd aligned word */ |
1411 | *pbuffer = ntohs(tempword); | 1413 | ret = |
1412 | } | 1414 | ft1000_read_register(dev, pbuffer, FT1000_REG_MAG_DPDATAL); |
1415 | //DEBUG("ft1000_hw:received data = 0x%x\n", *pbuffer); | ||
1416 | pbuffer++; | ||
1417 | ret = | ||
1418 | ft1000_read_register(dev, pbuffer, FT1000_REG_MAG_DPDATAH); | ||
1419 | //DEBUG("ft1000_hw:received data = 0x%x\n", *pbuffer); | ||
1420 | pbuffer++; | ||
1421 | if (size & 0x0001) { | ||
1422 | /* copy odd byte from fifo */ | ||
1423 | ret = | ||
1424 | ft1000_read_register(dev, &tempword, | ||
1425 | FT1000_REG_DPRAM_DATA); | ||
1426 | *pbuffer = ntohs(tempword); | ||
1427 | } | ||
1428 | /* Check if pseudo header checksum is good | ||
1429 | * Calculate pseudo header checksum | ||
1430 | */ | ||
1431 | tempword = *ppseudohdr++; | ||
1432 | for (i = 1; i < 7; i++) | ||
1433 | tempword ^= *ppseudohdr++; | ||
1413 | 1434 | ||
1414 | // Check if pseudo header checksum is good | 1435 | if ((tempword != *ppseudohdr)) |
1415 | // Calculate pseudo header checksum | 1436 | return FALSE; |
1416 | tempword = *ppseudohdr++; | ||
1417 | for (i=1; i<7; i++) { | ||
1418 | tempword ^= *ppseudohdr++; | ||
1419 | } | ||
1420 | if ( (tempword != *ppseudohdr) ) { | ||
1421 | return FALSE; | ||
1422 | } | ||
1423 | 1437 | ||
1424 | return TRUE; | 1438 | return TRUE; |
1425 | } | 1439 | } |
1426 | } | 1440 | } |
1427 | 1441 | ||
1428 | 1442 | ||