diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-05-23 22:36:17 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-05-23 22:36:17 +0200 |
| commit | 6eba5c82cfeb28bd5056ad0e8923d98519181939 (patch) | |
| tree | ab4aa1a9d61cfa667eed3e086be2284076f64aef /hw | |
| parent | 5db070eb1ab902572e46ed09e5947ffe504522bc (diff) | |
| parent | a57d23e4f7e7e81c839a7b53a973ac71eefe91da (diff) | |
Merge branch 'trivial-patches' of git://repo.or.cz/qemu/stefanha
* 'trivial-patches' of git://repo.or.cz/qemu/stefanha:
Fix typos in comments (chek -> check)
hw/sd.c: Don't complain about SDIO commands CMD52/CMD53
hw/realview.c: Remove duplicate #include line
piix_pci: fix piix3_set_irq_pic()
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/piix_pci.c | 2 | ||||
| -rw-r--r-- | hw/realview.c | 1 | ||||
| -rw-r--r-- | hw/sd.c | 11 |
3 files changed, 12 insertions, 2 deletions
diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 7f1c4cca31..85a320e729 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -312,7 +312,7 @@ static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq) { qemu_set_irq(piix3->pic[pic_irq], !!(piix3->pic_levels & - (((1UL << PIIX_NUM_PIRQS) - 1) << + (((1ULL << PIIX_NUM_PIRQS) - 1) << (pic_irq * PIIX_NUM_PIRQS)))); } diff --git a/hw/realview.c b/hw/realview.c index 96fb9da241..82f3d82d44 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -17,7 +17,6 @@ #include "sysemu.h" #include "boards.h" #include "bitbang_i2c.h" -#include "sysbus.h" #include "blockdev.h" #define SMP_BOOT_ADDR 0xe0000000 @@ -1104,6 +1104,17 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, } break; + case 52: + case 53: + /* CMD52, CMD53: reserved for SDIO cards + * (see the SDIO Simplified Specification V2.0) + * Handle as illegal command but do not complain + * on stderr, as some OSes may use these in their + * probing for presence of an SDIO card. + */ + sd->card_status |= ILLEGAL_COMMAND; + return sd_r0; + /* Application specific commands (Class 8) */ case 55: /* CMD55: APP_CMD */ if (sd->rca != rca) |