Skip to content

Update printf format and add include to mailbox.c. #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VA3SFA wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update printf format and add include to mailbox.c. #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18f6141
Change printf format from %d to %p for pointer and removing the relat…
VA3SFA Aug 13, 2024
8d91190
Fix cast from integer to pointer.
VA3SFA Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mailbox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>

#include "mailbox.h"

Expand All @@ -59,7 +60,7 @@ void *mapmem(unsigned base, unsigned size)
printf("base=0x%x, mem=%p\n", base, mem);
#endif
if (mem == MAP_FAILED) {
printf("mmap error %d\n", (int)mem);
printf("mmap error %p\n", mem);
exit (-1);
}
close(mem_fd);
Expand Down
4 changes: 2 additions & 2 deletions wspr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ void getRealMemPageFromPool(void ** vAddr, void **bAddr) {
ABORT(-1);
}
unsigned offset = mbox.pool_cnt*4096;
*vAddr = (void*)(((unsigned)mbox.virt_addr) + offset);
*bAddr = (void*)(((unsigned)mbox.bus_addr) + offset);
*vAddr = (void*)(((uintptr_t)mbox.virt_addr) + offset);
*bAddr = (void*)(((uintptr_t)mbox.bus_addr) + offset);
//printf("getRealMemoryPageFromPool bus_addr=%x virt_addr=%x\n", (unsigned)*pAddr,(unsigned)*vAddr);
mbox.pool_cnt++;
}
Expand Down