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

Use kernel tracing feature. Doesn't seem to work, don't know why.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27282 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2008-09-01 21:26:46 +00:00
parent 24bc53c351
commit 935ebe7840
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ata/ata.c
+17 -3
View File
@@ -14,6 +14,7 @@
#include "ide_sim.h" #include "ide_sim.h"
#include "ide_cmds.h" #include "ide_cmds.h"
#include "ata_tracing.h"
#define TRACE dprintf #define TRACE dprintf
#define FLOW dprintf #define FLOW dprintf
@@ -30,6 +31,8 @@ ata_select_device(ide_bus_info *bus, int device)
{ {
ide_task_file tf; ide_task_file tf;
T2(bus, device, "ata_select_device");
// FLOW("ata_select_device device %d\n", device); // FLOW("ata_select_device device %d\n", device);
tf.chs.head = 0; tf.chs.head = 0;
@@ -42,14 +45,18 @@ ata_select_device(ide_bus_info *bus, int device)
// for debugging only // for debugging only
bus->controller->read_command_block_regs(bus->channel_cookie, &tf, ide_mask_device_head); bus->controller->read_command_block_regs(bus->channel_cookie, &tf, ide_mask_device_head);
if (tf.chs.device != device) if (tf.chs.device != device) {
T2(bus, device, "ata_select_device failed, device not selected. head 0x%x, mode 0x%x, device %d", tf.chs.head, tf.chs.mode, tf.chs.device);
TRACE("ata_select_device result: device %d not selected! head 0x%x, mode 0x%x, device %d\n", device, tf.chs.head, tf.chs.mode, tf.chs.device); TRACE("ata_select_device result: device %d not selected! head 0x%x, mode 0x%x, device %d\n", device, tf.chs.head, tf.chs.mode, tf.chs.device);
}
} }
void void
ata_select(ide_device_info *device) ata_select(ide_device_info *device)
{ {
T(device, "ata_select");
ASSERT(device->is_device1 == device->tf.chs.device); ASSERT(device->is_device1 == device->tf.chs.device);
ata_select_device(device->bus, device->is_device1); ata_select_device(device->bus, device->is_device1);
} }
@@ -63,6 +70,9 @@ bool
ata_is_device_present(ide_bus_info *bus, int device) ata_is_device_present(ide_bus_info *bus, int device)
{ {
ide_task_file tf; ide_task_file tf;
bool present;
T2(bus, device, "ata_is_device_present ?");
ata_select_device(bus, device); ata_select_device(bus, device);
@@ -76,7 +86,11 @@ ata_is_device_present(ide_bus_info *bus, int device)
bus->controller->read_command_block_regs(bus->channel_cookie, &tf, bus->controller->read_command_block_regs(bus->channel_cookie, &tf,
ide_mask_sector_count | ide_mask_LBA_low); ide_mask_sector_count | ide_mask_LBA_low);
return tf.lba.sector_count == 0xaa && tf.lba.lba_0_7 == 0x55; present = tf.lba.sector_count == 0xaa && tf.lba.lba_0_7 == 0x55;
T2(bus, device, "ata_is_device_present present=%d", present);
return present;
} }
@@ -1117,7 +1131,7 @@ ata_identify_device(ide_device_info *device, bool isAtapi)
return B_ERROR; return B_ERROR;
} }
if (ata_wait(bus, ide_status_drq, ide_status_bsy, 0, isAtapi ? 3000000 : 500000) != B_OK) { if (ata_wait(bus, ide_status_drq, ide_status_bsy, 0, isAtapi ? 20000000 : 500000) != B_OK) {
TRACE("ata_identify_device: wait failed\n"); TRACE("ata_identify_device: wait failed\n");
return B_ERROR; return B_ERROR;
} }