Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2006-02-13 00:13:48 -05:00
commit 3875e1945b
103 changed files with 777 additions and 588 deletions

View file

@ -270,6 +270,16 @@ struct ata_taskfile {
#define ata_id_cdb_intr(id) (((id)[0] & 0x60) == 0x20)
static inline unsigned int ata_id_major_version(const u16 *id)
{
unsigned int mver;
for (mver = 14; mver >= 1; mver--)
if (id[ATA_ID_MAJOR_VER] & (1 << mver))
break;
return mver;
}
static inline int ata_id_current_chs_valid(const u16 *id)
{
/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command