Changeset 44186b01 in mainline

Timestamp:

2013-04-06T16:39:00Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3deb0155

Parents:

f22f679

Message:

bcm2835: statically allocate framebuffer descriptor

Location:

kernel/genarch

Files:

• include/genarch/drivers/bcm2835/mbox.h (modified) (1 diff)
• src/drivers/bcm2835/mbox.c (modified) (4 diffs)

kernel/genarch/include/genarch/drivers/bcm2835/mbox.h

@@ -84 +84 @@
 #define MBOX_ADDR_ALIGN         16
 
-#define ALLOC_PROP_BUFFER(name,type)                                    \
-        char _tmp[sizeof(type) + MBOX_ADDR_ALIGN] = { 0 };              \
-        type *name = (type *)ALIGN_UP((uint32_t)_tmp, MBOX_ADDR_ALIGN);
+#define MBOX_BUFF_ALLOC(name, type)                                     \
+        char tmp_ ## name[sizeof(type) + MBOX_ADDR_ALIGN] = { 0 };      \
+        type *name = (type *)ALIGN_UP((uintptr_t)tmp_ ## name, MBOX_ADDR_ALIGN);
 
 typedef struct {

kernel/genarch/src/drivers/bcm2835/mbox.c

@@ -35 +35 @@
 
 #include <mm/km.h>
-#include <mm/slab.h>
 #include <typedefs.h>
 #include <genarch/drivers/bcm2835/mbox.h>
@@ -60 +59 @@
 {
         bool ret;
-        ALLOC_PROP_BUFFER(req, mbox_getmem_buf_t);
+        MBOX_BUFF_ALLOC(req, mbox_getmem_buf_t);
 
         req->buf_hdr.size = sizeof(mbox_getmem_buf_t);
@@ -88 +87 @@
 {
         bcm2835_mbox_t *fb_mbox;
-        bcm2835_fb_desc_t *fb_desc;
-        void *fb_desc_buf;
         bool ret = false;
-
-        fb_desc_buf = malloc(sizeof(bcm2835_fb_desc_t) + MBOX_ADDR_ALIGN, 0);
-        if (!fb_desc_buf)
-                return false;
+        MBOX_BUFF_ALLOC(fb_desc, bcm2835_fb_desc_t);
 
         fb_mbox = (void *) km_map(BCM2835_MBOX0_ADDR, sizeof(bcm2835_mbox_t),
                                   PAGE_NOT_CACHEABLE);
-        fb_desc = (bcm2835_fb_desc_t *) ALIGN_UP((uintptr_t)fb_desc_buf,
-                                                 MBOX_ADDR_ALIGN);
 
         fb_desc->width = 640;
@@ -131 +123 @@
 out:
         km_unmap((uintptr_t)fb_mbox, sizeof(bcm2835_mbox_t));
-        free(fb_desc_buf);
         return ret;
 }