leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: ft1000: Fix coding style in get_handshake() function.

Browse Source 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marek Belisko 2011-02-03 11:07:49 +01:00 committed by Greg Kroah-Hartman
parent 78395f672a
commit d7a7318b38
1 changed files with 36 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
drivers/staging/ft1000/ft1000-usb/ft1000_download.c
View File

@ -185,57 +185,49 @@ static u32 check_usb_db (struct ft1000_device *ft1000dev)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static u16 get_handshake(struct ft1000_device *ft1000dev, u16 expected_value) static u16 get_handshake(struct ft1000_device *ft1000dev, u16 expected_value)
{ {
u16 handshake; u16 handshake;
int loopcnt; int loopcnt;
u32 status=0; u32 status = 0;
struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
loopcnt = 0; loopcnt = 0;
while (loopcnt < 100)
{
// Need to clear downloader doorbell if Hartley ASIC while (loopcnt < 100) {
status = ft1000_write_register (ft1000dev, FT1000_DB_DNLD_RX, FT1000_REG_DOORBELL); /* Need to clear downloader doorbell if Hartley ASIC */
//DEBUG("FT1000:get_handshake:doorbell = 0x%x\n", temp); status = ft1000_write_register(ft1000dev, FT1000_DB_DNLD_RX,
if (pft1000info->fcodeldr) FT1000_REG_DOORBELL);
{ if (pft1000info->fcodeldr) {
DEBUG(" get_handshake: fcodeldr is %d\n", pft1000info->fcodeldr); DEBUG(" get_handshake: fcodeldr is %d\n",
pft1000info->fcodeldr = 0; pft1000info->fcodeldr);
status = check_usb_db(ft1000dev); pft1000info->fcodeldr = 0;
if (status != STATUS_SUCCESS) status = check_usb_db(ft1000dev);
{ if (status != STATUS_SUCCESS) {
DEBUG("get_handshake: check_usb_db failed\n"); DEBUG("get_handshake: check_usb_db failed\n");
status = STATUS_FAILURE; status = STATUS_FAILURE;
break; break;
} }
status = ft1000_write_register (ft1000dev, FT1000_DB_DNLD_RX, FT1000_REG_DOORBELL); status = ft1000_write_register(ft1000dev,
} FT1000_DB_DNLD_RX,
FT1000_REG_DOORBELL);
}
status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1); status = ft1000_read_dpram16(ft1000dev,
//DEBUG("get_handshake: handshake is %x\n", tempx); DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
handshake = ntohs(handshake); handshake = ntohs(handshake);
//DEBUG("get_handshake: after swap, handshake is %x\n", handshake);
if (status) if (status)
return HANDSHAKE_TIMEOUT_VALUE; return HANDSHAKE_TIMEOUT_VALUE;
//DEBUG("get_handshake: handshake= %x\n", handshake); if ((handshake == expected_value) ||
if ((handshake == expected_value) || (handshake == HANDSHAKE_RESET_VALUE_USB)) (handshake == HANDSHAKE_RESET_VALUE_USB)) {
{ return handshake;
//DEBUG("get_handshake: return handshake %x\n", handshake); } else {
return handshake; loopcnt++;
} msleep(10);
else }
{ }
loopcnt++;
msleep (10);
}
//DEBUG("HANDSHKE LOOP: %d\n", loopcnt);
} return HANDSHAKE_TIMEOUT_VALUE;
//DEBUG("get_handshake: return handshake time out\n");
return HANDSHAKE_TIMEOUT_VALUE;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------