Skip to content

Commit 2571f46

Browse files
committed
Preparing regions for Rockchip, bad condition for mmap64 symbol
1 parent a03107f commit 2571f46

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/compat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void *mmap(void *start, size_t len, int prot, int flags, int fd, uint32_t off) {
6060
return (void*)syscall(SYS_mmap2, start, len, prot, flags, fd, off >> 12);
6161
}
6262

63-
#if !defined(__ARM_PCS_VFP) && !defined(__UCLIBC__)
63+
#if !(defined(__ARM_PCS_VFP) && defined(__UCLIBC__))
6464
void *mmap64(void *start, size_t len, int prot, int flags, int fd, off_t off) {
6565
return (void*)syscall(SYS_mmap2, start, len, prot, flags, fd, off >> 12);
6666
}

src/region.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,10 @@ found_font:;
384384
m6_region_create(id, rect, osds[id].opal);
385385
m6_region_setbitmap(id, &bitmap);
386386
break;
387+
case HAL_PLATFORM_RK:
388+
rk_region_create(id, rect, osds[id].opal);
389+
rk_region_setbitmap(id, &bitmap);
390+
break;
387391
#elif defined(__ARM_PCS)
388392
case HAL_PLATFORM_GM:
389393
gm_region_setbitmap(id, &bitmap);
@@ -447,6 +451,10 @@ found_font:;
447451
m6_region_create(id, rect, osds[id].opal);
448452
m6_region_setbitmap(id, &bitmap);
449453
break;
454+
case HAL_PLATFORM_RK:
455+
rk_region_create(id, rect, osds[id].opal);
456+
rk_region_setbitmap(id, &bitmap);
457+
break;
450458
#elif defined(__ARM_PCS)
451459
case HAL_PLATFORM_GM:
452460
gm_region_create(id, rect, osds[id].opal);
@@ -484,7 +492,7 @@ found_font:;
484492
case HAL_PLATFORM_I6: i6_region_destroy(id); break;
485493
case HAL_PLATFORM_I6C: i6c_region_destroy(id); break;
486494
case HAL_PLATFORM_M6: m6_region_destroy(id); break;
487-
495+
case HAL_PLATFORM_RK: rk_region_destroy(id); break;
488496
#elif defined(__ARM_PCS)
489497
case HAL_PLATFORM_GM: gm_region_destroy(id); break;
490498
case HAL_PLATFORM_V1: v1_region_destroy(id); break;

0 commit comments

Comments
 (0)