mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
[PATCH 9_9] Use "void *" not "unsigned long *" for block dev read_write buffer pointers
Block device read/write is anonymous data; there is no need to use a typed pointer. void * is fine. Also add a hook for block_read functions Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
parent
53758fa20e
commit
eb867a7623
7 changed files with 15 additions and 16 deletions
|
@ -188,7 +188,7 @@ static void ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len
|
|||
|
||||
#ifdef CONFIG_ATAPI
|
||||
static void atapi_inquiry(block_dev_desc_t *dev_desc);
|
||||
ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, ulong *buffer);
|
||||
ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer);
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -1233,7 +1233,7 @@ static void ide_ident (block_dev_desc_t *dev_desc)
|
|||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, ulong *buffer)
|
||||
ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
|
||||
{
|
||||
ulong n = 0;
|
||||
unsigned char c;
|
||||
|
@ -1353,7 +1353,7 @@ IDE_READ_E:
|
|||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
|
||||
ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, ulong *buffer)
|
||||
ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
|
||||
{
|
||||
ulong n = 0;
|
||||
unsigned char c;
|
||||
|
@ -2015,7 +2015,7 @@ static void atapi_inquiry(block_dev_desc_t * dev_desc)
|
|||
#define ATAPI_READ_BLOCK_SIZE 2048 /* assuming CD part */
|
||||
#define ATAPI_READ_MAX_BLOCK ATAPI_READ_MAX_BYTES/ATAPI_READ_BLOCK_SIZE /* max blocks */
|
||||
|
||||
ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, ulong *buffer)
|
||||
ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
|
||||
{
|
||||
ulong n = 0;
|
||||
unsigned char ccb[12]; /* Command descriptor block */
|
||||
|
|
|
@ -74,7 +74,7 @@ void scsi_setup_inquiry(ccb * pccb);
|
|||
void scsi_ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len);
|
||||
|
||||
|
||||
ulong scsi_read(int device, ulong blknr, ulong blkcnt, ulong *buffer);
|
||||
ulong scsi_read(int device, ulong blknr, ulong blkcnt, void *buffer);
|
||||
|
||||
|
||||
/*********************************************************************************
|
||||
|
@ -424,7 +424,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
|
||||
#define SCSI_MAX_READ_BLK 0xFFFF /* almost the maximum amount of the scsi_ext command.. */
|
||||
|
||||
ulong scsi_read(int device, ulong blknr, ulong blkcnt, ulong *buffer)
|
||||
ulong scsi_read(int device, ulong blknr, ulong blkcnt, void *buffer)
|
||||
{
|
||||
ulong start,blks, buf_addr;
|
||||
unsigned short smallblks;
|
||||
|
|
|
@ -169,7 +169,7 @@ static struct us_data usb_stor[USB_MAX_STOR_DEV];
|
|||
|
||||
int usb_stor_get_info(struct usb_device *dev, struct us_data *us, block_dev_desc_t *dev_desc);
|
||||
int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,struct us_data *ss);
|
||||
unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, unsigned long *buffer);
|
||||
unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, void *buffer);
|
||||
struct usb_device * usb_get_dev_index(int index);
|
||||
void uhci_show_temp_int_td(void);
|
||||
|
||||
|
@ -941,7 +941,7 @@ static void usb_bin_fixup(struct usb_device_descriptor descriptor,
|
|||
|
||||
#define USB_MAX_READ_BLK 20
|
||||
|
||||
unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, unsigned long *buffer)
|
||||
unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, void *buffer)
|
||||
{
|
||||
unsigned long start,blks, buf_addr;
|
||||
unsigned short smallblks;
|
||||
|
|
|
@ -363,7 +363,7 @@ mmc_write(uchar *src, ulong dst, int size)
|
|||
|
||||
ulong
|
||||
/****************************************************/
|
||||
mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst)
|
||||
mmc_bread(int dev_num, ulong blknr, ulong blkcnt, void *dst)
|
||||
/****************************************************/
|
||||
{
|
||||
int mmc_block_size = MMC_BLOCK_SIZE;
|
||||
|
|
|
@ -73,8 +73,7 @@
|
|||
/* */
|
||||
|
||||
static unsigned long systemace_read(int dev, unsigned long start,
|
||||
unsigned long blkcnt,
|
||||
unsigned long *buffer);
|
||||
unsigned long blkcnt, void *buffer);
|
||||
|
||||
static block_dev_desc_t systemace_dev = { 0 };
|
||||
|
||||
|
@ -133,11 +132,11 @@ block_dev_desc_t *systemace_get_dev(int dev)
|
|||
* number of blocks read. A zero return indicates an error.
|
||||
*/
|
||||
static unsigned long systemace_read(int dev, unsigned long start,
|
||||
unsigned long blkcnt, unsigned long *buffer)
|
||||
unsigned long blkcnt, void *buffer)
|
||||
{
|
||||
int retry;
|
||||
unsigned blk_countdown;
|
||||
unsigned char *dp = (unsigned char *)buffer;
|
||||
unsigned char *dp = buffer;
|
||||
unsigned val;
|
||||
|
||||
if (get_cf_lock() < 0) {
|
||||
|
|
|
@ -49,7 +49,7 @@ typedef ulong lbaint_t;
|
|||
*/
|
||||
|
||||
void ide_init(void);
|
||||
ulong ide_read(int device, lbaint_t blknr, ulong blkcnt, ulong *buffer);
|
||||
ulong ide_write(int device, lbaint_t blknr, ulong blkcnt, ulong *buffer);
|
||||
ulong ide_read(int device, lbaint_t blknr, ulong blkcnt, void *buffer);
|
||||
ulong ide_write(int device, lbaint_t blknr, ulong blkcnt, void *buffer);
|
||||
|
||||
#endif /* _IDE_H */
|
||||
|
|
|
@ -44,7 +44,7 @@ typedef struct block_dev_desc {
|
|||
unsigned long (*block_read)(int dev,
|
||||
unsigned long start,
|
||||
lbaint_t blkcnt,
|
||||
unsigned long *buffer);
|
||||
void *buffer);
|
||||
unsigned long (*block_write)(int dev,
|
||||
unsigned long start,
|
||||
lbaint_t blkcnt,
|
||||
|
|
Loading…
Add table
Reference in a new issue