Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 228031
b: refs/heads/master
c: 84b7801
h: refs/heads/master
i:
  228029: a68a001
  228027: 6465ab2
  228023: 1098cb4
  228015: 633927c
  227999: c86ddd9
  227967: 84462b2
v: v3
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Nov 10, 2010
1 parent 3c7ad86 commit 316c5ec
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d44d76f93dafdbaeac0f1d541f3867777de65c8a
refs/heads/master: 84b7801d135ca90903df3a9170b9db5978fe8fce
52 changes: 26 additions & 26 deletions trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ struct dsp_image_info {
// Notes:
//
//---------------------------------------------------------------------------
static ULONG check_usb_db (struct ft1000_device *ft1000dev)
static u32 check_usb_db (struct ft1000_device *ft1000dev)
{
int loopcnt;
u16 temp;
ULONG status;
u32 status;

loopcnt = 0;
while (loopcnt < 10)
Expand Down Expand Up @@ -204,7 +204,7 @@ static u16 get_handshake(struct ft1000_device *ft1000dev, u16 expected_value)
{
u16 handshake;
int loopcnt;
ULONG status=0;
u32 status=0;
struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);

loopcnt = 0;
Expand Down Expand Up @@ -271,13 +271,13 @@ static u16 get_handshake(struct ft1000_device *ft1000dev, u16 expected_value)
//---------------------------------------------------------------------------
static void put_handshake(struct ft1000_device *ft1000dev,u16 handshake_value)
{
ULONG tempx;
u32 tempx;
u16 tempword;
ULONG status;
u32 status;



tempx = (ULONG)handshake_value;
tempx = (u32)handshake_value;
tempx = ntohl(tempx);

tempword = (u16)(tempx & 0xffff);
Expand All @@ -292,7 +292,7 @@ static u16 get_handshake_usb(struct ft1000_device *ft1000dev, u16 expected_value
u16 handshake;
int loopcnt;
u16 temp;
ULONG status=0;
u32 status=0;

struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
loopcnt = 0;
Expand Down Expand Up @@ -349,9 +349,9 @@ static void put_handshake_usb(struct ft1000_device *ft1000dev,u16 handshake_valu
static u16 get_request_type(struct ft1000_device *ft1000dev)
{
u16 request_type;
ULONG status;
u32 status;
u16 tempword;
ULONG tempx;
u32 tempx;
struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);

if ( pft1000info->bootmode == 1)
Expand All @@ -377,9 +377,9 @@ static u16 get_request_type(struct ft1000_device *ft1000dev)
static u16 get_request_type_usb(struct ft1000_device *ft1000dev)
{
u16 request_type;
ULONG status;
u32 status;
u16 tempword;
ULONG tempx;
u32 tempx;
struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
if ( pft1000info->bootmode == 1)
{
Expand Down Expand Up @@ -420,9 +420,9 @@ static u16 get_request_type_usb(struct ft1000_device *ft1000dev)
//---------------------------------------------------------------------------
static long get_request_value(struct ft1000_device *ft1000dev)
{
ULONG value;
u32 value;
u16 tempword;
ULONG status;
u32 status;
struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);


Expand All @@ -449,9 +449,9 @@ static long get_request_value(struct ft1000_device *ft1000dev)
#if 0
static long get_request_value_usb(struct ft1000_device *ft1000dev)
{
ULONG value;
u32 value;
u16 tempword;
ULONG status;
u32 status;
struct ft1000_info * pft1000info = netdev_priv(ft1000dev->net);

if (pft1000info->usbboot == 2) {
Expand Down Expand Up @@ -490,8 +490,8 @@ static long get_request_value_usb(struct ft1000_device *ft1000dev)
//---------------------------------------------------------------------------
static void put_request_value(struct ft1000_device *ft1000dev, long lvalue)
{
ULONG tempx;
ULONG status;
u32 tempx;
u32 status;

tempx = ntohl(lvalue);
status = fix_ft1000_write_dpram32(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempx);
Expand Down Expand Up @@ -546,9 +546,9 @@ static u16 hdr_checksum(struct pseudo_hdr *pHdr)
// Notes:
//
//---------------------------------------------------------------------------
static ULONG write_blk (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)
static u32 write_blk (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)
{
ULONG Status = STATUS_SUCCESS;
u32 Status = STATUS_SUCCESS;
u16 dpram;
long temp_word_length;
int loopcnt, i, j;
Expand Down Expand Up @@ -702,9 +702,9 @@ static void usb_dnld_complete (struct urb *urb)
// Notes:
//
//---------------------------------------------------------------------------
static ULONG write_blk_fifo (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)
static u32 write_blk_fifo (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length)
{
ULONG Status = STATUS_SUCCESS;
u32 Status = STATUS_SUCCESS;
int byte_length;
long aligncnt;

Expand Down Expand Up @@ -770,7 +770,7 @@ static ULONG write_blk_fifo (struct ft1000_device *ft1000dev, u16 **pUsFile, u8
// Returns: status - return code
//---------------------------------------------------------------------------

u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLength)
u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32 FileLength)
{
u16 Status = STATUS_SUCCESS;
UINT uiState;
Expand All @@ -795,8 +795,8 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
long loader_code_address, loader_code_size = 0;
long run_address = 0, run_size = 0;

ULONG templong;
ULONG image_chksum = 0;
u32 templong;
u32 image_chksum = 0;

u16 dpram = 0;
u8 *pbuffer;
Expand Down Expand Up @@ -1114,7 +1114,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
templong = temp;
temp = (u16)(pDspImageInfoV6->version >> 16);
templong |= (temp << 16);
if (templong == (ULONG)requested_version)
if (templong == (u32)requested_version)
{
bGoodVersion = TRUE;
DEBUG("FT1000:download: bGoodVersion is TRUE\n");
Expand All @@ -1123,7 +1123,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
pCodeEnd = (u8 *)(pFileStart + pDspImageInfoV6->end_offset);
run_address = pDspImageInfoV6->run_address;
run_size = pDspImageInfoV6->image_size;
image_chksum = (ULONG)pDspImageInfoV6->checksum;
image_chksum = (u32)pDspImageInfoV6->checksum;
break;
}
pDspImageInfoV6++;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ int dsp_reload(struct ft1000_device *ft1000dev)
{
u16 status;
u16 tempword;
ULONG templong;
u32 templong;

struct ft1000_info *pft1000info;

Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ struct prov_record {
/*end of Jim*/
#define DEBUG(args...) printk(KERN_INFO args)

#define ULONG u32 /* WTF ??? */
#define BOOLEAN u8
#define PCHAR u8 *
#define UINT u32
Expand Down Expand Up @@ -572,7 +571,7 @@ extern size_t FileLength;
extern int numofmsgbuf;

int ft1000_close (struct net_device *dev);
u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLength);
u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, u32 FileLength);

extern struct list_head freercvpool;
extern spinlock_t free_buff_lock; // lock to arbitrate free buffer list for receive command data
Expand Down

0 comments on commit 316c5ec

Please sign in to comment.