trunk/src/mame/machine/n64.c
| r21057 | r21058 | |
|---|
| 70 | 70 | |
| 71 | 71 | void n64_periphs::device_reset() |
| 72 | 72 | { |
| 73 | | UINT32 *cart = (UINT32*)memregion("user2")->base(); |
| 73 | UINT32 *cart = (UINT32*)machine().root_device().memregion("user2")->base(); |
| 74 | 74 | |
| 75 | 75 | maincpu = machine().device("maincpu"); |
| 76 | 76 | rspcpu = machine().device("rsp"); |
| r21057 | r21058 | |
|---|
| 1411 | 1411 | |
| 1412 | 1412 | void n64_periphs::pi_dma_tick() |
| 1413 | 1413 | { |
| 1414 | | UINT16 *cart16 = (UINT16*)memregion("user2")->base(); |
| 1414 | UINT16 *cart16; |
| 1415 | 1415 | UINT16 *dram16 = (UINT16*)rdram; |
| 1416 | 1416 | |
| 1417 | 1417 | UINT32 cart_addr = (pi_cart_addr & 0x0fffffff) >> 1; |
| r21057 | r21058 | |
|---|
| 1424 | 1424 | } |
| 1425 | 1425 | else if((cart_addr & 0x03000000) == 0x03000000 && dd_present) |
| 1426 | 1426 | { |
| 1427 | | cart16 = (UINT16*)memregion("ddipl")->base(); |
| 1427 | cart16 = (UINT16*)machine().root_device().memregion("ddipl")->base(); |
| 1428 | 1428 | cart_addr = (pi_cart_addr & 0x003fffff) >> 1; |
| 1429 | 1429 | } |
| 1430 | 1430 | else |
| 1431 | 1431 | { |
| 1432 | | cart_addr &= ((memregion("user2")->bytes() >> 1) - 1); |
| 1432 | cart16 = (UINT16*)machine().root_device().memregion("user2")->base(); |
| 1433 | cart_addr &= ((machine().root_device().memregion("user2")->bytes() >> 1) - 1); |
| 1433 | 1434 | } |
| 1434 | 1435 | |
| 1435 | 1436 | //printf("%08x Cart, %08x Dram\n", cart_addr << 1, dram_addr << 1); fflush(stdout); |
| r21057 | r21058 | |
|---|
| 1780 | 1781 | case 1: //p2 inputs |
| 1781 | 1782 | { |
| 1782 | 1783 | //printf("Read p%d inputs\n", channel + 1); |
| 1783 | | buttons = ioport(portnames[(channel*3) + 0])->read(); |
| 1784 | | x = ioport(portnames[(channel*3) + 1])->read() - 128; |
| 1785 | | y = ioport(portnames[(channel*3) + 2])->read() - 128; |
| 1784 | buttons = machine().root_device().ioport(portnames[(channel*3) + 0])->read(); |
| 1785 | x = machine().root_device().ioport(portnames[(channel*3) + 1])->read() - 128; |
| 1786 | y = machine().root_device().ioport(portnames[(channel*3) + 2])->read() - 128; |
| 1786 | 1787 | |
| 1787 | 1788 | rdata[0] = (buttons >> 8) & 0xff; |
| 1788 | 1789 | rdata[1] = (buttons >> 0) & 0xff; |