i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set bus state to ata_state_busy during device scanning

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23327 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2008-01-09 19:45:44 +00:00
parent a0183a22a1
commit d688a5ad65
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ata/ata.c
+4 -2
View File
@@ -1023,16 +1023,18 @@ ata_read_infoblock(ide_device_info *device, bool isAtapi)
goto error; goto error;
} }
// XXX fix me
IDE_LOCK(bus); IDE_LOCK(bus);
bus->state = ata_state_idle; bus->state = ata_state_busy;
IDE_UNLOCK(bus); IDE_UNLOCK(bus);
TRACE("ata_read_infoblock: success\n"); TRACE("ata_read_infoblock: success\n");
return B_OK; return B_OK;
error: error:
// XXX fix me
IDE_LOCK(bus); IDE_LOCK(bus);
bus->state = ata_state_idle; bus->state = ata_state_busy;
IDE_UNLOCK(bus); IDE_UNLOCK(bus);
return B_ERROR; return B_ERROR;
} }
src/add-ons/kernel/bus_managers/ata/ide_sim.c
+15
View File
@@ -191,6 +191,14 @@ scan_bus(ide_bus_info *bus)
if (bus->disconnected) if (bus->disconnected)
return; return;
// XXX fix me
IDE_LOCK(bus);
ASSERT(bus->state == ata_state_idle);
bus->state = ata_state_busy;
IDE_UNLOCK(bus);
for (i = 0; i < bus->max_devices; ++i) { for (i = 0; i < bus->max_devices; ++i) {
if (bus->devices[i]) if (bus->devices[i])
destroy_device(bus->devices[i]); destroy_device(bus->devices[i]);
@@ -220,6 +228,13 @@ scan_bus(ide_bus_info *bus)
} }
} }
// XXX fix me
IDE_LOCK(bus);
ASSERT(bus->state == ata_state_busy);
bus->state = ata_state_idle;
IDE_UNLOCK(bus);
TRACE("ATA: scan_bus: bus %p finished\n", bus); TRACE("ATA: scan_bus: bus %p finished\n", bus);
} }