diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2010-02-26 17:58:07 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 16:43:07 -0800 |
commit | 3a8954e8f22cf31791d8c524c2839433e39f9368 (patch) | |
tree | cf2882bb6f05494e31ec485a63917255e5ca9ebc /drivers/staging/dt3155/dt3155.h | |
parent | 5617f9da4619ec975514e6b385a052e024215da3 (diff) |
staging: dt3155: revert u_long to u64 usage
Commit 9c1390a923ddb6fba1cf9d7440743369140c6d8a replaced
all u_int's with u32 and u_long's with u64. Unfortunately, a u_long
is still only 32-bits so they should have been replaced with u32 also.
This can be verified by the register definitions in dt3155_io.h. It
specifically states that the memory mapped registers are 32-bit.
Fix this by changing all the u64 to u32.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/dt3155/dt3155.h')
-rw-r--r-- | drivers/staging/dt3155/dt3155.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/dt3155/dt3155.h b/drivers/staging/dt3155/dt3155.h index 22292b102a3..1bf786364ee 100644 --- a/drivers/staging/dt3155/dt3155.h +++ b/drivers/staging/dt3155/dt3155.h @@ -79,8 +79,8 @@ struct dt3155_config_s { /* hold data for each frame */ typedef struct { - u64 addr; /* address of the buffer with the frame */ - u64 tag; /* unique number for the frame */ + u32 addr; /* address of the buffer with the frame */ + u32 tag; /* unique number for the frame */ struct timeval time; /* time that capture took place */ } frame_info_t; @@ -101,14 +101,14 @@ struct dt3155_fbuffer_s { int locked_buf; /* Buffers used by user */ int ready_que[BOARD_MAX_BUFFS]; - u64 ready_head; /* The most recent buffer located here */ - u64 ready_len; /* The number of ready buffers */ + u32 ready_head; /* The most recent buffer located here */ + u32 ready_len; /* The number of ready buffers */ int even_happened; int even_stopped; int stop_acquire; /* Flag to stop interrupts */ - u64 frame_count; /* Counter for frames acquired by this card */ + u32 frame_count; /* Counter for frames acquired by this card */ }; @@ -122,13 +122,13 @@ struct dt3155_fbuffer_s { /* There is one status structure for each card. */ typedef struct dt3155_status_s { int fixed_mode; /* if 1, we are in fixed frame mode */ - u64 reg_addr; /* Register address for a single card */ - u64 mem_addr; /* Buffer start addr for this card */ - u64 mem_size; /* This is the amount of mem available */ + u32 reg_addr; /* Register address for a single card */ + u32 mem_addr; /* Buffer start addr for this card */ + u32 mem_size; /* This is the amount of mem available */ u32 irq; /* this card's irq */ struct dt3155_config_s config; /* configuration struct */ struct dt3155_fbuffer_s fbuffer; /* frame buffer state struct */ - u64 state; /* this card's state */ + u32 state; /* this card's state */ u32 device_installed; /* Flag if installed. 1=installed */ } dt3155_status_t; @@ -161,9 +161,9 @@ extern struct dt3155_status_s dt3155_status[MAXBOARDS]; /* User code will probably want to declare one of these for each card */ typedef struct dt3155_read_s { - u64 offset; - u64 frame_seq; - u64 state; + u32 offset; + u32 frame_seq; + u32 state; frame_info_t frame_info; } dt3155_read_t; |