Previous 199869 Revisions Next

r34617 Monday 26th January, 2015 at 12:49:34 UTC by David Haywood
fix attempt for MT 5832
[src/build]file2str.py png.py
[src/emu/cpu/arcompact]arcompact_make.py
[src/emu/cpu/m6809]m6809make.py
[src/emu/machine]bcreader.c bcreader.h
[src/emu/ui]inputmap.c sliders.c
[src/mame/video]gp9001.c
[src/mess/drivers]gamate.c

trunk/src/build/file2str.py
r243128r243129
22
33from __future__ import with_statement
44
5import string
56import sys
67import os
78
trunk/src/build/png.py
r243128r243129
26602660
26612661    # Parse command line arguments
26622662    from optparse import OptionParser
2663    import re
26632664    version = '%prog ' + __version__
26642665    parser = OptionParser(version=version)
26652666    parser.set_usage("%prog [options] [imagefile]")
trunk/src/emu/cpu/arcompact/arcompact_make.py
r243128r243129
11#!/usr/bin/python
22
33import sys
4import re
45
56def EmitGroup04_Handle_NZ_Flags(f, funcname, opname):
67        print >>f, "      if (result & 0x80000000) { STATUS32_SET_N; }"
trunk/src/emu/cpu/m6809/m6809make.py
r243128r243129
11#!/usr/bin/python
22
33import sys
4import logging
5import fileinput
46import re
57
68# Initial state
trunk/src/emu/machine/bcreader.c
r243128r243129
269269   {
270270      if (m_byte_count < m_byte_length)
271271      {
272         UINT8 val = m_byte_data[m_byte_count];
272         UINT8 val = m_pixel_data[m_byte_count];
273273         m_byte_count++;
274274         return val;
275275      }
trunk/src/emu/machine/bcreader.h
r243128r243129
2525   barcode_reader_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
2626
2727   void write_code(const char *barcode, int len);
28   int get_pending_code() { return m_new_code; }
29   int get_byte_length() { return m_byte_length; }
3028   UINT8 read_code();
3129   int read_pixel();
3230
trunk/src/emu/ui/inputmap.c
r243128r243129
154154void ui_menu_input_specific::populate()
155155{
156156   input_item_data *itemlist = NULL;
157   ioport_field *field;
158   ioport_port *port;
157159   int suborder[SEQ_TYPE_TOTAL];
158160   astring tempstring;
159   int port_count = 0;
160161
161162   /* create a mini lookup table for sort order based on sequence type */
162163   suborder[SEQ_TYPE_STANDARD] = 0;
r243128r243129
164165   suborder[SEQ_TYPE_INCREMENT] = 2;
165166
166167   /* iterate over the input ports and add menu items */
167   for (ioport_port *port = machine().ioport().first_port(); port != NULL; port = port->next())
168   {
169      port_count++;
170      for (ioport_field *field = port->first_field(); field != NULL; field = field->next())
168   for (port = machine().ioport().first_port(); port != NULL; port = port->next())
169      for (field = port->first_field(); field != NULL; field = field->next())
171170      {
172171         const char *name = field->name();
173172
r243128r243129
183182            {
184183               sortorder = (field->type() << 2) | (field->player() << 12);
185184               if (strcmp(field->device().tag(), ":"))
186                  sortorder |= (port_count & 0xfff) * 0x10000;
185                  sortorder |= 0x10000;
187186            }
188187            else
189188               sortorder = field->type() | 0xf000;
r243128r243129
213212            }
214213         }
215214      }
216   }
217215
218216   /* sort and populate the menu in a standard fashion */
219217   populate_and_sort(itemlist);
trunk/src/emu/ui/sliders.c
r243128r243129
130130
131131void ui_menu_sliders::populate()
132132{
133   const slider_state *curslider;
133134   astring tempstring;
134135
135   /* add UI sliders */
136   for (const slider_state *curslider = machine().ui().get_slider_list(); curslider != NULL; curslider = curslider->next)
136   /* add all sliders */
137   for (curslider = machine().ui().get_slider_list(); curslider != NULL; curslider = curslider->next)
137138   {
138139      INT32 curval = (*curslider->update)(machine(), curslider->arg, &tempstring, SLIDER_NOCHANGE);
139140      UINT32 flags = 0;
r243128r243129
147148         break;
148149   }
149150
150   /* add OSD sliders */
151   for (const slider_state *curslider = (slider_state*)machine().osd().get_slider_list(); curslider != NULL; curslider = curslider->next)
151   /* add all sliders */
152   for (curslider = (slider_state*)machine().osd().get_slider_list(); curslider != NULL; curslider = curslider->next)
152153   {
153154      INT32 curval = (*curslider->update)(machine(), curslider->arg, &tempstring, SLIDER_NOCHANGE);
154155      UINT32 flags = 0;
trunk/src/mame/video/gp9001.c
r243128r243129
141141 The alternative option of allowing sprites to render a priority level higher than tilemaps breaks at least the
142142 'Welcome to..' screen in Batrider after selecting your character.
143143
144 Batrider Gob-Robo boss however definitely requires SPRITES to still have 16 levels of priority against other
145 sprites, see http://mametesters.org/view.php?id=5832
146
144147 It is unknown if the current solution breaks anything.  The majority of titles don't make extensive use of the
145148 priority system.
146149
147150*/
148#define GP9001_PRIMASK (0x000e)
151#define GP9001_PRIMASK (0x000f)
152#define GP9001_PRIMASK_TMAPS (0x000e)
149153
150
151154WRITE16_MEMBER( gp9001vdp_device::gp9001_bg_tmap_w )
152155{
153156   COMBINE_DATA(&m_vram_bg[offset]);
r243128r243129
171174   AM_RANGE(0x0000, 0x0fff) AM_RAM_WRITE(gp9001_bg_tmap_w) AM_SHARE("vram_bg")
172175   AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(gp9001_fg_tmap_w) AM_SHARE("vram_fg")
173176   AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(gp9001_top_tmap_w) AM_SHARE("vram_top")
174   AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("spriteram")
175   AM_RANGE(0x3800, 0x3fff) AM_RAM // sprite mirror?
177   AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("spriteram") AM_MIRROR(0x0800)
178//   AM_RANGE(0x3800, 0x3fff) AM_RAM // sprite mirror?
176179ADDRESS_MAP_END
177180
178181
r243128r243129
885888         int realx = (x+scrollx)&0x1ff;
886889
887890         UINT16 pixdat = srcptr[realx];
888         UINT8 pixpri = ((pixdat & (GP9001_PRIMASK<<12))>>12);
891         UINT8 pixpri = ((pixdat & (GP9001_PRIMASK_TMAPS<<12))>>12);
889892
890893         if (pri_enable[pixpri])
891894         {
trunk/src/mess/drivers/gamate.c
r243128r243129
8585   emu_timer *timer1;
8686   emu_timer *timer2;
8787   UINT8 bank_multi; 
88   UINT8 *m_cart_ptr;
8988};
9089
9190WRITE8_MEMBER( gamate_state::gamate_cart_protection_w )
r243128r243129
9796      card_protection.failed= card_protection.failed || ((card_protection.cartridge_byte&0x80)!=0) != ((data&4)!=0);
9897      card_protection.bit_shifter++;
9998      if (card_protection.bit_shifter>=8) {
100         card_protection.cartridge_byte=m_cart_ptr[card_protection.address++];
99         card_protection.cartridge_byte=m_cart->get_rom_base()[card_protection.address++];
101100         card_protection.bit_shifter=0;
102101      }
103102      break;
r243128r243129
108107
109108  UINT8 ret=1;
110109  if (card_protection.bit_shifter==7 && card_protection.unprotected) {
111    ret=m_cart_ptr[bank_multi*0x4000];
110    ret=m_cart->get_rom_base()[bank_multi*0x4000];
112111  } else {
113112   card_protection.bit_shifter++;
114113   if (card_protection.bit_shifter==8) {
r243128r243129
133132  // writes 0x20
134133  card_protection.address=0x6005-0x6001;
135134  card_protection.bit_shifter=0;
136  card_protection.cartridge_byte=m_cart_ptr[card_protection.address++];//m_cart_rom[card_protection.address++];
135  card_protection.cartridge_byte=m_cart->get_rom_base()[card_protection.address++];//m_cart_rom[card_protection.address++];
137136  card_protection.failed=false;
138137  card_protection.unprotected=false;
139138}
r243128r243129
173172WRITE8_MEMBER( gamate_state::cart_bankswitchmulti_w )
174173{
175174  bank_multi=data;
176  membank("bankmulti")->set_base(m_cart_ptr+0x4000*data+1);
175  membank("bankmulti")->set_base(m_cart->get_rom_base()+0x4000*data+1);
177176}
178177
179178WRITE8_MEMBER( gamate_state::cart_bankswitch_w )
180179{
181   membank("bank")->set_base(m_cart_ptr+0x4000*data);
180   membank("bank")->set_base(m_cart->get_rom_base()+0x4000*data);
182181}
183182
184183READ8_MEMBER( gamate_state::gamate_video_r )
r243128r243129
330329
331330void gamate_state::machine_start()
332331{
333   m_cart_ptr = memregion("maincpu")->base() + 0x6000;
334332   if (m_cart->exists()) {
335333//      m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r));
336      m_cart_ptr = m_cart->get_rom_base();
337334      membank("bankmulti")->set_base(m_cart->get_rom_base()+1);
338335      membank("bank")->set_base(m_cart->get_rom_base()+0x4000); // bankswitched games in reality no offset
339336   }

https://github.com/mamedev/mame/commit/62b3b9f80d1d4327edfd2483d41645315c4f5f06

Previous 199869 Revisions Next

© 1997-2024 The MAME Team