diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:57 -0500 |
| commit | aab2e8f79ad253c760787ff3ce4d64967fed0003 (patch) | |
| tree | bc837d155b4d558b71ad196c561f9e71c10136d0 /hw/ide | |
| parent | dccbe6fbab47c9a2589f436e0592933b47cbe40b (diff) | |
| parent | 7ec5e6a4ca43494949465f9f9f3d9e4c7c620503 (diff) | |
| download | qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.zip qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.tar.gz qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.tar.bz2 | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 3651d2b..1e466d1 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -139,6 +139,7 @@ static void ide_identify(IDEState *s) put_le16(p + 61, s->nb_sectors >> 16); put_le16(p + 62, 0x07); /* single word dma0-2 supported */ put_le16(p + 63, 0x07); /* mdma0-2 supported */ + put_le16(p + 64, 0x03); /* pio3-4 supported */ put_le16(p + 65, 120); put_le16(p + 66, 120); put_le16(p + 67, 120); @@ -199,13 +200,12 @@ static void ide_atapi_identify(IDEState *s) put_le16(p + 53, 7); /* words 64-70, 54-58, 88 valid */ put_le16(p + 62, 7); /* single word dma0-2 supported */ put_le16(p + 63, 7); /* mdma0-2 supported */ - put_le16(p + 64, 0x3f); /* PIO modes supported */ #else put_le16(p + 49, 1 << 9); /* LBA supported, no DMA */ put_le16(p + 53, 3); /* words 64-70, 54-58 valid */ put_le16(p + 63, 0x103); /* DMA modes XXX: may be incorrect */ - put_le16(p + 64, 1); /* PIO modes */ #endif + put_le16(p + 64, 3); /* pio3-4 supported */ put_le16(p + 65, 0xb4); /* minimum DMA multiword tx cycle time */ put_le16(p + 66, 0xb4); /* recommended DMA multiword tx cycle time */ put_le16(p + 67, 0x12c); /* minimum PIO cycle time without flow control */ |