diff --git a/config/caps.py b/config/caps.py index 7ca98fe..db9d5f6 100644 --- a/config/caps.py +++ b/config/caps.py @@ -144,7 +144,7 @@ cap_strings = { 'ipc' : \ \t\t\t[${idx}] = { \t\t\t\t/* For device selection */ \t\t\t\t.target = ${cid}, -\t\t\t\t.uattr = CAP_DEVTYPE_UART | (${devnum} << 16), +\t\t\t\t.uattr[0] = CAP_DEVTYPE_UART | (${devnum} << 16), \t\t\t\t.type = CAP_TYPE_MAP_PHYSMEM | CAP_RTYPE_CONTAINER, \t\t\t\t.access = CAP_MAP_READ | CAP_MAP_WRITE | CAP_MAP_EXEC | \t\t\t\t\tCAP_MAP_CACHED | CAP_MAP_UNCACHED | CAP_MAP_UNMAP | CAP_MAP_UTCB, @@ -156,7 +156,7 @@ cap_strings = { 'ipc' : \ \t\t\t[${idx}] = { \t\t\t\t/* For device selection */ \t\t\t\t.target = ${cid}, -\t\t\t\t.uattr = CAP_DEVTYPE_TIMER | (${devnum} << 16), +\t\t\t\t.uattr[0] = CAP_DEVTYPE_TIMER | (${devnum} << 16), \t\t\t\t.type = CAP_TYPE_MAP_PHYSMEM | CAP_RTYPE_CONTAINER, \t\t\t\t.access = CAP_MAP_READ | CAP_MAP_WRITE | CAP_MAP_EXEC | \t\t\t\t\tCAP_MAP_CACHED | CAP_MAP_UNCACHED | CAP_MAP_UNMAP | CAP_MAP_UTCB, diff --git a/conts/baremetal/baremetal5/main.c b/conts/baremetal/baremetal5/main.c index 023e732..bb743f2 100644 --- a/conts/baremetal/baremetal5/main.c +++ b/conts/baremetal/baremetal5/main.c @@ -166,7 +166,6 @@ int timer_setup_devices(void) for (int i = 0; i < TIMERS_TOTAL; i++) { /* Get one page from address pool */ timer[i].base = (unsigned long)l4_new_virtual(1); - printf("timer base %x phy %lx\n", timer[i].base, timer_cap[i].start); /* Map timers to a virtual address region */ if (IS_ERR(l4_map((void *)__pfn_to_addr(timer_cap[i].start), diff --git a/src/generic/resource.c b/src/generic/resource.c index 76faf1d..6b3fe4a 100644 --- a/src/generic/resource.c +++ b/src/generic/resource.c @@ -516,7 +516,9 @@ int copy_pager_info(struct pager *pager, struct pager_info *pinfo) cap->start = cap_info->start; cap->end = cap_info->end; cap->size = cap_info->size; - cap->uattr = cap_info->uattr; + cap->uattr[0] = cap_info->uattr[0]; + cap->uattr[1] = cap_info->uattr[1]; + cap_list_insert(cap, &pager->cap_list); }