commit 6def8a06ce2e215d79147a28fddd2b3858e49a86
author Ernest Hua <ernesthua@google.com> Thu Jul 28 16:24:27 2016 -0700
committer Ernest Hua <ernesthua@google.com> Mon Aug 01 10:20:54 2016 -0700
tree 3aad2125a5e2209e0e23ad9a29e63b31561206bc
parent 7ff9e45879821214233398b162117a5b2e55ee53

Fix sign extension bug for mmap() call using casting trick.

Change-Id: I6ad674168d76ee97686aac77ca613fac54543d72

gpio-mailbox/broadcom.c

diff --git a/gpio-mailbox/broadcom.c b/gpio-mailbox/broadcom.c
index 575f197..a53e51e 100644
--- a/gpio-mailbox/broadcom.c
+++ b/gpio-mailbox/broadcom.c
@@ -614,6 +614,15 @@
   }
 }
 
+static void *mmap_(void* addr, size_t size, int prot, int flags, int fd,
+                   off_t offset) {
+#ifdef __ANDROID__
+  return mmap64(addr, size, prot, flags, fd, (off64_t)(uint64_t)(uint32_t)offset);
+#else
+  return mmap(addr, size, prot, flags, fd, offset);
+#endif
+}
+
 static int platform_init(struct platform_info* p) {
   platform_cleanup();
 
@@ -623,8 +632,8 @@
     return -1;
   }
   mmap_size = p->mmap_size;
-  mmap_addr = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED,
-                   mmap_fd, p->mmap_base);
+  mmap_addr = mmap_(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED,
+                    mmap_fd, p->mmap_base);
   if (mmap_addr == MAP_FAILED) {
     perror("mmap");
     platform_cleanup();