lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] W1: Change the type 'unsigned long' member of 'struct w1_bus_master' to 'void *'.

Browse Source 
Signed-off-by: Ben Gardner <bgardner@wabtec.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Evgeniy Polyakov
2005-12-06 13:38:27 +03:00
committed by Greg Kroah-Hartman
parent a1a051b187
commit ccd6994000
4 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/w1/w1.h
View File

@@ -80,7 +80,7 @@ struct w1_slave
struct completion released;
};
typedef void (* w1_slave_found_callback)(unsigned long, u64);
typedef void (* w1_slave_found_callback)(void *, u64);
/**
@@ -93,16 +93,16 @@ typedef void (* w1_slave_found_callback)(unsigned long, u64);
struct w1_bus_master
{
/** the first parameter in all the functions below */
unsigned long data;
void *data;
/**
* Sample the line level
* @return the level read (0 or 1)
*/
u8 (*read_bit)(unsigned long);
u8 (*read_bit)(void *);
/** Sets the line level */
void (*write_bit)(unsigned long, u8);
void (*write_bit)(void *, u8);
/**
* touch_bit is the lowest-level function for devices that really
@@ -111,42 +111,42 @@ struct w1_bus_master
* touch_bit(1) = write-1 / read cycle
* @return the bit read (0 or 1)
*/
u8 (*touch_bit)(unsigned long, u8);
u8 (*touch_bit)(void *, u8);
/**
* Reads a bytes. Same as 8 touch_bit(1) calls.
* @return the byte read
*/
u8 (*read_byte)(unsigned long);
u8 (*read_byte)(void *);
/**
* Writes a byte. Same as 8 touch_bit(x) calls.
*/
void (*write_byte)(unsigned long, u8);
void (*write_byte)(void *, u8);
/**
* Same as a series of read_byte() calls
* @return the number of bytes read
*/
u8 (*read_block)(unsigned long, u8 *, int);
u8 (*read_block)(void *, u8 *, int);
/** Same as a series of write_byte() calls */
void (*write_block)(unsigned long, const u8 *, int);
void (*write_block)(void *, const u8 *, int);
/**
* Combines two reads and a smart write for ROM searches
* @return bit0=Id bit1=comp_id bit2=dir_taken
*/
u8 (*triplet)(unsigned long, u8);
u8 (*triplet)(void *, u8);
/**
* long write-0 with a read for the presence pulse detection
* @return -1=Error, 0=Device present, 1=No device present
*/
u8 (*reset_bus)(unsigned long);
u8 (*reset_bus)(void *);
/** Really nice hardware can handles the ROM searches */
void (*search)(unsigned long, w1_slave_found_callback);
void (*search)(void *, w1_slave_found_callback);
};
#define W1_MASTER_NEED_EXIT 0