filename | src/mem.c |
changeset | 674:377d987db8f2 |
prev | 669:ab344e42bca9 |
next | 691:ad3356543392 |
author | nkeynes |
date | Tue Jun 03 11:16:51 2008 +0000 (15 years ago) |
permissions | -rw-r--r-- |
last change | Add alert dialog for errors Handle the command line when launched from finder |
file | annotate | diff | log | raw |
1.1 --- a/src/mem.c Mon May 12 10:00:13 2008 +00001.2 +++ b/src/mem.c Tue Jun 03 11:16:51 2008 +00001.3 @@ -46,7 +46,7 @@1.4 struct mmio_region *io_rgn[MAX_IO_REGIONS];1.5 struct mmio_region *P4_io[4096];1.7 -uintptr_t num_io_rgns = 0, num_mem_rgns = 0;1.8 +uint32_t num_io_rgns = 0, num_mem_rgns = 0;1.10 void *mem_alloc_pages( int n )1.11 {1.12 @@ -332,7 +332,7 @@1.13 /* P4 area (on-chip I/O channels */1.14 P4_io[(io->base&0x1FFFFFFF)>>19] = io;1.15 } else {1.16 - page_map[io->base>>12] = (sh4ptr_t )num_io_rgns;1.17 + page_map[io->base>>12] = (sh4ptr_t)(uintptr_t)num_io_rgns;1.18 }1.19 io_rgn[num_io_rgns] = io;1.20 num_io_rgns++;
.