projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
integrator: do not test first part of the memory
[oweals/u-boot.git]
/
drivers
/
block
/
sata_sil3114.c
diff --git
a/drivers/block/sata_sil3114.c
b/drivers/block/sata_sil3114.c
index 8399737ff53981de1f2c6bc42eaff241b2707cb0..1e60636ec20fde13f30b951669b719ecf8593a46 100644
(file)
--- a/
drivers/block/sata_sil3114.c
+++ b/
drivers/block/sata_sil3114.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) Excito Elektronik i Sk
å
ne AB, All rights reserved.
+ * Copyright (C) Excito Elektronik i Sk
å
ne AB, All rights reserved.
* Author: Tor Krill <tor@excito.com>
*
* This program is free software; you can redistribute it and/or
* Author: Tor Krill <tor@excito.com>
*
* This program is free software; you can redistribute it and/or
@@
-48,9
+48,9
@@
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 */
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[C
FG
_SATA_MAX_DEVICE];
+extern block_dev_desc_t sata_dev_desc[C
ONFIG_SYS
_SATA_MAX_DEVICE];
-static struct sata_port port[C
FG
_SATA_MAX_DEVICE];
+static struct sata_port port[C
ONFIG_SYS
_SATA_MAX_DEVICE];
static void output_data (struct sata_ioports *ioaddr, u16 * sect_buf, int words)
{
static void output_data (struct sata_ioports *ioaddr, u16 * sect_buf, int words)
{
@@
-96,7
+96,7
@@
static int sata_bus_softreset (int num)
}
if (status & ATA_BUSY) {
}
if (status & ATA_BUSY) {
- printf ("ata%u is slow to respond,plz be patient\n",
port
);
+ printf ("ata%u is slow to respond,plz be patient\n",
num
);
}
while ((status & ATA_BUSY)) {
}
while ((status & ATA_BUSY)) {
@@
-105,7
+105,7
@@
static int sata_bus_softreset (int num)
}
if (status & ATA_BUSY) {
}
if (status & ATA_BUSY) {
- printf ("ata%u failed to respond : ",
port
);
+ printf ("ata%u failed to respond : ",
num
);
printf ("bus reset failed\n");
port[num].dev_mask = 0;
return 1;
printf ("bus reset failed\n");
port[num].dev_mask = 0;
return 1;
@@
-171,7
+171,7
@@
static void sata_identify (int num, int dev)
sata_dev_desc[devno].removable = 0;
sata_dev_desc[devno].lba = (u32) n_sectors;
sata_dev_desc[devno].removable = 0;
sata_dev_desc[devno].lba = (u32) n_sectors;
- debug
("lba=0x%
x\n", sata_dev_desc[devno].lba);
+ debug
("lba=0x%l
x\n", sata_dev_desc[devno].lba);
#ifdef CONFIG_LBA48
if (iobuf[83] & (1 << 10)) {
#ifdef CONFIG_LBA48
if (iobuf[83] & (1 << 10)) {