← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/mame/machine/nmk004.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/machine/nmk004.c
175
175
 
176
176
                if (sample != 0)
177
177
                {
178
 
                        UINT8 *rom = NMK004_state.machine().region((chip == 0) ? "oki1" : "oki2")->base();
 
178
                        UINT8 *rom = NMK004_state.machine().root_device().memregion((chip == 0) ? "oki1" : "oki2")->base();
179
179
                        int bank = (byte2 & 0x0c) >> 2;
180
180
                        int vol = (byte2 & 0x70) >> 4;
181
181
 
1033
1033
        NMK004_state.oki1device = machine.device<okim6295_device>("oki1");
1034
1034
        NMK004_state.oki2device = machine.device<okim6295_device>("oki2");
1035
1035
 
1036
 
        NMK004_state.rom = machine.region("audiocpu")->base();
 
1036
        NMK004_state.rom = machine.root_device().memregion("audiocpu")->base();
1037
1037
 
1038
1038
        ym2203_control_port_w(NMK004_state.ymdevice, 0, 0x2f);
1039
1039