sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

sata.h: Make all sata/ata drivers include <sata.h> 

- block_dev_desc_t says that block_(read|write) take lbaint_t for blkcnt
  not ulong.
- We also move the extern of sata_dev_desc into <sata.h>
- Remove now duplicate declarations from driver-specific headers.

Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
This commit is contained in:
Pavel Herrmann 2012-09-27 23:18:04 +00:00 committed by Tom Rini
parent 4ac8f8e022
commit e46a4350b4
12 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/block/ata_piix.c
View File

@ -34,9 +34,7 @@
#include <part.h>
#include <ide.h>
#include <ata.h>
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
extern int sata_curr_device;
#include <sata.h>
#define DEBUG_SATA 0 /* For debug prints set DEBUG_SATA to 1 */

2
drivers/block/ata_piix.h
View File

@ -56,8 +56,6 @@ int sata_devchk(struct sata_ioports *ioaddr, int dev);
void dev_select(struct sata_ioports *ioaddr, int dev);
u8 sata_busy_wait(struct sata_ioports *ioaddr, int bits, unsigned int max);
u8 sata_chk_status(struct sata_ioports *ioaddr);
ulong sata_read(int device, ulong blknr,lbaint_t blkcnt, void *buffer);
ulong sata_write(int device,ulong blknr, lbaint_t blkcnt, const void *buffer);
#endif
/************DRIVER SPECIFIC DEFINITIONS AND DECLARATIONS**************/

1
drivers/block/dwc_ahsata.c
View File

@ -24,6 +24,7 @@
#include <libata.h>
#include <ahci.h>
#include <fis.h>
#include <sata.h>
#include <common.h>
#include <malloc.h>

2
drivers/block/dwc_ahsata.h
View File

@ -330,6 +330,4 @@
#define READ_CMD 0
#define WRITE_CMD 1
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
#endif /* __FSL_SATA_H__ */

3
drivers/block/fsl_sata.c
View File

@ -26,10 +26,9 @@
#include <malloc.h>
#include <libata.h>
#include <fis.h>
#include <sata.h>
#include "fsl_sata.h"
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
#ifndef CONFIG_SYS_SATA1_FLAGS
#define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA
#endif

1
drivers/block/pata_bfin.c
View File

@ -17,6 +17,7 @@
#include <asm/portmux.h>
#include <asm/mach-common/bits/pata.h>
#include <ata.h>
#include <sata.h>
#include <libata.h>
#include "pata_bfin.h"

2
drivers/block/pata_bfin.h
View File

@ -41,8 +41,6 @@ struct ata_port {
unsigned char dev_mask;
};
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
#define DRV_NAME "pata-bfin"
#define DRV_VERSION "0.9"
#define __iomem

3
drivers/block/sata_dwc.c
View File

@ -35,6 +35,7 @@
#include <asm/io.h>
#include <malloc.h>
#include <ata.h>
#include <sata.h>
#include <linux/ctype.h>
#include "sata_dwc.h"
@ -268,8 +269,6 @@ static int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
unsigned int flags, u16 *id);
static int check_sata_dev_state(void);
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
static const struct ata_port_info sata_dwc_port_info[] = {
{
.flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

1
drivers/block/sata_sil.c
View File

@ -25,6 +25,7 @@
#include <malloc.h>
#include <asm/io.h>
#include <fis.h>
#include <sata.h>
#include <libata.h>
#include "sata_sil.h"

2
drivers/block/sata_sil.h
View File

@ -24,8 +24,6 @@
#define READ_CMD 0
#define WRITE_CMD 1
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
/*
* SATA device driver struct for each dev
*/

2
drivers/block/sata_sil3114.c
View File

@ -28,6 +28,7 @@
#include <asm/byteorder.h>
#include <asm/io.h>
#include <ide.h>
#include <sata.h>
#include <libata.h>
#include "sata_sil3114.h"
@ -48,7 +49,6 @@ static u8 sata_chk_status (struct sata_ioports *ioaddr, u8 usealtstatus);
static void msleep (int count);
static u32 iobase[6] = { 0, 0, 0, 0, 0, 0}; /* PCI BAR registers for device */
extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
static struct sata_port port[CONFIG_SYS_SATA_MAX_DEVICE];

7
include/sata.h
View File

@ -1,12 +1,15 @@
#ifndef __SATA_H__
#define __SATA_H__
#include <part.h>
int init_sata(int dev);
int scan_sata(int dev);
ulong sata_read(int dev, ulong blknr, ulong blkcnt, void *buffer);
ulong sata_write(int dev, ulong blknr, ulong blkcnt, const void *buffer);
ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer);
ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer);
int sata_initialize(void);
int __sata_initialize(void);
extern block_dev_desc_t sata_dev_desc[];
#endif