oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set 'w_testing' during w_identify(). this means 0-tolerance to

Browse Source 
timeouts, and an ATA_IDENTIFY timeout will cause the ATAPI_IDENTIFY
to be skipped, making the cd probe a lot faster.
This commit is contained in:
Ben Gras 2007-02-12 13:35:33 +00:00
parent cb2f124830
commit 1ff8616378
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/at_wini/at_wini.c
View File

@ -814,6 +814,9 @@ PRIVATE int w_identify()
cmd.ldh = wn->ldhpref; cmd.ldh = wn->ldhpref;
cmd.command = ATA_IDENTIFY; cmd.command = ATA_IDENTIFY;
/* In testing mode, a drive will get ignored at the first timeout. */
w_testing = 1;
/* Execute *_IDENTIFY with configured *_IDENTIFY timeout. */ /* Execute *_IDENTIFY with configured *_IDENTIFY timeout. */
prev_wakeup = wakeup_ticks; prev_wakeup = wakeup_ticks;
wakeup_ticks = w_identify_wakeup_ticks; wakeup_ticks = w_identify_wakeup_ticks;
@ -831,6 +834,7 @@ PRIVATE int w_identify()
{ {
printf("%s: not an ATA device?\n", w_name()); printf("%s: not an ATA device?\n", w_name());
wakeup_ticks = prev_wakeup; wakeup_ticks = prev_wakeup;
w_testing = 0;
return ERR; return ERR;
} }
#endif #endif
@ -999,6 +1003,7 @@ PRIVATE int w_identify()
*/ */
if (wn->lcylinders == 0) { if (wn->lcylinders == 0) {
wakeup_ticks = prev_wakeup; wakeup_ticks = prev_wakeup;
w_testing = 0;
return(ERR); return(ERR);
} /* no BIOS parameters */ } /* no BIOS parameters */
wn->pcylinders = wn->lcylinders; wn->pcylinders = wn->lcylinders;
@ -1007,8 +1012,9 @@ PRIVATE int w_identify()
size = (u32_t) wn->pcylinders * wn->pheads * wn->psectors; size = (u32_t) wn->pcylinders * wn->pheads * wn->psectors;
} }
/* Restore wakeup_ticks. */ /* Restore wakeup_ticks and unset testing mode. */
wakeup_ticks = prev_wakeup; wakeup_ticks = prev_wakeup;
w_testing = 0;
/* Size of the whole drive */ /* Size of the whole drive */
wn->part[0].dv_size = mul64u(size, SECTOR_SIZE); wn->part[0].dv_size = mul64u(size, SECTOR_SIZE);