diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-04-07 16:34:02 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-04-07 16:34:02 -0400 |
| commit | dcedd7866e35adc1e0fbc081188b259ffc7bbdf5 (patch) | |
| tree | fee54c1dcea007dc2e1256b8b56e87d812c5fd3d /dev/ide_disk.cc | |
| parent | d261ee86c461a5feaefb432a54d56e2a393f4081 (diff) | |
| parent | 9f2568f966a0ce36bfd7b3114aac1fcf419566c4 (diff) | |
| download | gem5-dcedd7866e35adc1e0fbc081188b259ffc7bbdf5.tar.xz | |
Hand merge
base/traceflags.py:
Include new flags
--HG--
extra : convert_revision : 8017cbe256860dce8b1efc1b4e1e81e883895b90
Diffstat (limited to 'dev/ide_disk.cc')
| -rw-r--r-- | dev/ide_disk.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dev/ide_disk.cc b/dev/ide_disk.cc index bfaf3d3aa..213fc6a97 100644 --- a/dev/ide_disk.cc +++ b/dev/ide_disk.cc @@ -336,7 +336,8 @@ IdeDisk::dmaPrdReadDone() physmem->dma_addr(curPrdAddr, sizeof(PrdEntry_t)), sizeof(PrdEntry_t)); - DPRINTF(IdeDisk, "PRD: baseAddr:%#x (%#x) byteCount:%d (%d) eot:%#x sector:%d\n", + DPRINTF(IdeDisk, + "PRD: baseAddr:%#x (%#x) byteCount:%d (%d) eot:%#x sector:%d\n", curPrd.getBaseAddr(), pciToDma(curPrd.getBaseAddr()), curPrd.getByteCount(), (cmdBytesLeft/SectorSize), curPrd.getEOT(), curSector); @@ -609,10 +610,10 @@ void IdeDisk::abortDma() { if (dmaState == Dma_Idle) - panic("Inconsistent DMA state, should be in Dma_Start or Dma_Transfer!\n"); + panic("Inconsistent DMA state, should be Start or Transfer!"); if (devState != Transfer_Data_Dma && devState != Prepare_Data_Dma) - panic("Inconsistent device state, should be in Transfer or Prepare!\n"); + panic("Inconsistent device state, should be Transfer or Prepare!\n"); updateState(ACT_CMD_ERROR); } @@ -732,7 +733,7 @@ IdeDisk::startCommand() void IdeDisk::intrPost() { - DPRINTF(IdeDisk, "IDE Disk Posting Interrupt\n"); + DPRINTF(IdeDisk, "Posting Interrupt\n"); if (intrPending) panic("Attempt to post an interrupt with one pending\n"); @@ -746,7 +747,7 @@ IdeDisk::intrPost() void IdeDisk::intrClear() { - DPRINTF(IdeDisk, "IDE Disk Clearing Interrupt\n"); + DPRINTF(IdeDisk, "Clearing Interrupt\n"); if (!intrPending) panic("Attempt to clear a non-pending interrupt\n"); |