diff options
| author | wdenk | 2004-04-18 17:39:38 +0000 |
|---|---|---|
| committer | wdenk | 2004-04-18 17:39:38 +0000 |
| commit | 6e5923851ec5c11a36136abc77160d834537c4dd (patch) | |
| tree | 1d324917e695bf3aadc0041d220304d07d09027a /common/cmd_ide.c | |
| parent | c26e454dfc6650428854fa2db3b1ed7f19e0ba0e (diff) | |
* Cleanup, minor fixes
* Patch by Rune Torgersen, 16 Apr 2004:
LBA48 fixes
* Patches by Pantelis Antoniou, 16 Apr 2004:
- Fix some compile problems;
add "once" functionality for the netretry variable
Diffstat (limited to 'common/cmd_ide.c')
| -rw-r--r-- | common/cmd_ide.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index baab8715c94..50ada33e869 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -1186,13 +1186,12 @@ static void ide_ident (block_dev_desc_t *dev_desc) #ifdef CONFIG_LBA48 if (iop->command_set_2 & 0x0400) { /* LBA 48 support */ - dev_desc->lba48support = 1; - dev_desc->lba48 = (unsigned long long)iop->lba48_capacity[0] | + dev_desc->lba48 = 1; + dev_desc->lba = (unsigned long long)iop->lba48_capacity[0] | ((unsigned long long)iop->lba48_capacity[1] << 16) | ((unsigned long long)iop->lba48_capacity[2] << 32) | ((unsigned long long)iop->lba48_capacity[3] << 48); } else { - dev_desc->lba48support = 0; dev_desc->lba48 = 0; } #endif /* CONFIG_LBA48 */ |