trunk/src/mess/machine/macadb.c
| r20538 | r20539 | |
|---|
| 76 | 76 | int mac_state::adb_pollkbd(int update) |
| 77 | 77 | { |
| 78 | 78 | int i, j, keybuf, report, codes[2], result; |
| 79 | | static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5" }; |
| 79 | ioport_port *ports[6] = { m_key0, m_key1, m_key2, m_key3, m_key4, m_key5 }; |
| 80 | 80 | |
| 81 | 81 | codes[0] = codes[1] = 0xff; // key up |
| 82 | 82 | report = result = 0; |
| 83 | 83 | |
| 84 | 84 | for (i = 0; i < 6; i++) |
| 85 | 85 | { |
| 86 | | keybuf = ioport(keynames[i])->read(); |
| 86 | keybuf = ports[i]->read(); |
| 87 | 87 | |
| 88 | 88 | // any changes in this row? |
| 89 | 89 | if ((keybuf != m_key_matrix[i]) && (report < 2)) |
| r20538 | r20539 | |
|---|
| 211 | 211 | return 0; |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | | NewButton = ioport("MOUSE0")->read() & 0x01; |
| 215 | | NewX = ioport("MOUSE2")->read(); |
| 216 | | NewY = ioport("MOUSE1")->read(); |
| 214 | NewButton = m_mouse0->read() & 0x01; |
| 215 | NewX = m_mouse2->read(); |
| 216 | NewY = m_mouse1->read(); |
| 217 | 217 | |
| 218 | 218 | if ((NewX != m_adb_lastmousex) || (NewY != m_adb_lastmousey) || (NewButton != m_adb_lastbutton)) |
| 219 | 219 | { |
| r20538 | r20539 | |
|---|
| 261 | 261 | m_adb_lastmousey = NewY; |
| 262 | 262 | } |
| 263 | 263 | |
| 264 | | m_adb_lastbutton = ioport("MOUSE0")->read() & 0x01; |
| 264 | m_adb_lastbutton = m_mouse0->read() & 0x01; |
| 265 | 265 | |
| 266 | 266 | *MouseX = (UINT8)MouseCountX; |
| 267 | 267 | *MouseY = (UINT8)MouseCountY; |
trunk/src/mess/machine/mac.c
| r20538 | r20539 | |
|---|
| 562 | 562 | int keybuf = 0; |
| 563 | 563 | int keycode; |
| 564 | 564 | mac_state *mac = machine.driver_data<mac_state>(); |
| 565 | ioport_port *ports[7] = { mac->m_key0, mac->m_key1, mac->m_key2, mac->m_key3, mac->m_key4, mac->m_key5, mac->m_key6 }; |
| 565 | 566 | |
| 566 | 567 | if (mac->m_keycode_buf_index) |
| 567 | 568 | { |
| r20538 | r20539 | |
|---|
| 570 | 571 | |
| 571 | 572 | for (i=0; i<7; i++) |
| 572 | 573 | { |
| 573 | | switch (i) |
| 574 | | { |
| 575 | | case 0: |
| 576 | | keybuf = mac->m_key0->read(); |
| 577 | | break; |
| 578 | | case 1: |
| 579 | | keybuf = mac->m_key1->read(); |
| 580 | | break; |
| 581 | | case 2: |
| 582 | | keybuf = mac->m_key2->read(); |
| 583 | | break; |
| 584 | | case 3: |
| 585 | | keybuf = mac->m_key3->read(); |
| 586 | | break; |
| 587 | | case 4: |
| 588 | | keybuf = mac->m_key4->read(); |
| 589 | | break; |
| 590 | | case 5: |
| 591 | | keybuf = mac->m_key5->read(); |
| 592 | | break; |
| 593 | | case 6: |
| 594 | | keybuf = mac->m_key6->read(); |
| 595 | | break; |
| 596 | | } |
| 574 | keybuf = ports[i]->read(); |
| 597 | 575 | |
| 598 | 576 | if (keybuf != mac->m_key_matrix[i]) |
| 599 | 577 | { |