Previous 199869 Revisions Next

r34618 Monday 26th January, 2015 at 12:50:04 UTC by David Haywood
Merge branch 'master' of https://github.com/mamedev/mame
[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/mess/drivers]gamate.c

trunk/src/build/file2str.py
r243129r243130
22
33from __future__ import with_statement
44
5import string
65import sys
76import os
87
trunk/src/build/png.py
r243129r243130
26602660
26612661    # Parse command line arguments
26622662    from optparse import OptionParser
2663    import re
26642663    version = '%prog ' + __version__
26652664    parser = OptionParser(version=version)
26662665    parser.set_usage("%prog [options] [imagefile]")
trunk/src/emu/cpu/arcompact/arcompact_make.py
r243129r243130
11#!/usr/bin/python
22
33import sys
4import re
54
65def EmitGroup04_Handle_NZ_Flags(f, funcname, opname):
76        print >>f, "      if (result & 0x80000000) { STATUS32_SET_N; }"
trunk/src/emu/cpu/m6809/m6809make.py
r243129r243130
11#!/usr/bin/python
22
33import sys
4import logging
5import fileinput
64import re
75
86# Initial state
trunk/src/emu/machine/bcreader.c
r243129r243130
269269   {
270270      if (m_byte_count < m_byte_length)
271271      {
272         UINT8 val = m_pixel_data[m_byte_count];
272         UINT8 val = m_byte_data[m_byte_count];
273273         m_byte_count++;
274274         return val;
275275      }
trunk/src/emu/machine/bcreader.h
r243129r243130
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; }
2830   UINT8 read_code();
2931   int read_pixel();
3032
trunk/src/emu/ui/inputmap.c
r243129r243130
154154void ui_menu_input_specific::populate()
155155{
156156   input_item_data *itemlist = NULL;
157   ioport_field *field;
158   ioport_port *port;
159157   int suborder[SEQ_TYPE_TOTAL];
160158   astring tempstring;
159   int port_count = 0;
161160
162161   /* create a mini lookup table for sort order based on sequence type */
163162   suborder[SEQ_TYPE_STANDARD] = 0;
r243129r243130
165164   suborder[SEQ_TYPE_INCREMENT] = 2;
166165
167166   /* iterate over the input ports and add menu items */
168   for (port = machine().ioport().first_port(); port != NULL; port = port->next())
169      for (field = port->first_field(); field != NULL; field = field->next())
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())
170171      {
171172         const char *name = field->name();
172173
r243129r243130
182183            {
183184               sortorder = (field->type() << 2) | (field->player() << 12);
184185               if (strcmp(field->device().tag(), ":"))
185                  sortorder |= 0x10000;
186                  sortorder |= (port_count & 0xfff) * 0x10000;
186187            }
187188            else
188189               sortorder = field->type() | 0xf000;
r243129r243130
212213            }
213214         }
214215      }
216   }
215217
216218   /* sort and populate the menu in a standard fashion */
217219   populate_and_sort(itemlist);
trunk/src/emu/ui/sliders.c
r243129r243130
130130
131131void ui_menu_sliders::populate()
132132{
133   const slider_state *curslider;
134133   astring tempstring;
135134
136   /* add all sliders */
137   for (curslider = machine().ui().get_slider_list(); curslider != NULL; curslider = curslider->next)
135   /* add UI sliders */
136   for (const slider_state *curslider = machine().ui().get_slider_list(); curslider != NULL; curslider = curslider->next)
138137   {
139138      INT32 curval = (*curslider->update)(machine(), curslider->arg, &tempstring, SLIDER_NOCHANGE);
140139      UINT32 flags = 0;
r243129r243130
148147         break;
149148   }
150149
151   /* add all sliders */
152   for (curslider = (slider_state*)machine().osd().get_slider_list(); curslider != NULL; curslider = curslider->next)
150   /* add OSD sliders */
151   for (const slider_state *curslider = (slider_state*)machine().osd().get_slider_list(); curslider != NULL; curslider = curslider->next)
153152   {
154153      INT32 curval = (*curslider->update)(machine(), curslider->arg, &tempstring, SLIDER_NOCHANGE);
155154      UINT32 flags = 0;
trunk/src/mess/drivers/gamate.c
r243129r243130
8585   emu_timer *timer1;
8686   emu_timer *timer2;
8787   UINT8 bank_multi; 
88   UINT8 *m_cart_ptr;
8889};
8990
9091WRITE8_MEMBER( gamate_state::gamate_cart_protection_w )
r243129r243130
9697      card_protection.failed= card_protection.failed || ((card_protection.cartridge_byte&0x80)!=0) != ((data&4)!=0);
9798      card_protection.bit_shifter++;
9899      if (card_protection.bit_shifter>=8) {
99         card_protection.cartridge_byte=m_cart->get_rom_base()[card_protection.address++];
100         card_protection.cartridge_byte=m_cart_ptr[card_protection.address++];
100101         card_protection.bit_shifter=0;
101102      }
102103      break;
r243129r243130
107108
108109  UINT8 ret=1;
109110  if (card_protection.bit_shifter==7 && card_protection.unprotected) {
110    ret=m_cart->get_rom_base()[bank_multi*0x4000];
111    ret=m_cart_ptr[bank_multi*0x4000];
111112  } else {
112113   card_protection.bit_shifter++;
113114   if (card_protection.bit_shifter==8) {
r243129r243130
132133  // writes 0x20
133134  card_protection.address=0x6005-0x6001;
134135  card_protection.bit_shifter=0;
135  card_protection.cartridge_byte=m_cart->get_rom_base()[card_protection.address++];//m_cart_rom[card_protection.address++];
136  card_protection.cartridge_byte=m_cart_ptr[card_protection.address++];//m_cart_rom[card_protection.address++];
136137  card_protection.failed=false;
137138  card_protection.unprotected=false;
138139}
r243129r243130
172173WRITE8_MEMBER( gamate_state::cart_bankswitchmulti_w )
173174{
174175  bank_multi=data;
175  membank("bankmulti")->set_base(m_cart->get_rom_base()+0x4000*data+1);
176  membank("bankmulti")->set_base(m_cart_ptr+0x4000*data+1);
176177}
177178
178179WRITE8_MEMBER( gamate_state::cart_bankswitch_w )
179180{
180   membank("bank")->set_base(m_cart->get_rom_base()+0x4000*data);
181   membank("bank")->set_base(m_cart_ptr+0x4000*data);
181182}
182183
183184READ8_MEMBER( gamate_state::gamate_video_r )
r243129r243130
329330
330331void gamate_state::machine_start()
331332{
333   m_cart_ptr = memregion("maincpu")->base() + 0x6000;
332334   if (m_cart->exists()) {
333335//      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();
334337      membank("bankmulti")->set_base(m_cart->get_rom_base()+1);
335338      membank("bank")->set_base(m_cart->get_rom_base()+0x4000); // bankswitched games in reality no offset
336339   }

https://github.com/mamedev/mame/commit/c0c1fe2f74c29e19c293621123415452dd2c01ee

Previous 199869 Revisions Next

© 1997-2024 The MAME Team