Commit 5865a18e authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman

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

Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a8d4d198
...@@ -276,37 +276,45 @@ static u16 get_handshake_usb(struct ft1000_device *ft1000dev, u16 expected_value ...@@ -276,37 +276,45 @@ static u16 get_handshake_usb(struct ft1000_device *ft1000dev, u16 expected_value
u16 handshake; u16 handshake;
int loopcnt; int loopcnt;
u16 temp; u16 temp;
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;
handshake = 0; handshake = 0;
while (loopcnt < 100)
{ while (loopcnt < 100) {
if (pft1000info->usbboot == 2) { if (pft1000info->usbboot == 2) {
status = ft1000_read_dpram32 (ft1000dev, 0, (u8 *)&(pft1000info->tempbuf[0]), 64); status = ft1000_read_dpram32(ft1000dev, 0,
for (temp=0; temp<16; temp++) (u8 *)&(pft1000info->tempbuf[0]), 64);
DEBUG("tempbuf %d = 0x%x\n", temp, pft1000info->tempbuf[temp]); for (temp = 0; temp < 16; temp++) {
status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1); DEBUG("tempbuf %d = 0x%x\n", temp,
DEBUG("handshake from read_dpram16 = 0x%x\n", handshake); pft1000info->tempbuf[temp]);
if (pft1000info->dspalive == pft1000info->tempbuf[6]) }
status = ft1000_read_dpram16(ft1000dev,
DWNLD_MAG1_HANDSHAKE_LOC,
(u8 *)&handshake, 1);
DEBUG("handshake from read_dpram16 = 0x%x\n",
handshake);
if (pft1000info->dspalive == pft1000info->tempbuf[6]) {
handshake = 0; handshake = 0;
else { } else {
handshake = pft1000info->tempbuf[1]; handshake = pft1000info->tempbuf[1];
pft1000info->dspalive = pft1000info->tempbuf[6]; pft1000info->dspalive =
} pft1000info->tempbuf[6];
} }
else { } else {
status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1); status = ft1000_read_dpram16(ft1000dev,
DWNLD_MAG1_HANDSHAKE_LOC,
(u8 *)&handshake, 1);
} }
loopcnt++; loopcnt++;
msleep(10); msleep(10);
handshake = ntohs(handshake); handshake = ntohs(handshake);
if ((handshake == expected_value) || (handshake == HANDSHAKE_RESET_VALUE_USB)) if ((handshake == expected_value) ||
{ (handshake == HANDSHAKE_RESET_VALUE_USB))
return handshake; return handshake;
} }
}
return HANDSHAKE_TIMEOUT_VALUE; return HANDSHAKE_TIMEOUT_VALUE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment