From dee1a75028ad72d4ae0ff67e39691afde76a00e1 Mon Sep 17 00:00:00 2001 From: Andrew Baumann Date: Tue, 24 Nov 2015 15:27:44 -0800 Subject: [PATCH] minor style cleanups no code changes, just file permissions and comments / long lines --- hw/arm/bcm2835.c | 0 hw/arm/bcm2835_peripherals.c | 4 +++- hw/arm/bcm2836.c | 0 hw/misc/bcm2835_property.c | 2 +- include/hw/arm/bcm2835.h | 0 include/hw/arm/bcm2835_peripherals.h | 0 include/hw/arm/bcm2836.h | 0 7 files changed, 4 insertions(+), 2 deletions(-) mode change 100755 => 100644 hw/arm/bcm2835.c mode change 100755 => 100644 hw/arm/bcm2835_peripherals.c mode change 100755 => 100644 hw/arm/bcm2836.c mode change 100755 => 100644 include/hw/arm/bcm2835.h mode change 100755 => 100644 include/hw/arm/bcm2835_peripherals.h mode change 100755 => 100644 include/hw/arm/bcm2836.h diff --git a/hw/arm/bcm2835.c b/hw/arm/bcm2835.c old mode 100755 new mode 100644 diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c old mode 100755 new mode 100644 index 8e3929d179..1606a2b634 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -319,7 +319,9 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) memory_region_add_subregion(&s->peri_mr, DMA_OFFSET, sysbus_mmio_get_region(s->dma, 0)); - memory_region_add_subregion(&s->peri_mr, 0xe05000, // XXX + /* XXX: this address was in the original raspi port. + * It's unclear where it is derived from. */ + memory_region_add_subregion(&s->peri_mr, 0xe05000, sysbus_mmio_get_region(s->dma, 1)); sysbus_connect_irq(s->dma, 0, pic[INTERRUPT_DMA0]); diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c old mode 100755 new mode 100644 diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 48da32612b..5d7f3bad21 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -372,7 +372,7 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp) obj = object_property_get_link(OBJECT(dev), "bcm2835_fb", &err); if (err || obj == NULL) { - error_setg(errp, "bcm2835_property: required bcm2835_fb link not found"); + error_setg(errp, "bcm2835_property: required bcm2835_fb link missing"); return; } diff --git a/include/hw/arm/bcm2835.h b/include/hw/arm/bcm2835.h old mode 100755 new mode 100644 diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h old mode 100755 new mode 100644 diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h old mode 100755 new mode 100644 -- 2.11.4.GIT