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

staging: ft1000: Fix coding style in get_handshake_usb() 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:42 +01:00 committed by Greg Kroah-Hartman
parent a8d4d198a7
commit 5865a18eaa
1 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,42 +273,50 @@ static void put_handshake(struct ft1000_device *ft1000dev,u16 handshake_value)
static u16 get_handshake_usb(struct ft1000_device *ft1000dev, u16 expected_value) 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)
{
if (pft1000info->usbboot == 2) {
status = ft1000_read_dpram32 (ft1000dev, 0, (u8 *)&(pft1000info->tempbuf[0]), 64);
for (temp=0; temp<16; temp++)
DEBUG("tempbuf %d = 0x%x\n", temp, pft1000info->tempbuf[temp]);
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;
else {
handshake = pft1000info->tempbuf[1];
pft1000info->dspalive = pft1000info->tempbuf[6];
}
}
else {
status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
}
loopcnt++;
msleep(10);
handshake = ntohs(handshake);
if ((handshake == expected_value) || (handshake == HANDSHAKE_RESET_VALUE_USB))
{
return handshake;
}
}
return HANDSHAKE_TIMEOUT_VALUE; while (loopcnt < 100) {
if (pft1000info->usbboot == 2) {
status = ft1000_read_dpram32(ft1000dev, 0,
(u8 *)&(pft1000info->tempbuf[0]), 64);
for (temp = 0; temp < 16; temp++) {
DEBUG("tempbuf %d = 0x%x\n", temp,
pft1000info->tempbuf[temp]);
}
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;
} else {
handshake = pft1000info->tempbuf[1];
pft1000info->dspalive =
pft1000info->tempbuf[6];
}
} else {
status = ft1000_read_dpram16(ft1000dev,
DWNLD_MAG1_HANDSHAKE_LOC,
(u8 *)&handshake, 1);
}
loopcnt++;
msleep(10);
handshake = ntohs(handshake);
if ((handshake == expected_value) ||
(handshake == HANDSHAKE_RESET_VALUE_USB))
return handshake;
}
return HANDSHAKE_TIMEOUT_VALUE;
} }
static void put_handshake_usb(struct ft1000_device *ft1000dev,u16 handshake_value) static void put_handshake_usb(struct ft1000_device *ft1000dev,u16 handshake_value)