|
@@ -601,44 +601,15 @@ EXPORT_SYMBOL(ide_wait_stat);
|
|
*/
|
|
*/
|
|
u8 eighty_ninty_three (ide_drive_t *drive)
|
|
u8 eighty_ninty_three (ide_drive_t *drive)
|
|
{
|
|
{
|
|
-#if 0
|
|
|
|
- if (!HWIF(drive)->udma_four)
|
|
|
|
|
|
+ if(HWIF(drive)->udma_four == 0)
|
|
|
|
+ return 0;
|
|
|
|
+ if (!(drive->id->hw_config & 0x6000))
|
|
return 0;
|
|
return 0;
|
|
-
|
|
|
|
- if (drive->id->major_rev_num) {
|
|
|
|
- int hssbd = 0;
|
|
|
|
- int i;
|
|
|
|
- /*
|
|
|
|
- * Determine highest Supported SPEC
|
|
|
|
- */
|
|
|
|
- for (i=1; i<=15; i++)
|
|
|
|
- if (drive->id->major_rev_num & (1<<i))
|
|
|
|
- hssbd++;
|
|
|
|
-
|
|
|
|
- switch (hssbd) {
|
|
|
|
- case 7:
|
|
|
|
- case 6:
|
|
|
|
- case 5:
|
|
|
|
- /* ATA-4 and older do not support above Ultra 33 */
|
|
|
|
- default:
|
|
|
|
- return 0;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- return ((u8) (
|
|
|
|
-#ifndef CONFIG_IDEDMA_IVB
|
|
|
|
- (drive->id->hw_config & 0x4000) &&
|
|
|
|
-#endif /* CONFIG_IDEDMA_IVB */
|
|
|
|
- (drive->id->hw_config & 0x6000)) ? 1 : 0);
|
|
|
|
-
|
|
|
|
-#else
|
|
|
|
-
|
|
|
|
- return ((u8) ((HWIF(drive)->udma_four) &&
|
|
|
|
#ifndef CONFIG_IDEDMA_IVB
|
|
#ifndef CONFIG_IDEDMA_IVB
|
|
- (drive->id->hw_config & 0x4000) &&
|
|
|
|
|
|
+ if(!(drive->id->hw_config & 0x4000))
|
|
|
|
+ return 0;
|
|
#endif /* CONFIG_IDEDMA_IVB */
|
|
#endif /* CONFIG_IDEDMA_IVB */
|
|
- (drive->id->hw_config & 0x6000)) ? 1 : 0);
|
|
|
|
-#endif
|
|
|
|
|
|
+ return 1;
|
|
}
|
|
}
|
|
|
|
|
|
EXPORT_SYMBOL(eighty_ninty_three);
|
|
EXPORT_SYMBOL(eighty_ninty_three);
|