Previous 199869 Revisions Next

r40626 Monday 7th September, 2015 at 07:49:22 UTC by Vasantha Crabb
Merge pull request #310 from SailorSat/master

fixes for gprider twin setup
[src/mame]mess.lst
[src/mame/machine]n64.c
[src/mess/drivers]apple2.c apple2e.c n64.c
[src/osd/modules/render]drawogl.c

trunk/src/mame/machine/n64.c
r249137r249138
22662266   }
22672267   else // dd read, BM Mode 1
22682268   {
2269      if(((dd_track_reg & 0xFFF) == 6) && (dd_start_block == 0))
2269      if(((dd_track_reg & 0xFFF) == 6) && (dd_start_block == 0) && ((machine().root_device().ioport("input")->read() & 0x0100) == 0x0000))
22702270      {
2271         //only fail read LBA 12 if retail disk drive
22712272         dd_status_reg &= ~DD_ASIC_STATUS_DREQ;
2273         dd_buf_status_reg |= DD_BMST_MICRO_STATUS;
22722274      }
22732275      else if(dd_current_reg < SECTORS_PER_BLOCK)
22742276      {
r249137r249138
23362338   sector = (UINT8*)machine().root_device().memregion("disk")->base();
23372339   sector += dd_track_offset;
23382340   sector += dd_start_block * SECTORS_PER_BLOCK * ddZoneSecSize[dd_zone];
2339   sector += (dd_current_reg) * ddZoneSecSize[dd_zone];
2341   sector += (dd_current_reg) * (dd_sector_size + 1);
23402342
23412343   //logerror("Read Block %d, Sector %d\n", dd_start_block, dd_current_reg);
23422344
2343   for(int i = 0; i < ddZoneSecSize[dd_zone]/4; i++)
2345   for(int i = 0; i < (dd_sector_size + 1)/4; i++)
23442346   {
23452347      dd_sector_data[i] = sector[(i*4 + 0)] << 24 | sector[(i*4 + 1)] << 16 |
23462348                     sector[(i*4 + 2)] << 8  | sector[(i*4 + 3)];
r249137r249138
24212423         ret = dd_seq_ctrl_reg;
24222424         break;
24232425      case 0x40/4: // ASIC ID
2424         ret = 0x00030000; // Japan Retail Drive
2426         if ((machine().root_device().ioport("input")->read() & 0x0100) == 0x0000)
2427            ret = 0x00030000; // Japan Retail Drive
2428         else
2429            ret = 0x00040000; // Development Drive
24252430         break;
24262431   }
24272432
trunk/src/mame/mess.lst
r249137r249138
433433prav8m  // Pravetz 8M
434434uniap2en // 1982 Unitron AP II (in English)
435435uniap2pt // 1982 Unitron AP II (in Brazilian Portuguese)
436uniap2ti // 1982 Unitron AP II+ (Teclado Inteligente)
436437apple2jp  // ??? ???? Apple ][j+
437438apple2e   // Jan 1983 Apple //e
438439apple2euk // Jan 1983 Apple //e (UK)
trunk/src/mess/drivers/apple2.c
r249137r249138
14481448   ROM_LOAD ( "unitron.f0"   , 0x3000, 0x1000, CRC(8e047c4a) SHA1(78c57c0e00dfce7fdec9437fe2b4c25def447e5d))
14491449ROM_END
14501450
1451ROM_START(uniap2ti)
1452   ROM_REGION(0x1000,"gfx1",0)
1453   ROM_LOAD ( "unitron.chr", 0x0000, 0x1000, CRC(7fdd1af6) SHA1(2f4f90d90f2f3a8c1fbea304e1072780fb22e698))
1454
1455   ROM_REGION(0x4000,"maincpu",0)
1456   ROM_LOAD ( "unitron_pt.d0", 0x1000, 0x1000, CRC(311beae6) SHA1(f6379aba9ac982850edc314c93a393844a3349ef))
1457   ROM_LOAD ( "unitron.e0"   , 0x2000, 0x1000, CRC(0d494efd) SHA1(a2fd1223a3ca0cfee24a6afe66ea3c4c144dd98e))
1458   ROM_LOAD ( "unitron.f0"   , 0x3000, 0x1000, CRC(8e047c4a) SHA1(78c57c0e00dfce7fdec9437fe2b4c25def447e5d))
1459
1460   ROM_REGION(0x4000,"keyboard",0)
1461   ROM_LOAD ( "unitron_apii_keyboard.ic3", 0x1000, 0x1000, CRC(311beae6) SHA1(f6379aba9ac982850edc314c93a393844a3349ef))
1462ROM_END
1463
1464
14511465/*
14521466    J-Plus ROM numbers confirmed by:
14531467    http://mirrors.apple2.org.za/Apple%20II%20Documentation%20Project/Computers/Apple%20II/Apple%20II%20j-plus/Photos/Apple%20II%20j-plus%20-%20Motherboard.jpg
r249137r249138
15871601COMP( 1982, maxxi,    apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Polymax",  "Maxxi", MACHINE_SUPPORTS_SAVE )
15881602COMP( 1982, prav82,   apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Pravetz",           "Pravetz 82", MACHINE_SUPPORTS_SAVE )
15891603COMP( 1982, ace100,   apple2,   0,        apple2,      apple2p, driver_device,  0,        "Franklin Computer", "Franklin Ace 100", MACHINE_SUPPORTS_SAVE )
1590COMP( 1982, uniap2en, apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Unitron Eletr??nica", "Unitron AP II (in English)", MACHINE_SUPPORTS_SAVE )
1591COMP( 1982, uniap2pt, apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Unitron Eletr??nica", "Unitron AP II (in Brazilian Portuguese)", MACHINE_SUPPORTS_SAVE )
1604COMP( 1982, uniap2en, apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Unitron Eletronica", "Unitron AP II (in English)", MACHINE_SUPPORTS_SAVE )
1605COMP( 1982, uniap2pt, apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Unitron Eletronica", "Unitron AP II (in Brazilian Portuguese)", MACHINE_SUPPORTS_SAVE )
1606COMP( 198?, uniap2ti, apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Unitron Eletronica", "Unitron AP II+", MACHINE_SUPPORTS_SAVE )
15921607COMP( 1983, agat7,    apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Agat",              "Agat-7", MACHINE_NOT_WORKING) // disk controller ROM JSRs to $FCA8 which is a delay on apple II, illegal instruction crash here :(
15931608// reverse font direction -\/
15941609COMP( 1984, ivelultr, apple2,   0,        apple2p,     apple2p, driver_device,  0,        "Ivasim",            "Ivel Ultra", MACHINE_SUPPORTS_SAVE )
trunk/src/mess/drivers/apple2e.c
r249137r249138
21212121
21222122   // machine state switches
21232123   //
2124   Hires    = m_video->m_hires ? 1 : 0;
2124   Hires    = (m_video->m_hires && m_video->m_graphics) ? 1 : 0;
21252125   Mixed    = m_video->m_mix ? 1 : 0;
21262126   Page2    = m_page2 ? 1 : 0;
21272127   _80Store = m_80store ? 1 : 0;
trunk/src/mess/drivers/n64.c
r249137r249138
8989
9090static INPUT_PORTS_START( n64 )
9191   PORT_START("input")
92   PORT_CONFNAME(0x03, 0x01, "Controller Port 0 Device")
92   PORT_CONFNAME(0x0003, 0x0001, "Controller Port 0 Device")
9393   PORT_CONFSETTING(0x00, "None")
9494   PORT_CONFSETTING(0x01, "Joypad")
9595   PORT_CONFSETTING(0x02, "Mouse")
96   PORT_CONFNAME(0x0C, 0x00, "Controller Port 1 Device")
96   PORT_CONFNAME(0x000C, 0x0000, "Controller Port 1 Device")
9797   PORT_CONFSETTING(0x00, "None")
9898   PORT_CONFSETTING(0x04, "Joypad")
9999   PORT_CONFSETTING(0x08, "Mouse")
100   PORT_CONFNAME(0x30, 0x00, "Controller Port 2 Device")
100   PORT_CONFNAME(0x0030, 0x0000, "Controller Port 2 Device")
101101   PORT_CONFSETTING(0x00, "None")
102102   PORT_CONFSETTING(0x10, "Joypad")
103103   PORT_CONFSETTING(0x20, "Mouse")
104   PORT_CONFNAME(0xC0, 0x00, "Controller Port 3 Device")
104   PORT_CONFNAME(0x00C0, 0x0000, "Controller Port 3 Device")
105105   PORT_CONFSETTING(0x00, "None")
106106   PORT_CONFSETTING(0x40, "Joypad")
107107   PORT_CONFSETTING(0x80, "Mouse")
108   
109   PORT_CONFNAME(0x0100, 0x0000, "Disk Drive")
110   PORT_CONFSETTING(0x0000, "Retail")
111   PORT_CONFSETTING(0x0100, "Development")
108112
109113   //Player 1
110114   PORT_START("P1")
trunk/src/osd/modules/render/drawogl.c
r249137r249138
31173117         GL_CHECK_ERROR_NORMAL();
31183118         glViewport(0.0, 0.0, (GLsizei)texture->rawwidth, (GLsizei)texture->rawheight);
31193119      }
3120      else if ( shaderIdx==m_glsl_program_mb2sc )
3120
3121      if ( shaderIdx==m_glsl_program_mb2sc )
31213122      {
31223123         assert ( m_glsl_program_mb2sc < m_glsl_program_num-1 );
31233124         glPopAttrib(); // glViewport(0.0, 0.0, (GLsizei)window().width, (GLsizei)window().height)

https://github.com/mamedev/mame/commit/3227c85ed64e08ad1cc1d61d22e8e8556f56d043

Previous 199869 Revisions Next

© 1997-2024 The MAME Team