Previous 199869 Revisions Next

r29523 Friday 11th April, 2014 at 05:35:09 UTC by Fabio Priuli
x1_010: converted to use inline config. nw.
[src/emu/sound]x1_010.c x1_010.h
[src/mame/drivers]champbwl.c seta.c seta2.c

trunk/src/mame/drivers/seta2.c
r29522r29523
20652065   m_tmp68301->external_interrupt_2();   // to do: hook up x1-10 interrupts
20662066}
20672067
2068static const x1_010_interface x1_010_sound_intf =
2069{
2070   0x0000,     /* address */
2071};
2072
2073
20742068static MACHINE_CONFIG_START( seta2, seta2_state )
20752069   MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3)   // !! TMP68301 !!
20762070   MCFG_CPU_PROGRAM_MAP(mj4simai_map)
r29522r29523
20982092   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
20992093
21002094   MCFG_SOUND_ADD("x1snd", X1_010, XTAL_50MHz/3)   // clock?
2101   MCFG_SOUND_CONFIG(x1_010_sound_intf)
21022095   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
21032096   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
21042097MACHINE_CONFIG_END
trunk/src/mame/drivers/seta.c
r29522r29523
14761476
14771477***************************************************************************/
14781478
1479static const x1_010_interface seta_sound_intf =
1480{
1481   0x0000,     /* address */
1482};
1483static const x1_010_interface seta_sound_intf2 =
1484{
1485   0x1000,     /* address */
1486};
1487
14881479WRITE_LINE_MEMBER(seta_state::utoukond_ym3438_interrupt)
14891480{
14901481   m_audiocpu->set_input_line(INPUT_LINE_NMI, state);
r29522r29523
76517642   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
76527643
76537644   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
7654   MCFG_SOUND_CONFIG(seta_sound_intf)
76557645   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
76567646   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
76577647MACHINE_CONFIG_END
r29522r29523
76957685   /* sound hardware */
76967686   MCFG_SPEAKER_STANDARD_MONO("mono")
76977687   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
7698   MCFG_SOUND_CONFIG(seta_sound_intf)
76997688   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
77007689MACHINE_CONFIG_END
77017690
r29522r29523
77607749   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
77617750
77627751   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
7763   MCFG_SOUND_CONFIG(seta_sound_intf2)
7752   MCFG_X1_010_ADDRESS(0x1000)
77647753   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
77657754   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
77667755MACHINE_CONFIG_END
r29522r29523
78107799   /* sound hardware */
78117800   MCFG_SPEAKER_STANDARD_MONO("mono")
78127801   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
7813   MCFG_SOUND_CONFIG(seta_sound_intf2)
7802   MCFG_X1_010_ADDRESS(0x1000)
78147803   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
78157804MACHINE_CONFIG_END
78167805
r29522r29523
78547843   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
78557844
78567845   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
7857   MCFG_SOUND_CONFIG(seta_sound_intf)
78587846   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
78597847   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
78607848MACHINE_CONFIG_END
r29522r29523
78937881   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
78947882
78957883   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
7896   MCFG_SOUND_CONFIG(seta_sound_intf)
78977884   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
78987885   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
78997886MACHINE_CONFIG_END
r29522r29523
79427929   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
79437930
79447931   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
7945   MCFG_SOUND_CONFIG(seta_sound_intf)
79467932   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
79477933   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
79487934MACHINE_CONFIG_END
r29522r29523
79807966   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
79817967
79827968   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
7983   MCFG_SOUND_CONFIG(seta_sound_intf)
79847969   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
79857970   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
79867971MACHINE_CONFIG_END
r29522r29523
80198004   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
80208005
80218006   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8022   MCFG_SOUND_CONFIG(seta_sound_intf)
80238007   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
80248008   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
80258009MACHINE_CONFIG_END
r29522r29523
80948078   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
80958079
80968080   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8097   MCFG_SOUND_CONFIG(seta_sound_intf)
80988081   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
80998082   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
81008083MACHINE_CONFIG_END
r29522r29523
81398122   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
81408123
81418124   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8142   MCFG_SOUND_CONFIG(seta_sound_intf)
81438125   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
81448126   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
81458127MACHINE_CONFIG_END
r29522r29523
81778159   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
81788160
81798161   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8180   MCFG_SOUND_CONFIG(seta_sound_intf)
81818162   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
81828163   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
81838164MACHINE_CONFIG_END
r29522r29523
82328213   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
82338214
82348215   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8235   MCFG_SOUND_CONFIG(seta_sound_intf)
82368216   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
82378217   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
82388218MACHINE_CONFIG_END
r29522r29523
82718251   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
82728252
82738253   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8274   MCFG_SOUND_CONFIG(seta_sound_intf)
82758254   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
82768255   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
82778256MACHINE_CONFIG_END
r29522r29523
83188297   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
83198298
83208299   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8321   MCFG_SOUND_CONFIG(seta_sound_intf)
83228300   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
83238301   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
83248302MACHINE_CONFIG_END
r29522r29523
83848362   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
83858363
83868364   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8387   MCFG_SOUND_CONFIG(seta_sound_intf)
83888365   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
83898366   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
83908367MACHINE_CONFIG_END
r29522r29523
84308407   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
84318408
84328409   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8433   MCFG_SOUND_CONFIG(seta_sound_intf)
84348410   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
84358411   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
84368412MACHINE_CONFIG_END
r29522r29523
84678443   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
84688444
84698445   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8470   MCFG_SOUND_CONFIG(seta_sound_intf)
84718446   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
84728447   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
84738448MACHINE_CONFIG_END
r29522r29523
85108485   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
85118486
85128487   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8513   MCFG_SOUND_CONFIG(seta_sound_intf)
85148488   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
85158489   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
85168490MACHINE_CONFIG_END
r29522r29523
85508524   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
85518525
85528526   MCFG_SOUND_ADD("x1snd", X1_010, 14318180)   /* 14.318180 MHz */
8553   MCFG_SOUND_CONFIG(seta_sound_intf)
85548527   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
85558528   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
85568529MACHINE_CONFIG_END
r29522r29523
85938566   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
85948567
85958568   MCFG_SOUND_ADD("x1snd", X1_010, 14318180)   /* 14.318180 MHz */
8596   MCFG_SOUND_CONFIG(seta_sound_intf)
85978569   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
85988570   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
85998571MACHINE_CONFIG_END
r29522r29523
86358607   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
86368608
86378609   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8638   MCFG_SOUND_CONFIG(seta_sound_intf)
86398610   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
86408611   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
86418612MACHINE_CONFIG_END
r29522r29523
86828653   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
86838654
86848655   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8685   MCFG_SOUND_CONFIG(seta_sound_intf)
86868656   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
86878657   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
86888658MACHINE_CONFIG_END
r29522r29523
87258695   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
87268696
87278697   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8728   MCFG_SOUND_CONFIG(seta_sound_intf)
87298698   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
87308699   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
87318700MACHINE_CONFIG_END
r29522r29523
87758744   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
87768745
87778746   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8778   MCFG_SOUND_CONFIG(seta_sound_intf)
87798747   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
87808748   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
87818749MACHINE_CONFIG_END
r29522r29523
88158783   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
88168784
88178785   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8818   MCFG_SOUND_CONFIG(seta_sound_intf)
88198786   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
88208787   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
88218788MACHINE_CONFIG_END
r29522r29523
88938860   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
88948861
88958862   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8896   MCFG_SOUND_CONFIG(seta_sound_intf)
88978863   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
88988864   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
88998865MACHINE_CONFIG_END
r29522r29523
89358901   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
89368902
89378903   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8938   MCFG_SOUND_CONFIG(seta_sound_intf)
89398904   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
89408905   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
89418906MACHINE_CONFIG_END
r29522r29523
89778942   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
89788943
89798944   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
8980   MCFG_SOUND_CONFIG(seta_sound_intf)
89818945   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
89828946   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
89838947MACHINE_CONFIG_END
r29522r29523
90889052   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
90899053
90909054   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
9091   MCFG_SOUND_CONFIG(seta_sound_intf)
90929055   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
90939056   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
90949057MACHINE_CONFIG_END
r29522r29523
91279090   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
91289091
91299092   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
9130   MCFG_SOUND_CONFIG(seta_sound_intf)
91319093   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
91329094   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
91339095MACHINE_CONFIG_END
r29522r29523
91709132   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
91719133
91729134   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
9173   MCFG_SOUND_CONFIG(seta_sound_intf)
91749135   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
91759136   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
91769137
r29522r29523
92229183   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
92239184
92249185   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
9225   MCFG_SOUND_CONFIG(seta_sound_intf)
92269186   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
92279187   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
92289188MACHINE_CONFIG_END
r29522r29523
92719231   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
92729232
92739233   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
9274   MCFG_SOUND_CONFIG(seta_sound_intf)
92759234   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
92769235   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
92779236MACHINE_CONFIG_END
r29522r29523
93269285   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
93279286
93289287   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)   /* 16 MHz */
9329   MCFG_SOUND_CONFIG(seta_sound_intf)
93309288   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
93319289   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
93329290MACHINE_CONFIG_END
r29522r29523
94439401   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
94449402
94459403   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
9446   MCFG_SOUND_CONFIG(seta_sound_intf)
94479404   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
94489405   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
94499406
trunk/src/mame/drivers/champbwl.c
r29522r29523
430430   GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
431431GFXDECODE_END
432432
433static const x1_010_interface champbwl_sound_intf =
434{
435   0x0000      /* address */
436};
437
438433MACHINE_START_MEMBER(champbwl_state,champbwl)
439434{
440435   UINT8 *ROM = memregion("maincpu")->base();
r29522r29523
508503   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
509504
510505   MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
511   MCFG_SOUND_CONFIG(champbwl_sound_intf)
512506   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
513507   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
514508MACHINE_CONFIG_END
r29522r29523
573567   /* sound hardware */
574568   MCFG_SPEAKER_STANDARD_MONO("mono")
575569   MCFG_SOUND_ADD("x1snd", X1_010, XTAL_14_31818MHz)
576   MCFG_SOUND_CONFIG(champbwl_sound_intf)
577570   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
578571MACHINE_CONFIG_END
579572
trunk/src/emu/sound/x1_010.c
r29522r29523
8686   : device_t(mconfig, X1_010, "X1-010", tag, owner, clock, "x1_010", __FILE__),
8787      device_sound_interface(mconfig, *this),
8888      m_rate(0),
89      m_adr(0),
8990      m_stream(NULL),
9091      m_region(NULL),
9192      m_sound_enable(0),
r29522r29523
9899}
99100
100101//-------------------------------------------------
101//  device_config_complete - perform any
102//  operations now that the configuration is
103//  complete
104//-------------------------------------------------
105
106void x1_010_device::device_config_complete()
107{
108   // inherit a copy of the static data
109   const x1_010_interface *intf = reinterpret_cast<const x1_010_interface *>(static_config());
110   if (intf != NULL)
111   *static_cast<x1_010_interface *>(this) = *intf;
112
113   // or initialize to defaults if none provided
114   else
115   {
116   m_adr = 0;
117   }
118}
119
120//-------------------------------------------------
121102//  device_start - device-specific startup
122103//-------------------------------------------------
123104
trunk/src/emu/sound/x1_010.h
r29522r29523
55
66#define SETA_NUM_CHANNELS 16
77
8struct x1_010_interface
9{
10   int m_adr;    /* address */
11};
12
13
148class x1_010_device : public device_t,
15                           public device_sound_interface,
16                           public x1_010_interface
9                  public device_sound_interface
1710{
1811public:
1912   x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
2013   ~x1_010_device() {}
2114
15   // static configuration
16   static void set_address(device_t &device, int addr) { downcast<x1_010_device &>(device).m_adr = addr; }
17
2218   DECLARE_READ8_MEMBER ( read );
2319   DECLARE_WRITE8_MEMBER( write );
2420
r29522r29523
2925
3026protected:
3127   // device-level overrides
32   virtual void device_config_complete();
3328   virtual void device_start();
3429
3530   // sound stream update overrides
r29522r29523
3934
4035   /* Variables only used here */
4136   int m_rate;                               // Output sampling rate (Hz)
37   int m_adr;                                // address
4238   sound_stream *  m_stream;                 // Stream handle
4339   const UINT8 *m_region;                    // region name
4440   int m_sound_enable;                       // sound output enable/disable
r29522r29523
5349extern const device_type X1_010;
5450
5551
52#define MCFG_X1_010_ADDRESS(_addr) \
53   x1_010_device::set_address(*device, _addr);
54
55
5656#endif /* __X1_010_H__ */

Previous 199869 Revisions Next

© 1997-2024 The MAME Team