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

Added an IDENTIFIED flag that is set on successfully identified drives.

Browse Source 
This avoids the bug scenario where DEAF but not-w_identify()d drives are
never properly identified, but are seen as real devices.
This commit is contained in:
Ben Gras 2005-07-26 13:11:16 +00:00
parent 4bf6edfd14
commit 435dd377ed
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/at_wini/at_wini.c
View File

@ -167,6 +167,7 @@ int wakeup_ticks = WAKEUP;
#else #else
#define ATAPI 0 /* don't bother with ATAPI; optimise out */ #define ATAPI 0 /* don't bother with ATAPI; optimise out */
#endif #endif
#define IDENTIFIED 0x10 /* w_identify done successfully */
int timeout_ticks = DEF_TIMEOUT_TICKS, max_errors = MAX_ERRORS; int timeout_ticks = DEF_TIMEOUT_TICKS, max_errors = MAX_ERRORS;
@ -317,16 +318,18 @@ message *m_ptr;
struct wini *wn; struct wini *wn;
if (w_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO); if (w_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
wn = w_wn; wn = w_wn;
if (wn->state == 0) { if (!(wn->state & (IDENTIFIED)) || (wn->state & DEAF)) {
/* Try to identify the device. */ /* Try to identify the device. */
if (w_identify() != OK) { if (w_identify() != OK) {
printf("%s: probe failed\n", w_name()); printf("%s: probe failed\n", w_name());
if (wn->state & DEAF) w_reset(); if (wn->state & DEAF) w_reset();
wn->state = 0; wn->state = 0;
return(ENXIO); return(ENXIO);
} }
} }
if (wn->open_ct == 0) { if (wn->open_ct == 0) {
#if ENABLE_ATAPI #if ENABLE_ATAPI
@ -448,7 +451,7 @@ PRIVATE int w_identify()
/* Not an ATA device; no translations, no special features. Don't /* Not an ATA device; no translations, no special features. Don't
* touch it unless the BIOS knows about it. * touch it unless the BIOS knows about it.
*/ */
if (wn->lcylinders == 0) return(ERR); /* no BIOS parameters */ if (wn->lcylinders == 0) { return(ERR); } /* no BIOS parameters */
wn->pcylinders = wn->lcylinders; wn->pcylinders = wn->lcylinders;
wn->pheads = wn->lheads; wn->pheads = wn->lheads;
wn->psectors = wn->lsectors; wn->psectors = wn->lsectors;
@ -458,7 +461,9 @@ PRIVATE int w_identify()
/* 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);
if (w_specify() != OK && w_specify() != OK) return(ERR); if (w_specify() != OK && w_specify() != OK) {
return(ERR);
}
printf("%s: user-space AT Winchester driver detected ", w_name()); printf("%s: user-space AT Winchester driver detected ", w_name());
if (wn->state & (SMART|ATAPI)) { if (wn->state & (SMART|ATAPI)) {
@ -473,6 +478,7 @@ PRIVATE int w_identify()
panic(w_name(), "coudn't set IRQ policy", s); panic(w_name(), "coudn't set IRQ policy", s);
if ((s=sys_irqenable(&wn->irq_hook_id)) != OK) if ((s=sys_irqenable(&wn->irq_hook_id)) != OK)
panic(w_name(), "coudn't enable IRQ line", s); panic(w_name(), "coudn't enable IRQ line", s);
wn->state |= IDENTIFIED;
return(OK); return(OK);
} }