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

improved debug output

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23162 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-12-26 15:26:38 +00:00
parent 518772739f
commit 61d902eaf9
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ide/devices.c
+3 -1
View File
@@ -201,8 +201,10 @@ scan_device_int(ide_device_info *device, bool atapi)
// initialize device selection flags, // initialize device selection flags,
// this is the only place where this bit gets initialized in the task file // this is the only place where this bit gets initialized in the task file
if (bus->controller->read_command_block_regs(bus->channel_cookie, &device->tf, if (bus->controller->read_command_block_regs(bus->channel_cookie, &device->tf,
ide_mask_device_head) != B_OK) ide_mask_device_head) != B_OK) {
TRACE("scan_device_int: read_command_block_regs failed\n");
return false; return false;
}
device->tf.lba.device = device->is_device1; device->tf.lba.device = device->is_device1;
src/add-ons/kernel/bus_managers/ide/sync.c
+4 -9
View File
@@ -98,9 +98,6 @@ ide_irq_handler(ide_bus_info *bus, uint8 status)
{ {
ide_device_info *device; ide_device_info *device;
TRACE(("\n"));
FAST_LOG0(bus->log, ev_ide_irq_handle);
// we need to lock bus to have a solid bus state // we need to lock bus to have a solid bus state
// (side effect: we lock out the timeout handler and get // (side effect: we lock out the timeout handler and get
// delayed if the IRQ happens at the same time as a command is // delayed if the IRQ happens at the same time as a command is
@@ -131,11 +128,9 @@ ide_irq_handler(ide_bus_info *bus, uint8 status)
return B_UNHANDLED_INTERRUPT; return B_UNHANDLED_INTERRUPT;
} }
TRACE(("state: %d\n", bus->state));
switch (bus->state) { switch (bus->state) {
case ide_state_async_waiting: case ide_state_async_waiting:
TRACE(("async waiting\n")); TRACE(("state: async waiting\n"));
bus->state = ide_state_accessing; bus->state = ide_state_accessing;
@@ -145,7 +140,7 @@ ide_irq_handler(ide_bus_info *bus, uint8 status)
return B_INVOKE_SCHEDULER; return B_INVOKE_SCHEDULER;
case ide_state_idle: case ide_state_idle:
TRACE(("idle\n")); TRACE(("state: idle, num_running_reqs %d\n", bus->num_running_reqs));
// this must be a service request; // this must be a service request;
// if no request is pending, the IRQ was fired wrongly // if no request is pending, the IRQ was fired wrongly
@@ -162,7 +157,7 @@ ide_irq_handler(ide_bus_info *bus, uint8 status)
return B_INVOKE_SCHEDULER; return B_INVOKE_SCHEDULER;
case ide_state_sync_waiting: case ide_state_sync_waiting:
TRACE(("sync waiting\n")); TRACE(("state: sync waiting\n"));
bus->state = ide_state_accessing; bus->state = ide_state_accessing;
bus->sync_wait_timeout = false; bus->sync_wait_timeout = false;
@@ -173,7 +168,7 @@ ide_irq_handler(ide_bus_info *bus, uint8 status)
return B_INVOKE_SCHEDULER; return B_INVOKE_SCHEDULER;
case ide_state_accessing: case ide_state_accessing:
TRACE(("spurious IRQ - there is a command being executed\n")); TRACE(("state: spurious IRQ - there is a command being executed\n"));
IDE_UNLOCK(bus); IDE_UNLOCK(bus);
return B_UNHANDLED_INTERRUPT; return B_UNHANDLED_INTERRUPT;