Previous 199869 Revisions Next

r21567 Monday 4th March, 2013 at 14:22:32 UTC by Fabio Priuli
removed a bunch of now redundant variables. nw.
[src/mame/includes]snes.h
[src/mame/machine]snes.c
[src/mess/drivers]snes.c

trunk/src/mame/machine/snes.c
r21566r21567
527527      case RDIO:          /* Programmable I/O port - echos back what's written to WRIO */
528528         return SNES_CPU_REG_STATE(WRIO);
529529      case JOY1L:         /* Joypad 1 status register (low) */
530         if(state->m_is_nss && state->m_input_disabled)
531            return 0;
532
533         return state->m_joy1l;
534530      case JOY1H:         /* Joypad 1 status register (high) */
535         if(state->m_is_nss && state->m_input_disabled)
536            return 0;
537
538         return state->m_joy1h;
539531      case JOY2L:         /* Joypad 2 status register (low) */
540         if(state->m_is_nss && state->m_input_disabled)
541            return 0;
542
543         return state->m_joy2l;
544532      case JOY2H:         /* Joypad 2 status register (high) */
545         if(state->m_is_nss && state->m_input_disabled)
546            return 0;
547
548         return state->m_joy2h;
549533      case JOY3L:         /* Joypad 3 status register (low) */
550         if(state->m_is_nss && state->m_input_disabled)
551            return 0;
552
553         return state->m_joy3l;
554534      case JOY3H:         /* Joypad 3 status register (high) */
555         if(state->m_is_nss && state->m_input_disabled)
556            return 0;
557
558         return state->m_joy3h;
559535      case JOY4L:         /* Joypad 4 status register (low) */
560         if(state->m_is_nss && state->m_input_disabled)
561            return 0;
562
563         return state->m_joy4l;
564536      case JOY4H:         /* Joypad 4 status register (high) */
565537         if(state->m_is_nss && state->m_input_disabled)
566538            return 0;
539         return SNES_CPU_REG_STATE(offset);
567540
568         return state->m_joy4h;
569
570541      case 0x4100:        /* NSS Dip-Switches */
571542         {
572543            if (state->m_is_nss)
r21566r21567
14991470   // this actually works like reading the first 16bits from oldjoy1/2 in reverse order
15001471   if (SNES_CPU_REG_STATE(NMITIMEN) & 1)
15011472   {
1502      state->m_joy1l = (state->m_data1[0] & 0x00ff) >> 0;
1503      state->m_joy1h = (state->m_data1[0] & 0xff00) >> 8;
1504      state->m_joy2l = (state->m_data1[1] & 0x00ff) >> 0;
1505      state->m_joy2h = (state->m_data1[1] & 0xff00) >> 8;
1506      state->m_joy3l = (state->m_data2[0] & 0x00ff) >> 0;
1507      state->m_joy3h = (state->m_data2[0] & 0xff00) >> 8;
1508      state->m_joy4l = (state->m_data2[1] & 0x00ff) >> 0;
1509      state->m_joy4h = (state->m_data2[1] & 0xff00) >> 8;
1473      SNES_CPU_REG_STATE(JOY1L) = (state->m_data1[0] & 0x00ff) >> 0;
1474      SNES_CPU_REG_STATE(JOY1H) = (state->m_data1[0] & 0xff00) >> 8;
1475      SNES_CPU_REG_STATE(JOY2L) = (state->m_data1[1] & 0x00ff) >> 0;
1476      SNES_CPU_REG_STATE(JOY2H) = (state->m_data1[1] & 0xff00) >> 8;
1477      SNES_CPU_REG_STATE(JOY3L) = (state->m_data2[0] & 0x00ff) >> 0;
1478      SNES_CPU_REG_STATE(JOY3H) = (state->m_data2[0] & 0xff00) >> 8;
1479      SNES_CPU_REG_STATE(JOY4L) = (state->m_data2[1] & 0x00ff) >> 0;
1480      SNES_CPU_REG_STATE(JOY4H) = (state->m_data2[1] & 0xff00) >> 8;
15101481
15111482      // make sure read_idx starts returning all 1s because the auto-read reads it :-)
15121483      state->m_read_idx[0] = 16;
r21566r21567
15911562   }
15921563
15931564   /* Inititialize registers/variables */
1594   state->m_joy1l = state->m_joy1h = state->m_joy2l = state->m_joy2h = state->m_joy3l = state->m_joy3h = 0;
1565   SNES_CPU_REG_STATE(JOY1L) = SNES_CPU_REG_STATE(JOY1H) = 0;
1566   SNES_CPU_REG_STATE(JOY2L) = SNES_CPU_REG_STATE(JOY2H) = 0;
1567   SNES_CPU_REG_STATE(JOY3L) = SNES_CPU_REG_STATE(JOY3H) = 0;
1568   SNES_CPU_REG_STATE(JOY4L) = SNES_CPU_REG_STATE(JOY4H) = 0;
15951569   state->m_data1[0] = state->m_data2[0] = state->m_data1[1] = state->m_data2[1] = 0;
15961570
15971571   state->m_io_read = nss_io_read;
r21566r21567
17421716   state->save_item(NAME(state->m_htime));
17431717   state->save_item(NAME(state->m_vtime));
17441718   state->save_item(NAME(state->m_hdmaen));
1745   state->save_item(NAME(state->m_joy1l));
1746   state->save_item(NAME(state->m_joy1h));
1747   state->save_item(NAME(state->m_joy2l));
1748   state->save_item(NAME(state->m_joy2h));
1749   state->save_item(NAME(state->m_joy3l));
1750   state->save_item(NAME(state->m_joy3h));
1751   state->save_item(NAME(state->m_joy4l));
1752   state->save_item(NAME(state->m_joy4h));
17531719   state->save_item(NAME(state->m_data1));
17541720   state->save_item(NAME(state->m_data2));
17551721   state->save_item(NAME(state->m_read_idx));
trunk/src/mame/includes/snes.h
r21566r21567
635635   UINT8                 m_oldjoy1_latch;
636636
637637   /* input-related */
638   UINT8                 m_joy1l;
639   UINT8                 m_joy1h;
640   UINT8                 m_joy2l;
641   UINT8                 m_joy2h;
642   UINT8                 m_joy3l;
643   UINT8                 m_joy3h;
644   UINT8                 m_joy4l;
645   UINT8                 m_joy4h;
646638   UINT16                m_data1[2];
647639   UINT16                m_data2[2];
648640   UINT8                 m_read_idx[2];
trunk/src/mess/drivers/snes.c
r21566r21567
591591   // this actually works like reading the first 16bits from oldjoy1/2 in reverse order
592592   if (SNES_CPU_REG_STATE(NMITIMEN) & 1)
593593   {
594      state->m_joy1l = (state->m_data1[0] & 0x00ff) >> 0;
595      state->m_joy1h = (state->m_data1[0] & 0xff00) >> 8;
596      state->m_joy2l = (state->m_data1[1] & 0x00ff) >> 0;
597      state->m_joy2h = (state->m_data1[1] & 0xff00) >> 8;
598      state->m_joy3l = (state->m_data2[0] & 0x00ff) >> 0;
599      state->m_joy3h = (state->m_data2[0] & 0xff00) >> 8;
600      state->m_joy4l = (state->m_data2[1] & 0x00ff) >> 0;
601      state->m_joy4h = (state->m_data2[1] & 0xff00) >> 8;
594      SNES_CPU_REG_STATE(JOY1L) = (state->m_data1[0] & 0x00ff) >> 0;
595      SNES_CPU_REG_STATE(JOY1H) = (state->m_data1[0] & 0xff00) >> 8;
596      SNES_CPU_REG_STATE(JOY2L) = (state->m_data1[1] & 0x00ff) >> 0;
597      SNES_CPU_REG_STATE(JOY2H) = (state->m_data1[1] & 0xff00) >> 8;
598      SNES_CPU_REG_STATE(JOY3L) = (state->m_data2[0] & 0x00ff) >> 0;
599      SNES_CPU_REG_STATE(JOY3H) = (state->m_data2[0] & 0xff00) >> 8;
600      SNES_CPU_REG_STATE(JOY4L) = (state->m_data2[1] & 0x00ff) >> 0;
601      SNES_CPU_REG_STATE(JOY4H) = (state->m_data2[1] & 0xff00) >> 8;
602602
603603      // make sure read_idx starts returning all 1s because the auto-read reads it :-)
604604      state->m_read_idx[0] = 16;

Previous 199869 Revisions Next

© 1997-2024 The MAME Team