aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-floppy.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index b1d6905fd8ea..502ef9dcc5b9 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -397,7 +397,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
397 u16 bcount; 397 u16 bcount;
398 u8 stat, ireason; 398 u8 stat, ireason;
399 399
400 debug_log("Reached %s interrupt handler\n", __func__); 400 debug_log("Enter %s - interrupt handler\n", __func__);
401 401
402 if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) { 402 if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
403 dma_error = hwif->dma_ops->dma_end(drive); 403 dma_error = hwif->dma_ops->dma_end(drive);
@@ -409,7 +409,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
409 pc->xferred = pc->req_xfer; 409 pc->xferred = pc->req_xfer;
410 idefloppy_update_buffers(drive, pc); 410 idefloppy_update_buffers(drive, pc);
411 } 411 }
412 debug_log("DMA finished\n"); 412 debug_log("%s: DMA finished\n", drive->name);
413 } 413 }
414 414
415 /* Clear the interrupt */ 415 /* Clear the interrupt */
@@ -432,6 +432,9 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
432 " command\n", drive->name); 432 " command\n", drive->name);
433 return ide_do_reset(drive); 433 return ide_do_reset(drive);
434 } 434 }
435
436 debug_log("[cmd %x]: check condition\n", pc->c[0]);
437
435 /* Retry operation */ 438 /* Retry operation */
436 idefloppy_retry_pc(drive); 439 idefloppy_retry_pc(drive);
437 /* queued, but not started */ 440 /* queued, but not started */
@@ -505,6 +508,9 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
505 pc->xferred += bcount; 508 pc->xferred += bcount;
506 pc->cur_pos += bcount; 509 pc->cur_pos += bcount;
507 510
511 debug_log("[cmd %x] transferred %d bytes on that intr.\n",
512 pc->c[0], bcount);
513
508 /* And set the interrupt handler again */ 514 /* And set the interrupt handler again */
509 ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL); 515 ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL);
510 return ide_started; 516 return ide_started;