Changes in kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c [d1582b50:b67ce1ff] in mainline

File:

• kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c (modified) (3 diffs)

kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c

@@ -94 +94 @@
 {
         bcm2835_timer_irq_ack(raspi.timer);
-        spinlock_unlock(&irq->lock);
+        irq_spinlock_unlock(&irq->lock, false);
         clock();
-        spinlock_lock(&irq->lock);
+        irq_spinlock_lock(&irq->lock, false);
 }
 
@@ -159 +159 @@
                 /* The IRQ handler was found. */
                 irq->handler(irq);
-                spinlock_unlock(&irq->lock);
+                irq_spinlock_unlock(&irq->lock, false);
         } else {
                 /* Spurious interrupt. */
@@ -174 +174 @@
 {
 #ifdef CONFIG_FB
+        uint32_t width, height;
         fb_properties_t prop;
-        if (bcm2835_fb_init(&prop)) {
+
+        if (!bcm2835_mbox_get_fb_size(&width, &height)) {
+                printf("mbox: could not get the framebuffer size\n");
+                width = 640;
+                height = 480;
+        }
+        if (bcm2835_fb_init(&prop, width, height)) {
                 outdev_t *fb_dev = fb_init(&prop);
                 if (fb_dev)