diff --git a/src/add-ons/kernel/bus_managers/ide/devices.c b/src/add-ons/kernel/bus_managers/ide/devices.c index 910d1f9e8e..42ea9260b4 100644 --- a/src/add-ons/kernel/bus_managers/ide/devices.c +++ b/src/add-ons/kernel/bus_managers/ide/devices.c @@ -201,8 +201,10 @@ scan_device_int(ide_device_info *device, bool atapi) // initialize device selection flags, // 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, - ide_mask_device_head) != B_OK) + ide_mask_device_head) != B_OK) { + TRACE("scan_device_int: read_command_block_regs failed\n"); return false; + } device->tf.lba.device = device->is_device1; diff --git a/src/add-ons/kernel/bus_managers/ide/sync.c b/src/add-ons/kernel/bus_managers/ide/sync.c index 511096f600..e86f0504ae 100644 --- a/src/add-ons/kernel/bus_managers/ide/sync.c +++ b/src/add-ons/kernel/bus_managers/ide/sync.c @@ -98,9 +98,6 @@ ide_irq_handler(ide_bus_info *bus, uint8 status) { 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 // (side effect: we lock out the timeout handler and get // 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; } - TRACE(("state: %d\n", bus->state)); - switch (bus->state) { case ide_state_async_waiting: - TRACE(("async waiting\n")); + TRACE(("state: async waiting\n")); bus->state = ide_state_accessing; @@ -145,7 +140,7 @@ ide_irq_handler(ide_bus_info *bus, uint8 status) return B_INVOKE_SCHEDULER; 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; // 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; case ide_state_sync_waiting: - TRACE(("sync waiting\n")); + TRACE(("state: sync waiting\n")); bus->state = ide_state_accessing; bus->sync_wait_timeout = false; @@ -173,7 +168,7 @@ ide_irq_handler(ide_bus_info *bus, uint8 status) return B_INVOKE_SCHEDULER; 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); return B_UNHANDLED_INTERRUPT;