← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/drivers/magictg.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/drivers/magictg.c
113
113
 
114
114
***************************************************************************/
115
115
 
116
 
#define ADDRESS_MAP_MODERN
117
116
#include "emu.h"
118
117
#include "cpu/mips/mips3.h"
119
118
#include "cpu/adsp2100/adsp2100.h"
133
132
                m_mips(*this, "mips"),
134
133
                m_adsp(*this, "adsp"),
135
134
                m_pci(*this, "pcibus")
136
 
        { }
 
135
        ,
 
136
                m_adsp_pram(*this, "adsp_pram"){ }
137
137
 
138
138
        required_device<cpu_device>                     m_mips;
139
139
        required_device<adsp2181_device>        m_adsp;
151
151
 
152
152
 
153
153
        /* ADSP-2181 */
154
 
        UINT32*                                                         m_adsp_pram;
 
154
        required_shared_ptr<UINT32> m_adsp_pram;
155
155
 
156
156
        struct
157
157
        {
229
229
 
230
230
void magictg_state::machine_reset()
231
231
{
232
 
        UINT8 *adsp_boot = (UINT8*)machine().region("adsp")->base();
 
232
        UINT8 *adsp_boot = (UINT8*)machine().root_device().memregion("adsp")->base();
233
233
 
234
234
        zr36120_reset();
235
235
 
752
752
                        if (data > 0)
753
753
                        {
754
754
                                address_space* addr_space;
755
 
                                UINT8* adsp_rom = (UINT8*)space.machine().region("adsp")->base();
 
755
                                UINT8* adsp_rom = (UINT8*)space.machine().root_device().memregion("adsp")->base();
756
756
 
757
757
                                UINT32 page = (m_adsp_regs.bdma_control >> 8) & 0xff;
758
758
                                UINT32 dir = (m_adsp_regs.bdma_control >> 2) & 1;
852
852
 
853
853
static ADDRESS_MAP_START( adsp_program_map, AS_PROGRAM, 32, magictg_state )
854
854
        ADDRESS_MAP_UNMAP_HIGH
855
 
        AM_RANGE(0x0000, 0x3fff) AM_RAM AM_BASE(m_adsp_pram)
 
855
        AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("adsp_pram")
856
856
ADDRESS_MAP_END
857
857
 
858
858
static ADDRESS_MAP_START( adsp_data_map, AS_DATA, 16, magictg_state )