Previous 199869 Revisions Next

r22509 Tuesday 23rd April, 2013 at 07:11:57 UTC by Miodrag Milanović
made BEEP and RAM devices initialize in constructor of driver classes (nw)
[src/emu/sound]beep.h
[src/mame/drivers]deshoros.c dlair.c
[src/mess/drivers]a5105.c ace.c alphatro.c aquarius.c bigbord2.c bmjr.c bml3.c comx35.c electron.c enterp.c ex800.c fidelz80.c fk1.c fm7.c fmtowns.c glasgow.c h19.c h8.c jr100.c jr200.c kaypro.c lx800.c mephisto.c micronic.c mmodular.c ms0515.c mstation.c multi8.c mz2000.c mz2500.c mz3500.c nc.c osborne1.c osi.c p8k.c pb1000.c pc100.c pc2000.c pc4.c pc8801.c pc9801.c pce220.c pcw.c pcw16.c portfoli.c psion.c pyl601.c qx10.c rex6000.c rt1715.c rx78.c sc2.c smc777.c spc1000.c studio2.c supercon.c thomson.c ti990_10.c ti990_4.c tmc1800.c tvc.c v1050.c vg5k.c vk100.c vt100.c vt220.c vt320.c vtech1.c x07.c x68k.c xerox820.c z9001.c zrt80.c
[src/mess/includes]aim65.h apple1.h b2m.h bebox.h c65.h cgenie.h comx35.h dai.h dgn_beta.h electron.h enterp.h fidelz80.h fm7.h gb.h genpc.h kaypro.h llc.h lviv.h micronic.h mtx.h mz700.h nascom1.h nc.h osborne1.h osi.h partner.h pc.h pc1350.h pc4.h pcw.h pcw16.h portfoli.h pp01.h psion.h rmnimbus.h samcoupe.h studio2.h tmc1800.h x07.h x68k.h xerox820.h
[src/mess/machine]aim65.c apple1.c apple2.c apple2gs.c apple3.c at.c b2m.c bebox.c c65.c cgenie.c dai.c dgn_beta.c electron.c galaxy.c gb.c genpc.c kay_kbd.c llc.c lviv.c mtx.c mz700.c nascom1.c partner.c pc.c pc1350.c pp01.c rmnimbus.c samcoupe.c vector06.c
[src/mess/video]911_vdt.c apple3.c b2m.c epnick.c mac.c nc.c pcw.c pp01.c timex.c vector06.c x68k.c

trunk/src/emu/sound/beep.h
r22508r22509
33#ifndef __BEEP_H__
44#define __BEEP_H__
55
6#define BEEPER_TAG      "beeper"
7
8
96//**************************************************************************
107//  TYPE DEFINITIONS
118//**************************************************************************
trunk/src/mess/machine/mz700.c
r22508r22509
171171
172172         /* ram from 0xa000 to 0xbfff */
173173         spc.install_readwrite_bank(0xa000, 0xbfff, "bank5");
174         membank("bank5")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xa000);
174         membank("bank5")->set_base(m_ram->pointer() + 0xa000);
175175      }
176176   }
177177
r22508r22509
183183   address_space &spc = m_maincpu->space(AS_PROGRAM);
184184
185185   spc.install_readwrite_bank(0x0000, 0x0fff, "bank1");
186   membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
186   membank("bank1")->set_base(m_ram->pointer());
187187}
188188
189189WRITE8_MEMBER(mz_state::mz800_bank_0_w)
r22508r22509
191191   address_space &spc = m_maincpu->space(AS_PROGRAM);
192192
193193   spc.install_readwrite_bank(0x0000, 0x7fff, "bank1");
194   membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
194   membank("bank1")->set_base(m_ram->pointer());
195195}
196196
197197READ8_MEMBER(mz_state::mz800_bank_1_r)
r22508r22509
200200
201201   /* switch in ram from 0x1000 to 0x1fff */
202202   spc.install_readwrite_bank(0x1000, 0x1fff, "bank2");
203   membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x1000);
203   membank("bank2")->set_base(m_ram->pointer() + 0x1000);
204204
205205   if (m_mz700_mode)
206206   {
207207      /* ram from 0xc000 to 0xcfff */
208208      spc.install_readwrite_bank(0xc000, 0xcfff, "bank6");
209      membank("bank6")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000);
209      membank("bank6")->set_base(m_ram->pointer() + 0xc000);
210210   }
211211   else
212212   {
213213      /* ram from 0x8000 to 0xbfff */
214214      spc.install_readwrite_bank(0x8000, 0xbfff, "bank4");
215      membank("bank4")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x8000);
215      membank("bank4")->set_base(m_ram->pointer() + 0x8000);
216216   }
217217
218218   return 0xff;
r22508r22509
228228      if (!m_mz700_ram_lock)
229229      {
230230         spc.install_readwrite_bank(0xd000, 0xffff, "bank7");
231         membank("bank7")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xd000);
231         membank("bank7")->set_base(m_ram->pointer() + 0xd000);
232232         m_mz700_ram_vram = FALSE;
233233      }
234234   }
r22508r22509
238238      if (!m_mz800_ram_lock)
239239      {
240240         spc.install_readwrite_bank(0xe000, 0xffff, "bank8");
241         membank("bank8")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xe000);
241         membank("bank8")->set_base(m_ram->pointer() + 0xe000);
242242         m_mz800_ram_monitor = FALSE;
243243      }
244244   }
r22508r22509
313313
314314      /* rest is ram is always ram in mz700 mode */
315315      spc.install_readwrite_bank(0x1000, 0xcfff, "bank2");
316      membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x1000);
316      membank("bank2")->set_base(m_ram->pointer() + 0x1000);
317317   }
318318   else
319319   {
r22508r22509
324324
325325      /* ram from 0x2000 to 0x7fff */
326326      spc.install_readwrite_bank(0x2000, 0x7fff, "bank3");
327      membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
327      membank("bank3")->set_base(m_ram->pointer());
328328
329329      if (m_hires_mode)
330330      {
r22508r22509
340340
341341         /* ram from 0xa000 to 0xbfff */
342342         spc.install_readwrite_bank(0xa000, 0xbfff, "bank5");
343         membank("bank5")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xa000);
343         membank("bank5")->set_base(m_ram->pointer() + 0xa000);
344344      }
345345
346346      /* ram from 0xc000 to 0xdfff */
347347      spc.install_readwrite_bank(0xc000, 0xdfff, "bank6");
348      membank("bank6")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000);
348      membank("bank6")->set_base(m_ram->pointer() + 0xc000);
349349
350350      /* mz800 monitor rom from 0xe000 to 0xffff */
351351      spc.install_read_bank(0xe000, 0xffff, "bank8");
trunk/src/mess/machine/dgn_beta.c
r22508r22509
231231      //
232232      // Map block, $00-$BF are ram, $FC-$FF are Boot ROM
233233      //
234      if ((MapPage*4) < ((machine().device<ram_device>(RAM_TAG)->size() / 1024)-1))     // Block is ram
234      if ((MapPage*4) < ((m_ram->size() / 1024)-1))     // Block is ram
235235      {
236236         if (!is_last_page(Page))
237237         {
238            readbank = &machine().device<ram_device>(RAM_TAG)->pointer()[MapPage*RamPageSize];
238            readbank = &m_ram->pointer()[MapPage*RamPageSize];
239239            if(m_LogDatWrites)
240240               debug_console_printf(machine(), "Mapping page %X, pageno=%X, mess_ram)[%X]\n",Page,MapPage,(MapPage*RamPageSize));
241241         }
242242         else
243243         {
244            readbank = &machine().device<ram_device>(RAM_TAG)->pointer()[(MapPage*RamPageSize)-256];
244            readbank = &m_ram->pointer()[(MapPage*RamPageSize)-256];
245245            logerror("Error RAM in Last page !\n");
246246         }
247247         write8_delegate func = bank_info[Page].func;
r22508r22509
310310
311311   /* Map video ram to base of area it can use, that way we can take the literal RA */
312312   /* from the 6845 without having to mask it ! */
313//  videoram=&machine().device<ram_device>(RAM_TAG)->pointer()[TextVidBasePage*RamPageSize];
313//  videoram=&m_ram->pointer()[TextVidBasePage*RamPageSize];
314314}
315315
316316// Return the value of a page register
r22508r22509
10361036   wd17xx_dden_w(fdc, CLEAR_LINE);
10371037   wd17xx_set_drive(fdc, 0);
10381038
1039   m_videoram.set_target(machine().device<ram_device>(RAM_TAG)->pointer(),m_videoram.bytes());     /* Point video ram at the start of physical ram */
1039   m_videoram.set_target(m_ram->pointer(),m_videoram.bytes());     /* Point video ram at the start of physical ram */
10401040
10411041   wd17xx_reset(fdc);
10421042   m_wd2797_written=0;
trunk/src/mess/machine/partner.c
r22508r22509
142142{
143143   address_space &space = m_maincpu->space(AS_PROGRAM);
144144   UINT8 *rom = memregion("maincpu")->base();
145   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
145   UINT8 *ram = m_ram->pointer();
146146
147147   space.install_write_bank(0x0000, 0x07ff, "bank1");
148148   space.install_write_bank(0x0800, 0x3fff, "bank2");
trunk/src/mess/machine/electron.c
r22508r22509
171171
172172WRITE8_MEMBER(electron_state::electron_ula_w)
173173{
174   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
175174   int i = electron_palette_offset[(( offset >> 1 ) & 0x03)];
176175   logerror( "ULA: write offset %02x <- %02x\n", offset & 0x0f, data );
177176   switch( offset & 0x0f )
r22508r22509
231230   case 0x06:  /* Counter divider */
232231      if ( m_ula.communication_mode == 0x01)
233232      {
234         speaker->set_frequency( 1000000 / ( 16 * ( data + 1 ) ) );
233         m_beeper->set_frequency( 1000000 / ( 16 * ( data + 1 ) ) );
235234      }
236235      break;
237236   case 0x07:  /* Misc. */
r22508r22509
239238      switch( m_ula.communication_mode )
240239      {
241240      case 0x00:  /* cassette input */
242         speaker->set_state( 0 );
241         m_beeper->set_state( 0 );
243242         electron_tape_start();
244243         break;
245244      case 0x01:  /* sound generation */
246         speaker->set_state( 1 );
245         m_beeper->set_state( 1 );
247246         electron_tape_stop();
248247         break;
249248      case 0x02:  /* cassette output */
250         speaker->set_state( 0 );
249         m_beeper->set_state( 0 );
251250         electron_tape_stop();
252251         break;
253252      case 0x03:  /* not used */
254         speaker->set_state( 0 );
253         m_beeper->set_state( 0 );
255254         electron_tape_stop();
256255         break;
257256      }
r22508r22509
309308
310309TIMER_CALLBACK_MEMBER(electron_state::setup_beep)
311310{
312   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
313   speaker->set_state( 0 );
314   speaker->set_frequency( 300 );
311   m_beeper->set_state( 0 );
312   m_beeper->set_frequency( 300 );
315313}
316314
317315void electron_state::machine_reset()
trunk/src/mess/machine/b2m.c
r22508r22509
4444{
4545   UINT8 *rom;
4646   address_space &space = m_maincpu->space(AS_PROGRAM);
47   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
47   UINT8 *ram = m_ram->pointer();
4848
4949   space.install_write_bank(0x0000, 0x27ff, "bank1");
5050   space.install_write_bank(0x2800, 0x2fff, "bank2");
trunk/src/mess/machine/samcoupe.c
r22508r22509
114114   UINT8 *mem;
115115
116116   /* bank 3 */
117   if (m_lext >> 6 < space.machine().device<ram_device>(RAM_TAG)->size() >> 20)
118      mem = &space.machine().device<ram_device>(RAM_TAG)->pointer()[(space.machine().device<ram_device>(RAM_TAG)->size() & 0xfffff) + (m_lext >> 6) * 0x100000 + (m_lext & 0x3f) * 0x4000];
117   if (m_lext >> 6 < m_ram->size() >> 20)
118      mem = &m_ram->pointer()[(m_ram->size() & 0xfffff) + (m_lext >> 6) * 0x100000 + (m_lext & 0x3f) * 0x4000];
119119   else
120120      mem = NULL;
121121
122122   samcoupe_update_bank(space, 3, mem, FALSE);
123123
124124   /* bank 4 */
125   if (m_hext >> 6 < space.machine().device<ram_device>(RAM_TAG)->size() >> 20)
126      mem = &space.machine().device<ram_device>(RAM_TAG)->pointer()[(space.machine().device<ram_device>(RAM_TAG)->size() & 0xfffff) + (m_hext >> 6) * 0x100000 + (m_hext & 0x3f) * 0x4000];
125   if (m_hext >> 6 < m_ram->size() >> 20)
126      mem = &m_ram->pointer()[(m_ram->size() & 0xfffff) + (m_hext >> 6) * 0x100000 + (m_hext & 0x3f) * 0x4000];
127127   else
128128      mem = NULL;
129129
r22508r22509
133133
134134void samcoupe_state::samcoupe_update_memory(address_space &space)
135135{
136   const int PAGE_MASK = ((machine().device<ram_device>(RAM_TAG)->size() & 0xfffff) / 0x4000) - 1;
136   const int PAGE_MASK = ((m_ram->size() & 0xfffff) / 0x4000) - 1;
137137   UINT8 *rom = memregion("maincpu")->base();
138138   UINT8 *memory;
139139   int is_readonly;
r22508r22509
142142   if (m_lmpr & LMPR_RAM0)   /* Is ram paged in at bank 1 */
143143   {
144144      if ((m_lmpr & 0x1F) <= PAGE_MASK)
145         memory = &machine().device<ram_device>(RAM_TAG)->pointer()[(m_lmpr & PAGE_MASK) * 0x4000];
145         memory = &m_ram->pointer()[(m_lmpr & PAGE_MASK) * 0x4000];
146146      else
147147         memory = NULL;  /* Attempt to page in non existant ram region */
148148      is_readonly = FALSE;
r22508r22509
157157
158158   /* BANK2 */
159159   if (((m_lmpr + 1) & 0x1f) <= PAGE_MASK)
160      memory = &machine().device<ram_device>(RAM_TAG)->pointer()[((m_lmpr + 1) & PAGE_MASK) * 0x4000];
160      memory = &m_ram->pointer()[((m_lmpr + 1) & PAGE_MASK) * 0x4000];
161161   else
162162      memory = NULL;  /* Attempt to page in non existant ram region */
163163   samcoupe_update_bank(space, 2, memory, FALSE);
r22508r22509
171171   {
172172      /* BANK3 */
173173      if ((m_hmpr & 0x1F) <= PAGE_MASK )
174         memory = &machine().device<ram_device>(RAM_TAG)->pointer()[(m_hmpr & PAGE_MASK)*0x4000];
174         memory = &m_ram->pointer()[(m_hmpr & PAGE_MASK)*0x4000];
175175      else
176176         memory = NULL;  /* Attempt to page in non existant ram region */
177177      samcoupe_update_bank(space, 3, memory, FALSE);
r22508r22509
186186      else
187187      {
188188         if (((m_hmpr + 1) & 0x1f) <= PAGE_MASK)
189            memory = &space.machine().device<ram_device>(RAM_TAG)->pointer()[((m_hmpr + 1) & PAGE_MASK) * 0x4000];
189            memory = &m_ram->pointer()[((m_hmpr + 1) & PAGE_MASK) * 0x4000];
190190         else
191191            memory = NULL;  /* Attempt to page in non existant ram region */
192192         is_readonly = FALSE;
r22508r22509
196196
197197   /* video memory location */
198198   if (m_vmpr & 0x40)   /* if bit set in 2 bank screen mode */
199      m_videoram = &machine().device<ram_device>(RAM_TAG)->pointer()[((m_vmpr & 0x1e) & PAGE_MASK) * 0x4000];
199      m_videoram = &m_ram->pointer()[((m_vmpr & 0x1e) & PAGE_MASK) * 0x4000];
200200   else
201      m_videoram = &machine().device<ram_device>(RAM_TAG)->pointer()[((m_vmpr & 0x1f) & PAGE_MASK) * 0x4000];
201      m_videoram = &m_ram->pointer()[((m_vmpr & 0x1f) & PAGE_MASK) * 0x4000];
202202}
203203
204204
trunk/src/mess/machine/apple2gs.c
r22508r22509
15761576
15771577   if ((m_shadow & 0x40) && ((address & 0xF00000) == 0x000000)) // shadow all banks and C0xx?
15781578   {
1579      result = machine().device<ram_device>(RAM_TAG)->pointer()[address];
1579      result = m_ram->pointer()[address];
15801580   }
15811581   else if ((address & 0x000F00) == 0x000000)  // accessing C0xx?
15821582   {
r22508r22509
16671667
16681668   if ((m_shadow & 0x40) && ((address & 0xF00000) == 0x000000))
16691669   {
1670      machine().device<ram_device>(RAM_TAG)->pointer()[address] = data;
1670      m_ram->pointer()[address] = data;
16711671   }
16721672   else if ((address & 0x000F00) == 0x000000)
16731673   {
r22508r22509
17451745   {
17461746      if ((m_shadow & 0x40) && ((address & 0xF00000) == 0x000000))
17471747      {
1748         opptr = &machine().device<ram_device>(RAM_TAG)->pointer()[address];
1748         opptr = &m_ram->pointer()[address];
17491749      }
17501750      else if ((address & 0x000F00) == 0x000000)
17511751      {
r22508r22509
18291829   // otherwise nothing works :)
18301830   if (m_is_rom3)
18311831   {
1832      int ramsize = machine().device<ram_device>(RAM_TAG)->size();
1832      int ramsize = m_ram->size();
18331833
18341834      // ROM 03 hardware: the quoted "1 MB" for a base machine doesn't include banks e0/e1, so map accordingly
18351835      space.install_readwrite_bank(0x010000, ramsize - 1, "bank1");
1836      membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x010000);
1836      membank("bank1")->set_base(m_ram->pointer() + 0x010000);
18371837
18381838      space.install_read_handler( ramsize, 0xdfffff, read8_delegate(FUNC(apple2gs_state::apple2gs_bank_echo_r),this));
18391839      m_echo_bank = (ramsize >> 16);
18401840   }
18411841   else
18421842   {
1843      int ramsize = machine().device<ram_device>(RAM_TAG)->size()-0x30000;
1843      int ramsize = m_ram->size()-0x30000;
18441844
18451845      // ROM 00/01 hardware: the quoted "256K" for a base machine *does* include banks e0/e1.
18461846      space.install_readwrite_bank(0x010000, ramsize - 1 + 0x10000, "bank1");
1847      membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x010000);
1847      membank("bank1")->set_base(m_ram->pointer() + 0x010000);
18481848
18491849      space.install_read_handler( ramsize + 0x10000, 0xdfffff, read8_delegate(FUNC(apple2gs_state::apple2gs_bank_echo_r),this));
18501850      m_echo_bank = (ramsize+0x10000) >> 16;
r22508r22509
19711971   machine().device<nvram_device>("nvram")->set_base(m_clock_bram, sizeof(m_clock_bram));
19721972
19731973   /* save state stuff.  note that the driver takes care of docram. */
1974   UINT8* ram = machine().device<ram_device>(RAM_TAG)->pointer();
1975   state_save_register_item_pointer(machine(), "APPLE2GS_RAM", NULL, 0, ram, machine().device<ram_device>(RAM_TAG)->size());
1974   UINT8* ram = m_ram->pointer();
1975   state_save_register_item_pointer(machine(), "APPLE2GS_RAM", NULL, 0, ram, m_ram->size());
19761976
19771977   state_save_register_item(machine(), "NEWVIDEO", NULL, 0, m_newvideo);
19781978   state_save_register_item(machine(), "BORDERCOLOR", NULL, 0, m_bordercolor);
trunk/src/mess/machine/cgenie.c
r22508r22509
146146      memset(gfx + i * 8, i, 8);
147147
148148   /* set up RAM */
149   space.install_read_bank(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 1, "bank1");
150   space.install_write_handler(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 1, write8_delegate(FUNC(cgenie_state::cgenie_videoram_w),this));
151   m_videoram = machine().device<ram_device>(RAM_TAG)->pointer();
152   membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
149   space.install_read_bank(0x4000, 0x4000 + m_ram->size() - 1, "bank1");
150   space.install_write_handler(0x4000, 0x4000 + m_ram->size() - 1, write8_delegate(FUNC(cgenie_state::cgenie_videoram_w),this));
151   m_videoram = m_ram->pointer();
152   membank("bank1")->set_base(m_ram->pointer());
153153   machine().scheduler().timer_pulse(attotime::from_hz(11025), timer_expired_delegate(FUNC(cgenie_state::handle_cassette_input),this));
154154}
155155
trunk/src/mess/machine/llc.c
r22508r22509
147147/* Driver initialization */
148148DRIVER_INIT_MEMBER(llc_state,llc2)
149149{
150   m_p_videoram.set_target( machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000,m_p_videoram.bytes());
150   m_p_videoram.set_target( m_ram->pointer() + 0xc000,m_p_videoram.bytes());
151151}
152152
153153MACHINE_RESET_MEMBER(llc_state,llc2)
r22508r22509
164164   membank("bank3")->set_base(memregion("maincpu")->base() + 0x6000);
165165
166166   space.install_write_bank(0xc000, 0xffff, "bank4");
167   membank("bank4")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000);
167   membank("bank4")->set_base(m_ram->pointer() + 0xc000);
168168
169169}
170170
171171WRITE8_MEMBER(llc_state::llc2_rom_disable_w)
172172{
173173   address_space &mem_space = m_maincpu->space(AS_PROGRAM);
174   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
174   UINT8 *ram = m_ram->pointer();
175175
176176   mem_space.install_write_bank(0x0000, 0xbfff, "bank1");
177177   membank("bank1")->set_base(ram);
r22508r22509
198198   else
199199   {
200200      mem_space.install_write_bank(0x4000, 0x5fff, "bank2");
201      membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x4000);
201      membank("bank2")->set_base(m_ram->pointer() + 0x4000);
202202   }
203203
204204}
trunk/src/mess/machine/apple1.c
r22508r22509
135135{
136136   address_space& space = m_maincpu->space(AS_PROGRAM);
137137   /* Set up the handlers for MESS's dynamically-sized RAM. */
138   space.install_readwrite_bank(0x0000, machine().device<ram_device>(RAM_TAG)->size() - 1, "bank1");
139   membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
138   space.install_readwrite_bank(0x0000, m_ram->size() - 1, "bank1");
139   membank("bank1")->set_base(m_ram->pointer());
140140
141141   /* Poll the keyboard input ports periodically.  These include both
142142      ordinary keys and the RESET and CLEAR SCREEN pushbutton
r22508r22509
233233
234234   end_addr = start_addr + datasize - 1;
235235
236   if ((start_addr < 0xE000 && end_addr > machine().device<ram_device>(RAM_TAG)->size() - 1)
236   if ((start_addr < 0xE000 && end_addr > m_ram->size() - 1)
237237      || end_addr > 0xEFFF)
238238   {
239239      logerror("apple1 - Snapshot won't fit in this memory configuration;\n"
trunk/src/mess/machine/apple3.c
r22508r22509
262262{
263263   if (bank != (UINT16) ~0)
264264   {
265      bank %= machine().device<ram_device>(RAM_TAG)->size() / 0x8000;
266      if ((bank + 1) == (machine().device<ram_device>(RAM_TAG)->size() / 0x8000))
265      bank %= m_ram->size() / 0x8000;
266      if ((bank + 1) == (m_ram->size() / 0x8000))
267267         bank = 0x02;
268268   }
269269   offset += ((offs_t) bank) * 0x8000;
270   offset %= machine().device<ram_device>(RAM_TAG)->size();
271   return &machine().device<ram_device>(RAM_TAG)->pointer()[offset];
270   offset %= m_ram->size();
271   return &m_ram->pointer()[offset];
272272}
273273
274274
r22508r22509
283283   if (LOG_MEMORY)
284284   {
285285      #ifdef PTR64
286      //logerror("\tbank %s --> %02x/%04x [0x%08lx]\n", mame_bank, (unsigned) bank, (unsigned)offset, ptr - machine().device<ram_device>(RAM_TAG)->pointer());
286      //logerror("\tbank %s --> %02x/%04x [0x%08lx]\n", mame_bank, (unsigned) bank, (unsigned)offset, ptr - m_ram->pointer());
287287      #else
288      logerror("\tbank %s --> %02x/%04x [0x%08lx]\n", mame_bank, (unsigned) bank, (unsigned)offset, ptr - machine().device<ram_device>(RAM_TAG)->pointer());
288      logerror("\tbank %s --> %02x/%04x [0x%08lx]\n", mame_bank, (unsigned) bank, (unsigned)offset, ptr - m_ram->pointer());
289289      #endif
290290   }
291291   #endif
r22508r22509
568568         else if (offset > 0x9FFF)
569569            result = apple3_bankaddr(~0, offset - 0x8000);
570570         else
571            result = &machine().device<ram_device>(RAM_TAG)->pointer()[offset - 0x2000];
571            result = &m_ram->pointer()[offset - 0x2000];
572572      }
573573      else if ((n >= 0x80) && (n <= 0x8E))
574574      {
trunk/src/mess/machine/pc1350.c
r22508r22509
9696   machine().scheduler().timer_set(attotime::from_seconds(1), timer_expired_delegate(FUNC(pc1350_state::pc1350_power_up),this));
9797
9898   space.install_readwrite_bank(0x6000, 0x6fff, "bank1");
99   membank("bank1")->set_base(&machine().device<ram_device>(RAM_TAG)->pointer()[0x0000]);
99   membank("bank1")->set_base(&m_ram->pointer()[0x0000]);
100100
101   if (machine().device<ram_device>(RAM_TAG)->size() >= 0x3000)
101   if (m_ram->size() >= 0x3000)
102102   {
103103      space.install_readwrite_bank(0x4000, 0x5fff, "bank2");
104      membank("bank2")->set_base(&machine().device<ram_device>(RAM_TAG)->pointer()[0x1000]);
104      membank("bank2")->set_base(&m_ram->pointer()[0x1000]);
105105   }
106106   else
107107   {
108108      space.nop_readwrite(0x4000, 0x5fff);
109109   }
110110
111   if (machine().device<ram_device>(RAM_TAG)->size() >= 0x5000)
111   if (m_ram->size() >= 0x5000)
112112   {
113113      space.install_readwrite_bank(0x2000, 0x3fff, "bank3");
114      membank("bank3")->set_base(&machine().device<ram_device>(RAM_TAG)->pointer()[0x3000]);
114      membank("bank3")->set_base(&m_ram->pointer()[0x3000]);
115115   }
116116   else
117117   {
trunk/src/mess/machine/bebox.c
r22508r22509
10131013   membank("bank2")->set_base(memregion("user2")->base());
10141014
10151015   /* install MESS managed RAM */
1016   space_0.install_readwrite_bank(0, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, 0x02000000, "bank3");
1017   space_1.install_readwrite_bank(0, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, 0x02000000, "bank3");
1018   membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
1016   space_0.install_readwrite_bank(0, m_ram->size() - 1, 0, 0x02000000, "bank3");
1017   space_1.install_readwrite_bank(0, m_ram->size() - 1, 0, 0x02000000, "bank3");
1018   membank("bank3")->set_base(m_ram->pointer());
10191019   
10201020   /* The following is a verrrry ugly hack put in to support NetBSD for
10211021    * NetBSD.  When NetBSD/bebox it does most of its work on CPU #0 and then
trunk/src/mess/machine/genpc.c
r22508r22509
564564      m_ppi8255(*this, "ppi8255"),
565565      m_speaker(*this, "speaker"),
566566      m_isabus(*this, "isa"),
567      m_pc_kbdc(*this, "pc_kbdc")
567      m_pc_kbdc(*this, "pc_kbdc"),
568      m_ram(*this, RAM_TAG)
568569{
569570}
570571
r22508r22509
648649   install_device(this,    0x0080, 0x0087, 0, 0, FUNC(pc_page_r), FUNC(pc_page_w) );
649650   install_device_write(this,    0x00a0, 0x00a1, 0, 0, FUNC(nmi_enable_w));
650651   /* MESS managed RAM */
651   if ( machine().device<ram_device>(RAM_TAG)->pointer() )
652      membank( "bank10" )->set_base( machine().device<ram_device>(RAM_TAG)->pointer() );
652   if ( m_ram->pointer() )
653      membank( "bank10" )->set_base( m_ram->pointer() );
653654}
654655
655656IRQ_CALLBACK_MEMBER(ibm5160_mb_device::pc_irq_callback)
r22508r22509
761762       * 6-7  The number of floppy disk drives
762763       */
763764      data = ioport("DSW0")->read() & 0xF3;
764      switch ( machine().device<ram_device>(RAM_TAG)->size() )
765      switch ( m_ram->size() )
765766      {
766767      case 16 * 1024:
767768         data |= 0x00;
r22508r22509
799800      /* read hi nibble of SW2 */
800801      data = data & 0xf0;
801802
802      switch ( machine().device<ram_device>(RAM_TAG)->size() - 64 * 1024 )
803      switch ( m_ram->size() - 64 * 1024 )
803804      {
804805      case 64 * 1024:     data |= 0x00; break;
805806      case 128 * 1024:    data |= 0x02; break;
r22508r22509
817818      case 896 * 1024:    data |= 0x0B; break;
818819      case 960 * 1024:    data |= 0x0D; break;
819820      }
820      if ( machine().device<ram_device>(RAM_TAG)->size() > 960 * 1024 )
821      if ( m_ram->size() > 960 * 1024 )
821822         data |= 0x0D;
822823
823824      PIO_LOG(1,"PIO_C_r (hi)",("$%02x\n", data));
trunk/src/mess/machine/gb.c
r22508r22509
110110   MBC_UNKNOWN,    /* Unknown mapper                                */
111111};
112112
113/* machine.device<ram_device>(RAM_TAG)->pointer() layout defines */
113/* RAM layout defines */
114114#define CGB_START_VRAM_BANKS    0x0000
115115#define CGB_START_RAM_BANKS ( 2 * 8 * 1024 )
116116
r22508r22509
255255   /* Allocate memory for internal ram */
256256   for (ii = 0; ii < 8; ii++)
257257   {
258      m_GBC_RAMMap[ii] = machine().device<ram_device>(RAM_TAG)->pointer() + CGB_START_RAM_BANKS + ii * 0x1000;
258      m_GBC_RAMMap[ii] = m_ram->pointer() + CGB_START_RAM_BANKS + ii * 0x1000;
259259      memset(m_GBC_RAMMap[ii], 0, 0x1000);
260260   }
261261}
trunk/src/mess/machine/rmnimbus.c
r22508r22509
19511951void rmnimbus_state::nimbus_bank_memory()
19521952{
19531953   address_space &space = machine().device( MAINCPU_TAG)->memory().space( AS_PROGRAM );
1954   int     ramsize = machine().device<ram_device>(RAM_TAG)->size();
1954   int     ramsize = m_ram->size();
19551955   int     ramblock = 0;
19561956   int     blockno;
19571957   char    bank[10];
1958   UINT8   *ram    = &machine().device<ram_device>(RAM_TAG)->pointer()[0];
1958   UINT8   *ram    = &m_ram->pointer()[0];
19591959   UINT8   *map_blocks[3];
19601960   UINT8   *map_base;
19611961   int     map_blockno;
trunk/src/mess/machine/c65.c
r22508r22509
601601READ8_MEMBER( c65_state::c65_ram_expansion_r )
602602{
603603   UINT8 data = 0xff;
604   if (machine().device<ram_device>(RAM_TAG)->size() > (128 * 1024))
604   if (m_ram->size() > (128 * 1024))
605605      data = m_expansion_ram.reg;
606606   return data;
607607}
r22508r22509
611611   offs_t expansion_ram_begin;
612612   offs_t expansion_ram_end;
613613
614   if (space.machine().device<ram_device>(RAM_TAG)->size() > (128 * 1024))
614   if (m_ram->size() > (128 * 1024))
615615   {
616616      m_expansion_ram.reg = data;
617617
618618      expansion_ram_begin = 0x80000;
619      expansion_ram_end = 0x80000 + (machine().device<ram_device>(RAM_TAG)->size() - 128*1024) - 1;
619      expansion_ram_end = 0x80000 + (m_ram->size() - 128*1024) - 1;
620620
621621      if (data == 0x00) {
622622         space.install_readwrite_bank(expansion_ram_begin, expansion_ram_end,"bank16");
623         membank("bank16")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 128*1024);
623         membank("bank16")->set_base(m_ram->pointer() + 128*1024);
624624      } else {
625625         space.nop_readwrite(expansion_ram_begin, expansion_ram_end);
626626      }
r22508r22509
985985MACHINE_START_MEMBER(c65_state,c65)
986986{
987987   /* clear upper memory */
988   memset(machine().device<ram_device>(RAM_TAG)->pointer() + 128*1024, 0xff, machine().device<ram_device>(RAM_TAG)->size() -  128*1024);
988   memset(m_ram->pointer() + 128*1024, 0xff, m_ram->size() -  128*1024);
989989
990990//removed   cbm_drive_0_config (SERIAL, 10);
991991//removed   cbm_drive_1_config (SERIAL, 11);
trunk/src/mess/machine/galaxy.c
r22508r22509
8585         m_maincpu->set_state_int(Z80_I,    data[0x40]);
8686         m_maincpu->set_state_int(Z80_R,    (data[0x44] & 0x7f) | (data[0x48] & 0x80));
8787
88         memcpy (machine().device<ram_device>(RAM_TAG)->pointer(), data + 0x084c, (machine().device<ram_device>(RAM_TAG)->size() < 0x1800) ? machine().device<ram_device>(RAM_TAG)->size() : 0x1800);
88         memcpy (m_ram->pointer(), data + 0x084c, (m_ram->size() < 0x1800) ? m_ram->size() : 0x1800);
8989
9090         break;
9191      case GALAXY_SNAPSHOT_V2_SIZE:
r22508r22509
112112         m_maincpu->set_state_int(Z80_I,    data[0x19]);
113113         m_maincpu->set_state_int(Z80_R,    data[0x1a]);
114114
115         memcpy (machine().device<ram_device>(RAM_TAG)->pointer(), data + 0x0834, (machine().device<ram_device>(RAM_TAG)->size() < 0x1800) ? machine().device<ram_device>(RAM_TAG)->size() : 0x1800);
115         memcpy (m_ram->pointer(), data + 0x0834, (m_ram->size() < 0x1800) ? m_ram->size() : 0x1800);
116116
117117         break;
118118   }
r22508r22509
155155   space.install_readwrite_bank( 0x2800, 0x2800 + m_ram->size() - 1, "bank1");
156156   membank("bank1")->set_base(m_ram->pointer());
157157
158   if (machine().device<ram_device>(RAM_TAG)->size() < (6 + 48) * 1024)
158   if (m_ram->size() < (6 + 48) * 1024)
159159   {
160      space.nop_readwrite( 0x2800 + machine().device<ram_device>(RAM_TAG)->size(), 0xffff);
160      space.nop_readwrite( 0x2800 + m_ram->size(), 0xffff);
161161   }
162162
163163   for ( int i = 0; i < 8; i++ )
trunk/src/mess/machine/kay_kbd.c
r22508r22509
287287   /* disable CapsLock LED initially */
288288   set_led_status(machine(), 1, 1);
289289   set_led_status(machine(), 1, 0);
290   kbd->beeper = machine().device<beep_device>(BEEPER_TAG);
290   kbd->beeper = machine().device<beep_device>("beeper");
291291   kbd->beep_on = 1;
292292   kbd->control_status = 0x14;
293293   kbd->beeper->set_state(0);
trunk/src/mess/machine/apple2.c
r22508r22509
11281128      //CMemory::mState |= CMemory::kVBLBar; // N: VBL' is true // FIX: MESS?
11291129   }
11301130
1131   return m_ram->pointer()[address % machine().device<ram_device>(RAM_TAG)->size()]; // FIX: this seems to work, but is it right!?
1131   return m_ram->pointer()[address % m_ram->size()]; // FIX: this seems to work, but is it right!?
11321132}
11331133
11341134
r22508r22509
21072107   if (memregion("maincpu")->bytes() < 0x8000)
21082108      m_a2_mask &= ~VAR_ROMSWITCH;
21092109
2110   if (machine().device<ram_device>(RAM_TAG)->size() <= 64*1024)
2110   if (m_ram->size() <= 64*1024)
21112111      m_a2_mask &= ~(VAR_RAMRD | VAR_RAMWRT | VAR_80STORE | VAR_ALTZP | VAR_80COL);
21122112
21132113   apple2_refresh_delegates();
trunk/src/mess/machine/at.c
r22508r22509
325325   if (machine().device("cs4031") == NULL)
326326   {
327327      /* MESS managed RAM */
328      membank("bank10")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
328      membank("bank10")->set_base(m_ram->pointer());
329329
330      if (machine().device<ram_device>(RAM_TAG)->size() > 0x0a0000)
330      if (m_ram->size() > 0x0a0000)
331331      {
332         offs_t ram_limit = 0x100000 + machine().device<ram_device>(RAM_TAG)->size() - 0x0a0000;
332         offs_t ram_limit = 0x100000 + m_ram->size() - 0x0a0000;
333333         space.install_read_bank(0x100000,  ram_limit - 1, "bank1");
334334         space.install_write_bank(0x100000,  ram_limit - 1, "bank1");
335         membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xa0000);
335         membank("bank1")->set_base(m_ram->pointer() + 0xa0000);
336336      }
337337   }
338338
trunk/src/mess/machine/mtx.c
r22508r22509
7474
7575   */
7676   address_space &program = m_maincpu->space(AS_PROGRAM);
77   ram_device *messram = machine().device<ram_device>(RAM_TAG);
77   ram_device *messram = m_ram;
7878
7979//  UINT8 cbm_mode = data >> 7 & 0x01;
8080   UINT8 rom_page = data >> 4 & 0x07;
r22508r22509
366366
367367MACHINE_START_MEMBER(mtx_state,mtx512)
368368{
369   ram_device *messram = machine().device<ram_device>(RAM_TAG);
369   ram_device *messram = m_ram;
370370
371371   /* find devices */
372372   m_z80ctc = machine().device<z80ctc_device>(Z80CTC_TAG);
trunk/src/mess/machine/dai.c
r22508r22509
116116   machine().scheduler().timer_set(attotime::zero, timer_expired_delegate(FUNC(dai_state::dai_bootstrap_callback),this));
117117   machine().scheduler().timer_pulse(attotime::from_hz(100), timer_expired_delegate(FUNC(dai_state::dai_timer),this)); /* timer for tms5501 */
118118
119   memset(machine().device<ram_device>(RAM_TAG)->pointer(), 0, machine().device<ram_device>(RAM_TAG)->size());
119   memset(m_ram->pointer(), 0, m_ram->size());
120120}
121121
122122void dai_state::machine_reset()
123123{
124   membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
124   membank("bank1")->set_base(m_ram->pointer());
125125}
126126
127127/***************************************************************************
trunk/src/mess/machine/vector06.c
r22508r22509
148148
149149   if (BIT(val, 1))
150150   {
151      membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x0000);
151      membank("bank1")->set_base(m_ram->pointer() + 0x0000);
152152      m_maincpu->reset();
153153   }
154154}
r22508r22509
177177   space.install_write_bank(0x8000, 0xffff, "bank4");
178178
179179   membank("bank1")->set_base(memregion("maincpu")->base() + 0x10000);
180   membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x0000);
181   membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x8000);
182   membank("bank4")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x8000);
180   membank("bank2")->set_base(m_ram->pointer() + 0x0000);
181   membank("bank3")->set_base(m_ram->pointer() + 0x8000);
182   membank("bank4")->set_base(m_ram->pointer() + 0x8000);
183183
184184   m_keyboard_mask = 0;
185185   m_color_index = 0;
trunk/src/mess/machine/lviv.c
r22508r22509
2626
2727void lviv_state::lviv_update_memory ()
2828{
29   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
29   UINT8 *ram = m_ram->pointer();
3030
3131   if (m_ppi_port_outputs[0][2] & 0x02)
3232   {
r22508r22509
164164   address_space &cpuspace = m_maincpu->space(AS_PROGRAM);
165165   if (m_startup_mem_map)
166166   {
167      UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
167      UINT8 *ram = m_ram->pointer();
168168
169169      m_startup_mem_map = 0;
170170
r22508r22509
226226
227227   space.set_direct_update_handler(direct_update_delegate(FUNC(lviv_state::lviv_directoverride), this));
228228
229   m_video_ram = machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000;
229   m_video_ram = m_ram->pointer() + 0xc000;
230230
231231   m_startup_mem_map = 1;
232232
r22508r22509
243243
244244   /*machine().scheduler().timer_pulse(TIME_IN_NSEC(200), FUNC(lviv_draw_pixel));*/
245245
246   /*memset(machine().device<ram_device>(RAM_TAG)->pointer(), 0, sizeof(unsigned char)*0xffff);*/
246   /*memset(m_ram->pointer(), 0, sizeof(unsigned char)*0xffff);*/
247247}
248248
249249
r22508r22509
287287   m_maincpu->set_state_int(I8085_PC, (hi << 8) | lo);
288288
289289   /* Memory dump */
290   memcpy (machine().device<ram_device>(RAM_TAG)->pointer(), data+0x0011, 0xc000);
291   memcpy (machine().device<ram_device>(RAM_TAG)->pointer()+0xc000, data+0x10011, 0x4000);
290   memcpy (m_ram->pointer(), data+0x0011, 0xc000);
291   memcpy (m_ram->pointer()+0xc000, data+0x10011, 0x4000);
292292
293293   /* Ports */
294294   m_ppi_port_outputs[0][0] = data[0x14011+0xc0];
trunk/src/mess/machine/aim65.c
r22508r22509
140140
141141void aim65_state::machine_start()
142142{
143   ram_device *ram = machine().device<ram_device>(RAM_TAG);
143   ram_device *ram = m_ram;
144144   address_space &space = m_maincpu->space(AS_PROGRAM);
145145
146146   /* Init RAM */
trunk/src/mess/machine/pc.c
r22508r22509
10761076
10771077   data&=~0x80;
10781078   data &= ~0x04;      /* floppy drive installed */
1079   if ( machine().device<ram_device>(RAM_TAG)->size() > 64 * 1024 )    /* more than 64KB ram installed */
1079   if ( m_ram->size() > 64 * 1024 )    /* more than 64KB ram installed */
10801080      data &= ~0x08;
10811081   data = ( data & ~0x01 ) | ( pcjr_keyb.latch ? 0x01: 0x00 );
10821082   if ( ! ( m_ppi_portb & 0x08 ) )
r22508r22509
14141414      init_pc_common(set_keyb_int_func);
14151415
14161416   /* MESS managed RAM */
1417   if ( machine().device<ram_device>(RAM_TAG)->pointer() )
1418      membank( "bank10" )->set_base( machine().device<ram_device>(RAM_TAG)->pointer() );
1417   if ( m_ram->pointer() )
1418      membank( "bank10" )->set_base( m_ram->pointer() );
14191419}
14201420
14211421
trunk/src/mess/machine/pp01.c
r22508r22509
2121void pp01_state::pp01_video_w(UINT8 block,UINT16 offset,UINT8 data,UINT8 part)
2222{
2323   UINT16 addroffset = part ? 0x1000  : 0x0000;
24   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
24   UINT8 *ram = m_ram->pointer();
2525
2626   if (BIT(m_video_write_mode,3)) {
2727      // Copy mode
r22508r22509
117117               break;
118118      }
119119
120      membank(bank)->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + (data & 0x0F)* 0x1000);
120      membank(bank)->set_base(m_ram->pointer() + (data & 0x0F)* 0x1000);
121121   } else if (data>=0xF8) {
122122      space.install_read_bank (startaddr, endaddr, bank);
123123      space.unmap_write(startaddr, endaddr);
trunk/src/mess/machine/nascom1.c
r22508r22509
257257
258258DRIVER_INIT_MEMBER(nascom1_state,nascom1)
259259{
260   switch (machine().device<ram_device>(RAM_TAG)->size())
260   switch (m_ram->size())
261261   {
262262   case 1 * 1024:
263263      m_maincpu->space(AS_PROGRAM).nop_readwrite(
r22508r22509
269269         0x1400, 0x4fff, "bank1");
270270      m_maincpu->space(AS_PROGRAM).nop_readwrite(
271271         0x5000, 0xafff);
272      membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
272      membank("bank1")->set_base(m_ram->pointer());
273273      break;
274274
275275   case 32 * 1024:
r22508r22509
277277         0x1400, 0x8fff, "bank1");
278278      m_maincpu->space(AS_PROGRAM).nop_readwrite(
279279         0x9000, 0xafff);
280      membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
280      membank("bank1")->set_base(m_ram->pointer());
281281      break;
282282
283283   case 40 * 1024:
284284      m_maincpu->space(AS_PROGRAM).install_readwrite_bank(
285285         0x1400, 0xafff, "bank1");
286      membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
286      membank("bank1")->set_base(m_ram->pointer());
287287      break;
288288   }
289289}
trunk/src/mess/includes/portfoli.h
r22508r22509
4646         m_y6(*this, "Y6"),
4747         m_y7(*this, "Y7"),
4848         m_battery(*this, "BATTERY"),
49         m_contrast(*this, "contrast")
49         m_contrast(*this, "contrast"),
50         m_ram(*this, RAM_TAG)
5051   { }
5152
5253   required_device<cpu_device> m_maincpu;
r22508r22509
113114   DECLARE_READ8_MEMBER(hd61830_rd_r);
114115   IRQ_CALLBACK_MEMBER(portfolio_int_ack);
115116   DECLARE_DEVICE_IMAGE_LOAD_MEMBER( portfolio_cart );
117   required_device<ram_device> m_ram;
116118};
117119
118120#endif
trunk/src/mess/includes/electron.h
r22508r22509
1212#define ELECTRON_H_
1313
1414#include "imagedev/cassette.h"
15#include "sound/beep.h"
1516
1617/* Interrupts */
1718#define INT_HIGH_TONE       0x40
r22508r22509
5859   electron_state(const machine_config &mconfig, device_type type, const char *tag)
5960      : driver_device(mconfig, type, tag),
6061      m_maincpu(*this, "maincpu"),
61      m_cassette(*this, "cassette")   { }
62      m_cassette(*this, "cassette"),
63      m_beeper(*this, "beeper")   { }
6264
6365   ULA m_ula;
6466   emu_timer *m_tape_timer;
r22508r22509
8486   TIMER_CALLBACK_MEMBER(electron_scanline_interrupt);
8587   required_device<cpu_device> m_maincpu;
8688   required_device<cassette_image_device> m_cassette;
89   required_device<beep_device> m_beeper;
8790   inline UINT8 read_vram( UINT16 addr );
8891   inline void electron_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
8992   void electron_interrupt_handler(int mode, int interrupt);
trunk/src/mess/includes/b2m.h
r22508r22509
1313#include "machine/wd_fdc.h"
1414#include "sound/speaker.h"
1515#include "sound/wave.h"
16#include "machine/ram.h"
1617
1718class b2m_state : public driver_device
1819{
r22508r22509
2021   b2m_state(const machine_config &mconfig, device_type type, const char *tag)
2122      : driver_device(mconfig, type, tag),
2223      m_maincpu(*this, "maincpu"),
23      m_speaker(*this, "speaker") { }
24      m_speaker(*this, "speaker"),
25      m_ram(*this, RAM_TAG) { }
2426
2527   UINT8 m_b2m_8255_porta;
2628   UINT8 m_b2m_video_scroll;
r22508r22509
4244   fd1793_t *m_fdc;
4345   device_t *m_pic;
4446   required_device<speaker_sound_device> m_speaker;
47   required_device<ram_device> m_ram;
4548   DECLARE_READ8_MEMBER(b2m_keyboard_r);
4649   DECLARE_WRITE8_MEMBER(b2m_palette_w);
4750   DECLARE_READ8_MEMBER(b2m_palette_r);
trunk/src/mess/includes/nc.h
r22508r22509
66
77#ifndef NC_H_
88#define NC_H_
9#include "machine/ram.h"
10#include "sound/beep.h"
911
10
1112#define NC_NUM_COLOURS 4
1213
1314#define NC_SCREEN_WIDTH        480
r22508r22509
3031public:
3132   nc_state(const machine_config &mconfig, device_type type, const char *tag)
3233      : driver_device(mconfig, type, tag),
33      m_maincpu(*this, "maincpu") { }
34      m_maincpu(*this, "maincpu"),
35      m_ram(*this, RAM_TAG),
36      m_beeper1(*this, "beep.1"),
37      m_beeper2(*this, "beep.2") { }
3438
3539   emu_timer *m_serial_timer;
3640   char m_memory_config[4];
r22508r22509
103107   void nc100_machine_stop();
104108   void nc200_machine_stop();
105109   required_device<cpu_device> m_maincpu;
110   required_device<ram_device> m_ram;
111   required_device<beep_device> m_beeper1;
112   required_device<beep_device> m_beeper2;
113   
106114   void nc200_video_set_backlight(int state);
107115   void nc_card_save(device_image_interface &image);
108116   int nc_card_calculate_mask(int size);
trunk/src/mess/includes/pc1350.h
r22508r22509
1010#define PC1350_H_
1111
1212#include "machine/nvram.h"
13#include "machine/ram.h"
1314
1415#define PC1350_CONTRAST (ioport("DSW0")->read() & 0x07)
1516
r22508r22509
1920public:
2021   pc1350_state(const machine_config &mconfig, device_type type, const char *tag)
2122      : driver_device(mconfig, type, tag),
22      m_maincpu(*this, "maincpu") { }
23      m_maincpu(*this, "maincpu"),
24      m_ram(*this, RAM_TAG) { }
2325
2426   UINT8 m_outa;
2527   UINT8 m_outb;
r22508r22509
4143
4244   virtual void machine_start();
4345   required_device<cpu_device> m_maincpu;
46   required_device<ram_device> m_ram;
4447};
4548
4649#endif /* PC1350_H_ */
trunk/src/mess/includes/fidelz80.h
r22508r22509
1919      : driver_device(mconfig, type, tag),
2020         m_maincpu(*this, "maincpu"),
2121         m_speech(*this, "speech"),
22         m_beep(*this, BEEPER_TAG),
22         m_beep(*this, "beeper"),
2323         m_i8041(*this, "mcu"),
2424         m_i8243(*this, "i8243")
2525      { }
trunk/src/mess/includes/pc4.h
r22508r22509
1818   pc4_state(const machine_config &mconfig, device_type type, const char *tag)
1919      : driver_device(mconfig, type, tag),
2020      m_maincpu(*this, "maincpu"),
21      m_beep(*this, BEEPER_TAG),
21      m_beep(*this, "beeper"),
2222      m_region_charset(*this, "charset"),
2323      m_rombank(*this, "rombank") { }
2424
trunk/src/mess/includes/psion.h
r22508r22509
2424      : driver_device(mconfig, type, tag),
2525         m_maincpu(*this, "maincpu"),
2626         m_lcdc(*this, "hd44780"),
27         m_beep(*this, BEEPER_TAG),
27         m_beep(*this, "beeper"),
2828         m_pack1(*this, "pack1"),
2929         m_pack2(*this, "pack2"),
3030         m_sys_register(*this, "sys_register"),
trunk/src/mess/includes/osborne1.h
r22508r22509
2828      m_pia0(*this, "pia_0"),
2929      m_pia1(*this, "pia_1"),
3030      m_fdc(*this, "mb8877"),
31      m_beep(*this, BEEPER_TAG),
31      m_beep(*this, "beeper"),
3232      m_ram(*this, RAM_TAG),
3333      m_ieee(*this, IEEE488_TAG),
3434      m_row0(*this, "ROW0"),
trunk/src/mess/includes/gb.h
r22508r22509
88#define GB_H_
99
1010#include "machine/gb_slot.h"
11#include "machine/ram.h"
1112
12
1313/* Interrupts */
1414#define VBL_INT               0       /* V-Blank    */
1515#define LCD_INT               1       /* LCD Status */
r22508r22509
116116      m_custom(*this, "custom"),
117117      m_region_maincpu(*this, "maincpu"),
118118      m_rambank(*this, "cgb_ram"),
119      m_inputs(*this, "INPUTS") { }
119      m_inputs(*this, "INPUTS"),
120      m_ram(*this, RAM_TAG) { }
120121
121122   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
122123
r22508r22509
213214   required_memory_region m_region_maincpu;
214215   optional_memory_bank m_rambank;   // cgb
215216   required_ioport m_inputs;
217   optional_device<ram_device> m_ram;   
216218
217219   void gb_timer_increment();
218220   void gb_timer_check_irq();
trunk/src/mess/includes/pcw.h
r22508r22509
88#define PCW_H_
99
1010#include "machine/upd765.h"
11#include "machine/ram.h"
12#include "sound/beep.h"
1113
1214#define PCW_BORDER_HEIGHT 8
1315#define PCW_BORDER_WIDTH 8
r22508r22509
2830      : driver_device(mconfig, type, tag),
2931        m_maincpu(*this, "maincpu"),
3032        m_screen(*this, "screen"),
31        m_fdc(*this, "upd765")
33        m_fdc(*this, "upd765"),
34        m_ram(*this, RAM_TAG),
35        m_beeper(*this, "beeper")   
3236   { }
3337
3438   int m_boot;
r22508r22509
116120   required_device<cpu_device> m_maincpu;
117121   required_device<screen_device> m_screen;
118122   required_device<upd765a_device> m_fdc;
123   required_device<ram_device> m_ram;
124   required_device<beep_device> m_beeper;
125   
119126   inline void pcw_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
120127   void pcw_update_interrupt_counter();
121128   void pcw_update_irqs();
trunk/src/mess/includes/studio2.h
r22508r22509
2323   studio2_state(const machine_config &mconfig, device_type type, const char *tag)
2424      : driver_device(mconfig, type, tag),
2525         m_maincpu(*this, CDP1802_TAG),
26         m_speaker(*this, BEEPER_TAG),
26         m_beeper(*this, "beeper"),
2727         m_vdc(*this, CDP1861_TAG),
2828         m_clear(*this, "CLEAR"),
2929         m_a(*this, "A"),
r22508r22509
3131   { }
3232
3333   required_device<cosmac_device> m_maincpu;
34   required_device<beep_device> m_speaker;
34   required_device<beep_device> m_beeper;
3535   optional_device<cdp1861_device> m_vdc;
3636   required_ioport m_clear;
3737   required_ioport m_a;
trunk/src/mess/includes/osi.h
r22508r22509
4545   m_io_row6(*this, "ROW6"),
4646   m_io_row7(*this, "ROW7"),
4747   m_io_sound(*this, "Sound"),
48   m_io_reset(*this, "Reset")
48   m_io_reset(*this, "Reset"),
49   m_beeper(*this, "beeper")
4950   { }
5051
5152   virtual void machine_start();
r22508r22509
8687   required_ioport m_io_row7;
8788   required_ioport m_io_sound;
8889   required_ioport m_io_reset;
90   optional_device<beep_device> m_beeper;
8991};
9092
9193class c1p_state : public sb2m600_state
r22508r22509
9395public:
9496   c1p_state(const machine_config &mconfig, device_type type, const char *tag)
9597      : sb2m600_state(mconfig, type, tag),
96         m_beep(*this, BEEPER_TAG)
98         m_beep(*this, "beeper")
9799   { }
98100
99101   required_device<beep_device> m_beep;
trunk/src/mess/includes/rmnimbus.h
r22508r22509
1010#include "machine/wd17xx.h"
1111#include "machine/scsicb.h"
1212#include "machine/6522via.h"
13#include "machine/ram.h"
1314
1415#define MAINCPU_TAG "maincpu"
1516#define IOCPU_TAG   "iocpu"
r22508r22509
393394   rmnimbus_state(const machine_config &mconfig, device_type type, const char *tag)
394395      : driver_device(mconfig, type, tag),
395396         m_scsibus(*this, SCSIBUS_TAG ":host"),
396      m_maincpu(*this, "maincpu") {
397      m_maincpu(*this, "maincpu"),
398      m_ram(*this, RAM_TAG) {
397399   }
398400
399401   required_device<scsicb_device> m_scsibus;
r22508r22509
469471   void nimbus_scsi_linechange( UINT8 mask, UINT8 state );
470472   IRQ_CALLBACK_MEMBER(int_callback);
471473   required_device<cpu_device> m_maincpu;
474   required_device<ram_device> m_ram;
472475   UINT8 get_pixel(UINT16 x, UINT16 y);
473476   UINT16 read_pixel_line(UINT16 x, UINT16 y, UINT8 width);
474477   UINT16 read_pixel_data(UINT16 x, UINT16 y);
trunk/src/mess/includes/partner.h
r22508r22509
1010#include "machine/i8255.h"
1111#include "machine/8257dma.h"
1212#include "machine/wd17xx.h"
13#include "machine/ram.h"
1314
1415class partner_state : public radio86_state
1516{
1617public:
1718   partner_state(const machine_config &mconfig, device_type type, const char *tag)
18      : radio86_state(mconfig, type, tag) { }
19      : radio86_state(mconfig, type, tag),
20      m_ram(*this, RAM_TAG) { }
1921
2022   UINT8 m_mem_page;
2123   UINT8 m_win_mem_page;
r22508r22509
3234   void partner_window_2(UINT8 bank_num, UINT16 offset,UINT8 *rom);
3335   void partner_iomap_bank(UINT8 *rom);
3436   void partner_bank_switch();
37   required_device<ram_device> m_ram;   
3538};
3639
3740
trunk/src/mess/includes/samcoupe.h
r22508r22509
1414#include "machine/wd_fdc.h"
1515#include "sound/speaker.h"
1616#include "imagedev/cassette.h"
17#include "machine/ram.h"
1718
1819/* screen dimensions */
1920#define SAM_BLOCK           8
r22508r22509
4243         : driver_device(mconfig, type, tag),
4344         m_maincpu(*this, "maincpu"),
4445         m_speaker(*this, "speaker"),
45         m_cassette(*this, "cassette") {
46         m_cassette(*this, "cassette"),
47         m_ram(*this, RAM_TAG) {
4648            sam_bank_read_ptr[0] = NULL;
4749            sam_bank_write_ptr[0] = NULL;
4850            sam_bank_read_ptr[1] = NULL;
r22508r22509
124126   required_device<cpu_device> m_maincpu;
125127   required_device<speaker_sound_device> m_speaker;
126128   required_device<cassette_image_device> m_cassette;
129   required_device<ram_device> m_ram;
127130   void draw_mode4_line(int y, int hpos);
128131   void draw_mode3_line(int y, int hpos);
129132   void draw_mode12_block(bitmap_ind16 &bitmap, int vpos, int hpos, UINT8 mask);
trunk/src/mess/includes/pp01.h
r22508r22509
99
1010#include "machine/pit8253.h"
1111#include "machine/i8255.h"
12#include "machine/ram.h"
1213
1314class pp01_state : public driver_device
1415{
1516public:
1617   pp01_state(const machine_config &mconfig, device_type type, const char *tag)
1718      : driver_device(mconfig, type, tag),
18      m_maincpu(*this, "maincpu") { }
19      m_maincpu(*this, "maincpu"),
20      m_ram(*this, RAM_TAG) { }
1921
2022   UINT8 m_video_scroll;
2123   UINT8 m_memory_block[16];
r22508r22509
4446   DECLARE_WRITE8_MEMBER(pp01_8255_portc_w);
4547   DECLARE_READ8_MEMBER(pp01_8255_portc_r);
4648   required_device<cpu_device> m_maincpu;
49   required_device<ram_device> m_ram;
4750   void pp01_video_w(UINT8 block,UINT16 offset,UINT8 data,UINT8 part);
4851   void pp01_set_memory(UINT8 block, UINT8 data);
4952};
trunk/src/mess/includes/cgenie.h
r22508r22509
99
1010#include "machine/wd17xx.h"
1111#include "imagedev/cassette.h"
12#include "machine/ram.h"
1213
1314// CRTC 6845
1415struct CRTC6845
r22508r22509
4344      m_colorram(*this, "colorram"),
4445      m_fontram(*this, "fontram"),
4546      m_maincpu(*this, "maincpu"),
46      m_cassette(*this, "cassette") { }
47      m_cassette(*this, "cassette"),
48      m_ram(*this, RAM_TAG) { }
4749
4850   required_shared_ptr<UINT8> m_colorram;
4951   required_shared_ptr<UINT8> m_fontram;
r22508r22509
8284   DECLARE_WRITE8_MEMBER(cgenie_sh_control_port_w);
8385   required_device<cpu_device> m_maincpu;
8486   required_device<cassette_image_device> m_cassette;
87   required_device<ram_device> m_ram;
88   
8589   void cgenie_offset_xy();
8690   int cgenie_get_register(int indx);
8791   void cgenie_mode_select(int mode);
trunk/src/mess/includes/tmc1800.h
r22508r22509
1212#include "machine/rescap.h"
1313#include "sound/cdp1864.h"
1414#include "video/cdp1861.h"
15#include "sound/beep.h"
1516
1617#define TMC2000_COLORRAM_SIZE   0x200
1718
r22508r22509
2930         m_cassette(*this, "cassette"),
3031         m_rom(*this, CDP1802_TAG),
3132         m_run(*this, "RUN"),         
32         m_ram(*this, RAM_TAG)
33         m_ram(*this, RAM_TAG),
34         m_beeper(*this, "beeper")
3335   { }
3436
3537
r22508r22509
3840   required_memory_region m_rom;
3941   required_ioport m_run;
4042   required_device<ram_device> m_ram;
43   optional_device<beep_device> m_beeper;
4144
4245   DECLARE_QUICKLOAD_LOAD_MEMBER( tmc1800 );
4346};
trunk/src/mess/includes/xerox820.h
r22508r22509
114114public:
115115   bigboard_state(const machine_config &mconfig, device_type type, const char *tag)
116116      : xerox820_state(mconfig, type, tag),
117         m_beeper(*this, BEEPER_TAG)
117         m_beeper(*this, "beeper")
118118   { }
119119
120120   required_device<beep_device> m_beeper;
trunk/src/mess/includes/nascom1.h
r22508r22509
1010#include "imagedev/snapquik.h"
1111#include "machine/wd17xx.h"
1212#include "imagedev/cassette.h"
13#include "machine/ram.h"
1314
1415struct nascom1_portstat_t
1516{
r22508r22509
3233      : driver_device(mconfig, type, tag),
3334      m_videoram(*this, "videoram"),
3435      m_maincpu(*this, "maincpu"),
35      m_cassette(*this, "cassette") { }
36      m_cassette(*this, "cassette"),
37      m_ram(*this, RAM_TAG) { }
3638
3739   required_shared_ptr<UINT8> m_videoram;
3840   device_t *m_hd6402;
r22508r22509
6163   DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nascom1_cassette );
6264   required_device<cpu_device> m_maincpu;
6365   required_device<cassette_image_device> m_cassette;
66   required_device<ram_device> m_ram;   
6467   DECLARE_SNAPSHOT_LOAD_MEMBER( nascom1 );
6568};
6669
trunk/src/mess/includes/micronic.h
r22508r22509
2626      : driver_device(mconfig, type, tag),
2727      m_maincpu(*this, Z80_TAG),
2828      m_lcdc(*this, HD61830_TAG),
29      m_beep(*this, BEEPER_TAG),
29      m_beep(*this, "beeper"),
3030      m_rtc(*this, MC146818_TAG),
3131      m_ram(*this, RAM_TAG),
3232      m_ram_base(*this, "ram_base"),
trunk/src/mess/includes/kaypro.h
r22508r22509
2727   m_centronics(*this, "centronics"),
2828   m_fdc(*this, "wd1793"),
2929   m_crtc(*this, "crtc"),
30   m_beep(*this, BEEPER_TAG),
30   m_beep(*this, "beeper"),
3131   m_p_videoram(*this, "p_videoram"){ }
3232
3333   required_device<cpu_device> m_maincpu;
trunk/src/mess/includes/mtx.h
r22508r22509
1212#include "machine/ctronics.h"
1313#include "machine/z80ctc.h"
1414#include "sound/sn76496.h"
15#include "machine/ram.h"
1516
1617#define Z80_TAG         "z80"
1718#define Z80CTC_TAG      "z80ctc"
r22508r22509
3031      : driver_device(mconfig, type, tag),
3132         m_maincpu(*this, Z80_TAG),
3233      m_sn(*this, SN76489A_TAG),
33      m_cassette(*this, "cassette")
34      m_cassette(*this, "cassette"),
35      m_ram(*this, RAM_TAG)
3436   { }
3537
3638   required_device<cpu_device> m_maincpu;
r22508r22509
5052   z80ctc_device *m_z80ctc;
5153   device_t *m_z80dart;
5254   required_device<cassette_image_device> m_cassette;
55   required_device<ram_device> m_ram;
5356   centronics_device *m_centronics;
5457
5558   /* timers */
trunk/src/mess/includes/enterp.h
r22508r22509
1313
1414#define NICK_PALETTE_SIZE   256
1515
16
16#include "machine/ram.h"
1717struct NICK_STATE;
1818
1919class ep_state : public driver_device
r22508r22509
2121public:
2222   ep_state(const machine_config &mconfig, device_type type, const char *tag)
2323      : driver_device(mconfig, type, tag),
24      m_maincpu(*this, "maincpu") { }
24      m_maincpu(*this, "maincpu"),
25      m_ram(*this, RAM_TAG) { }
2526
2627   UINT8 exdos_card_value;  /* state of the wd1770 irq/drq lines */
2728   UINT8 keyboard_line;     /* index of keyboard line to read */
r22508r22509
3940   DECLARE_WRITE_LINE_MEMBER(enterp_wd1770_intrq_w);
4041   DECLARE_WRITE_LINE_MEMBER(enterp_wd1770_drq_w);
4142   required_device<cpu_device> m_maincpu;
43   required_device<ram_device> m_ram;
4244   void enterprise_update_memory_page(address_space &space, offs_t page, int index);
4345   char Nick_FetchByte(unsigned long Addr);
4446   void nick_write_pixel(int ci);
trunk/src/mess/includes/pcw16.h
r22508r22509
3939         m_flash1(*this, "flash1"),
4040         m_fdc(*this, "fdc"),
4141         m_uart2(*this, "ns16550_2"),
42         m_speaker(*this, BEEPER_TAG),
42         m_beeper(*this, "beeper"),
4343         m_ram(*this, RAM_TAG),
4444         m_region_rom(*this, "maincpu"),
4545         m_io_extra(*this, "EXTRA")
r22508r22509
5050   required_device<intel_e28f008sa_device> m_flash1;
5151   required_device<pc_fdc_superio_device> m_fdc;
5252   required_device<ns16550_device> m_uart2;
53   required_device<beep_device> m_speaker;
53   required_device<beep_device> m_beeper;
5454   required_device<ram_device> m_ram;
5555   required_memory_region m_region_rom;
5656   required_ioport m_io_extra;
trunk/src/mess/includes/dgn_beta.h
r22508r22509
1010#include "video/mc6845.h"
1111#include "machine/wd17xx.h"
1212#include "machine/6821pia.h"
13#include "machine/ram.h"
1314
1415/* Tags */
1516
r22508r22509
8889      : driver_device(mconfig, type, tag),
8990         m_mc6845(*this, "crtc"),
9091      m_videoram(*this, "videoram"),
91      m_maincpu(*this, "maincpu") { }
92      m_maincpu(*this, "maincpu"),
93      m_ram(*this, RAM_TAG) { }
9294
9395   required_device<mc6845_device> m_mc6845;
9496   required_shared_ptr<UINT8> m_videoram;
r22508r22509
207209   void ScanInKeyboard(void);
208210   void dgn_beta_frame_interrupt (int data);
209211   void dgn_beta_line_interrupt (int data);
212   required_device<ram_device> m_ram;
210213};
211214
212215
trunk/src/mess/includes/llc.h
r22508r22509
2121public:
2222   llc_state(const machine_config &mconfig, device_type type, const char *tag)
2323      : driver_device(mconfig, type, tag),
24   m_speaker(*this, "speaker"),
25   m_p_videoram(*this, "videoram"),
26      m_maincpu(*this, "maincpu") { }
24      m_speaker(*this, "speaker"),
25      m_p_videoram(*this, "videoram"),
26      m_maincpu(*this, "maincpu"),
27      m_ram(*this, RAM_TAG) { }
2728
2829   DECLARE_WRITE8_MEMBER(llc2_rom_disable_w);
2930   DECLARE_WRITE8_MEMBER(llc2_basic_enable_w);
r22508r22509
5556   UINT32 screen_update_llc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
5657   UINT32 screen_update_llc2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
5758   required_device<cpu_device> m_maincpu;
59   optional_device<ram_device> m_ram;
5860};
5961
6062
trunk/src/mess/includes/mz700.h
r22508r22509
1717#include "machine/z80pio.h"
1818#include "sound/speaker.h"
1919#include "imagedev/cassette.h"
20#include "machine/ram.h"
2021
2122class mz_state : public driver_device
2223{
r22508r22509
2526      : driver_device(mconfig, type, tag),
2627      m_maincpu(*this, "maincpu"),
2728      m_speaker(*this, "speaker"),
28      m_cassette(*this, "cassette") { }
29      m_cassette(*this, "cassette"),
30      m_ram(*this, RAM_TAG) { }
2931
3032   int m_mz700;                /* 1 if running on an mz700 */
3133
r22508r22509
98100   required_device<cpu_device> m_maincpu;
99101   required_device<speaker_sound_device> m_speaker;
100102   required_device<cassette_image_device> m_cassette;
103   required_device<ram_device> m_ram;
101104};
102105
103106
trunk/src/mess/includes/aim65.h
r22508r22509
3535public:
3636   aim65_state(const machine_config &mconfig, device_type type, const char *tag)
3737      : driver_device(mconfig, type, tag),
38   m_maincpu(*this, "maincpu"),
39   m_cassette1(*this, "cassette"),
40   m_cassette2(*this, "cassette2")
38      m_maincpu(*this, "maincpu"),
39      m_cassette1(*this, "cassette"),
40      m_cassette2(*this, "cassette2"),
41      m_ram(*this, RAM_TAG)
4142   { }
4243
4344   DECLARE_WRITE8_MEMBER(aim65_pia_a_w);
r22508r22509
5657   required_device<cpu_device> m_maincpu;
5758   required_device<cassette_image_device> m_cassette1;
5859   required_device<cassette_image_device> m_cassette2;
60   required_device<ram_device> m_ram;
5961   virtual void machine_start();
6062   TIMER_CALLBACK_MEMBER(aim65_printer_timer);
6163   void aim65_pia();
trunk/src/mess/includes/apple1.h
r22508r22509
1010#include "imagedev/snapquik.h"
1111#include "machine/6821pia.h"
1212#include "imagedev/cassette.h"
13#include "machine/ram.h"
1314
1415typedef short termchar_t;
1516
r22508r22509
3435   apple1_state(const machine_config &mconfig, device_type type, const char *tag)
3536      : driver_device(mconfig, type, tag),
3637      m_maincpu(*this, "maincpu"),
37      m_cassette(*this, "cassette") { }
38      m_cassette(*this, "cassette"),
39      m_ram(*this, RAM_TAG) { }
3840
3941   int m_vh_clrscrn_pressed;
4042   int m_kbd_data;
r22508r22509
8082   terminal_t *terminal_create(int gfx, int blank_char, int char_bits,int (*getcursorcode)(int original_code),int num_cols, int num_rows);
8183   attotime apple1_vh_dsp_time_to_ready();
8284   DECLARE_SNAPSHOT_LOAD_MEMBER( apple1 );
85   required_device<ram_device> m_ram;
8386};
8487
8588
trunk/src/mess/includes/x07.h
r22508r22509
160160      : driver_device(mconfig, type, tag),
161161         m_maincpu(*this, "maincpu"),
162162         m_printer(*this, "printer"),
163         m_beep(*this, BEEPER_TAG),
163         m_beep(*this, "beeper"),
164164         m_ram(*this, RAM_TAG),
165165         m_cassette(*this, "cassette")
166166   { }
trunk/src/mess/includes/fm7.h
r22508r22509
11#include "imagedev/cassette.h"
2#include "sound/beep.h"
23
34/*
45 *
r22508r22509
110111      m_maincpu(*this, "maincpu"),
111112      m_sub(*this, "sub"),
112113      m_x86(*this, "x86"),
113      m_cassette(*this, "cassette") { }
114      m_cassette(*this, "cassette"),
115      m_beeper(*this, "beeper") { }
114116
115117   optional_shared_ptr<UINT8> m_shared_ram;
116118   optional_shared_ptr<UINT8> m_boot_ram;
r22508r22509
262264   required_device<cpu_device> m_sub;
263265   optional_device<cpu_device> m_x86;
264266   required_device<cassette_image_device> m_cassette;
267   required_device<beep_device> m_beeper;
265268   void fm7_alu_mask_write(UINT32 offset, int bank, UINT8 dat);
266269   void fm7_alu_function_compare(UINT32 offset);
267270   void fm7_alu_function_pset(UINT32 offset);
trunk/src/mess/includes/genpc.h
r22508r22509
1616#include "machine/pit8253.h"
1717#include "sound/speaker.h"
1818#include "imagedev/cassette.h"
19#include "machine/ram.h"
1920
2021#define MCFG_IBM5160_MOTHERBOARD_ADD(_tag, _cputag) \
2122   MCFG_DEVICE_ADD(_tag, IBM5160_MOTHERBOARD, 0) \
r22508r22509
4950   required_device<speaker_sound_device>  m_speaker;
5051   required_device<isa8_device>  m_isabus;
5152   required_device<pc_kbdc_device>  m_pc_kbdc;
53   required_device<ram_device> m_ram;
5254
5355   /* U73 is an LS74 - dual flip flop */
5456   /* Q2 is set by OUT1 from the 8253 and goes to DRQ1 on the 8237 */
trunk/src/mess/includes/comx35.h
r22508r22509
9292   DECLARE_WRITE_LINE_MEMBER( prd_w );
9393   DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
9494   DECLARE_QUICKLOAD_LOAD_MEMBER( comx35_comx );
95   void image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count);
9596
9697   // processor state
9798   int m_clear;                // CPU mode
trunk/src/mess/includes/dai.h
r22508r22509
5757      m_tms5501(*this, "tms5501"),
5858      m_sound(*this, "custom"),
5959      m_maincpu(*this, "maincpu"),
60      m_cassette(*this, "cassette") { }
60      m_cassette(*this, "cassette"),
61      m_ram(*this, RAM_TAG) { }
6162
6263   required_device<pit8253_device> m_pit;
6364   required_device<tms5501_device> m_tms5501;
r22508r22509
8687   TIMER_CALLBACK_MEMBER(dai_timer);
8788   required_device<cpu_device> m_maincpu;
8889   required_device<cassette_image_device> m_cassette;
90   required_device<ram_device> m_ram;
8991   void dai_update_memory(int dai_rom_bank);
9092};
9193
trunk/src/mess/includes/c65.h
r22508r22509
1111#include "machine/cbmiec.h"
1212#include "imagedev/cartslot.h"
1313#include "imagedev/snapquik.h"
14#include "machine/ram.h"
1415
1516#define C64_MAX_ROMBANK 64 // .crt files contain multiple 'CHIPs', i.e. rom banks (of variable size) with headers. Known carts have at most 64 'CHIPs'.
1617
r22508r22509
6667         m_c65_chargen(*this, "c65_chargen"),
6768         m_interface(*this, "interface"),
6869         m_roml_writable(0),
69      m_maincpu(*this, "maincpu") { }
70      m_maincpu(*this, "maincpu"),
71      m_ram(*this, RAM_TAG) { }
7072
7173   optional_device<cbm_iec_device> m_iec;
7274
r22508r22509
176178   void c65_common_driver_init(  );
177179
178180   required_device<cpu_device> m_maincpu;
181   required_device<ram_device> m_ram;
179182};
180183
181184/*----------- defined in machine/c65.c -----------*/
trunk/src/mess/includes/bebox.h
r22508r22509
1414#include "machine/8237dma.h"
1515#include "machine/53c810.h"
1616#include "machine/upd765.h"
17#include "machine/ram.h"
1718
1819struct bebox_devices_t
1920{
r22508r22509
3132      : driver_device(mconfig, type, tag),
3233         m_ppc1(*this, "ppc1"),
3334         m_ppc2(*this, "ppc2"),
34         m_lsi53c810(*this, "scsi:lsi53c810"){ }
35         m_lsi53c810(*this, "scsi:lsi53c810"),
36         m_ram(*this, RAM_TAG){ }
3537
3638   required_device<cpu_device> m_ppc1;
3739   required_device<cpu_device> m_ppc2;
3840   required_device<lsi53c810_device> m_lsi53c810;
41   required_device<ram_device> m_ram;
3942   UINT32 m_cpu_imask[2];
4043   UINT32 m_interrupts;
4144   UINT32 m_crossproc_interrupts;
trunk/src/mess/includes/x68k.h
r22508r22509
1212#include "machine/rp5c15.h"
1313#include "machine/upd765.h"
1414#include "sound/okim6258.h"
15#include "machine/ram.h"
1516
16
1717#define MC68901_TAG     "mc68901"
1818#define RP5C15_TAG      "rp5c15"
1919
r22508r22509
5555         m_gvram32(*this, "gvram32"),
5656         m_tvram32(*this, "tvram32"),
5757      m_maincpu(*this, "maincpu"),
58      m_okim6258(*this, "okim6258") { }
58      m_okim6258(*this, "okim6258"),
59      m_ram(*this, RAM_TAG) { }
5960
6061   required_device<mc68901_device> m_mfpdev;
6162   required_device<rp5c15_device> m_rtc;
r22508r22509
384385public:   
385386   required_device<cpu_device> m_maincpu;
386387   required_device<okim6258_device> m_okim6258;
388   required_device<ram_device> m_ram;
387389   bitmap_ind16* x68k_get_gfx_page(int pri,int type);
388390   attotime prescale(int val);
389391   void mfp_trigger_irq(int irq);
trunk/src/mess/includes/pc.h
r22508r22509
1616#include "machine/upd765.h"
1717#include "sound/speaker.h"
1818#include "imagedev/cassette.h"
19#include "machine/ram.h"
1920
2021class pc_state : public driver_device
2122{
r22508r22509
2627      m_dma8237(*this, "dma8237"),
2728      m_pc_kbdc(*this, "pc_kbdc"),
2829      m_speaker(*this, "speaker"),
29      m_cassette(*this, "cassette") { }
30      m_cassette(*this, "cassette"),
31      m_ram(*this, RAM_TAG) { }
3032
3133   required_device<cpu_device> m_maincpu;
3234   device_t *m_pic8259;
r22508r22509
3537   optional_device<pc_kbdc_device>  m_pc_kbdc;
3638   optional_device<speaker_sound_device> m_speaker;
3739   optional_device<cassette_image_device> m_cassette;
40   optional_device<ram_device> m_ram;
3841
3942   /* U73 is an LS74 - dual flip flop */
4043   /* Q2 is set by OUT1 from the 8253 and goes to DRQ1 on the 8237 */
trunk/src/mess/includes/lviv.h
r22508r22509
1111#include "machine/i8255.h"
1212#include "sound/speaker.h"
1313#include "imagedev/cassette.h"
14#include "machine/ram.h"
1415
1516class lviv_state : public driver_device
1617{
r22508r22509
1920      : driver_device(mconfig, type, tag),
2021      m_maincpu(*this, "maincpu"),
2122      m_speaker(*this, "speaker"),
22      m_cassette(*this, "cassette") { }
23      m_cassette(*this, "cassette"),
24      m_ram(*this, RAM_TAG) { }
2325
2426   unsigned char * m_video_ram;
2527   unsigned short m_colortable[1][4];
r22508r22509
4850   required_device<cpu_device> m_maincpu;
4951   required_device<speaker_sound_device> m_speaker;
5052   required_device<cassette_image_device> m_cassette;
53   required_device<ram_device> m_ram;
5154   void lviv_update_palette(UINT8 pal);
5255   void lviv_update_memory ();
5356   void lviv_setup_snapshot (UINT8 * data);
trunk/src/mess/video/timex.c
r22508r22509
6262   scrx=TS2068_LEFT_BORDER;
6363   scry=((y&7) * 8) + ((y&0x38)>>3) + (y&0xC0);
6464
65   scr=machine().device<ram_device>(RAM_TAG)->pointer() + y*32;
65   scr=m_ram->pointer() + y*32;
6666   attr=scr + 0x2000;
6767
6868   for (x=0;x<32;x++)
r22508r22509
106106   scrx=TS2068_LEFT_BORDER;
107107   scry=((y&7) * 8) + ((y&0x38)>>3) + (y&0xC0);
108108
109   scr1=machine().device<ram_device>(RAM_TAG)->pointer() + y*32;
109   scr1=m_ram->pointer() + y*32;
110110   scr2=scr1 + 0x2000;
111111
112112   for (x=0;x<32;x++)
r22508r22509
141141   scrx=TS2068_LEFT_BORDER;
142142   scry=((y&7) * 8) + ((y&0x38)>>3) + (y&0xC0);
143143
144   scr = machine().device<ram_device>(RAM_TAG)->pointer() + y*32 + screen*0x2000;
145   attr = machine().device<ram_device>(RAM_TAG)->pointer() + ((scry>>3)*32) + screen*0x2000 + 0x1800;
144   scr = m_ram->pointer() + y*32 + screen*0x2000;
145   attr = m_ram->pointer() + ((scry>>3)*32) + screen*0x2000 + 0x1800;
146146
147147   for (x=0;x<32;x++)
148148   {
trunk/src/mess/video/nc.c
r22508r22509
8989   {
9090      int by;
9191      /* 64 bytes per line */
92      char *line_ptr = ((char*)machine().device<ram_device>(RAM_TAG)->pointer()) + m_display_memory_start + (y<<6);
92      char *line_ptr = ((char*)m_ram->pointer()) + m_display_memory_start + (y<<6);
9393
9494      x = 0;
9595      for (by=0; by<width>>3; by++)
trunk/src/mess/video/x68k.c
r22508r22509
12881288//  popmessage("Graphic layer scroll - %i, %i - %i, %i - %i, %i - %i, %i",
12891289//      m_crtc.reg[12],m_crtc.reg[13],m_crtc.reg[14],m_crtc.reg[15],m_crtc.reg[16],m_crtc.reg[17],m_crtc.reg[18],m_crtc.reg[19]);
12901290//  popmessage("IOC IRQ status - %02x",m_ioc.irqstatus);
1291//  popmessage("RAM: mouse data - %02x %02x %02x %02x",machine().device<ram_device>(RAM_TAG)->pointer()[0x931],machine().device<ram_device>(RAM_TAG)->pointer()[0x930],machine().device<ram_device>(RAM_TAG)->pointer()[0x933],machine().device<ram_device>(RAM_TAG)->pointer()[0x932]);
1291//  popmessage("RAM: mouse data - %02x %02x %02x %02x",m_ram->pointer()[0x931],m_ram->pointer()[0x930],m_ram->pointer()[0x933],m_ram->pointer()[0x932]);
12921292#endif
12931293   return 0;
12941294}
trunk/src/mess/video/b2m.c
r22508r22509
2121   UINT8 code2;
2222   UINT8 col;
2323   int y, x, b;
24   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
24   UINT8 *ram = m_ram->pointer();
2525
2626   for (x = 0; x < 48; x++)
2727   {
trunk/src/mess/video/pcw.c
r22508r22509
9292
9393         x = PCW_BORDER_WIDTH;
9494
95         roller_ram_ptr = machine().device<ram_device>(RAM_TAG)->pointer() + m_roller_ram_addr + roller_ram_offs;
95         roller_ram_ptr = m_ram->pointer() + m_roller_ram_addr + roller_ram_offs;
9696
9797         /* get line address */
9898         /* b16-14 control which bank the line is to be found in, b13-3 the address in the bank (in 16-byte units), and b2-0 the offset. Thus a roller RAM address bbbxxxxxxxxxxxyyy indicates bank bbb, address 00xxxxxxxxxxx0yyy. */
9999         line_data = ((unsigned char *)roller_ram_ptr)[0] | (((unsigned char *)roller_ram_ptr)[1]<<8);
100100
101101         /* calculate address of pixel data */
102         line_ptr = machine().device<ram_device>(RAM_TAG)->pointer() + ((line_data & 0x0e000)<<1) + ((line_data & 0x01ff8)<<1) + (line_data & 0x07);
102         line_ptr = m_ram->pointer() + ((line_data & 0x0e000)<<1) + ((line_data & 0x01ff8)<<1) + (line_data & 0x07);
103103
104104         for (by=0; by<90; by++)
105105         {
trunk/src/mess/video/911_vdt.c
r22508r22509
230230
231231static TIMER_CALLBACK(setup_beep)
232232{
233   machine.device<beep_device>(BEEPER_TAG)->set_frequency(2000);
233   machine.device<beep_device>("beeper")->set_frequency(2000);
234234}
235235
236236
r22508r22509
311311*/
312312static TIMER_CALLBACK(beep_callback)
313313{
314   machine.device<beep_device>(BEEPER_TAG)->set_state(0);
314   machine.device<beep_device>("beeper")->set_state(0);
315315}
316316
317317/*
r22508r22509
485485
486486      case 0xe:
487487         /* beep enable strobe - not tested */
488         space.machine().device<beep_device>(BEEPER_TAG)->set_state(1);
488         space.machine().device<beep_device>("beeper")->set_state(1);
489489
490490         vdt->beep_timer->adjust(attotime::from_usec(300));
491491         break;
trunk/src/mess/video/pp01.c
r22508r22509
2020   UINT8 code_r,code_g,code_b;
2121   UINT8 col;
2222   int y, x, b;
23   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
23   UINT8 *ram = m_ram->pointer();
2424
2525   for (y = 0; y < 256; y++)
2626   {
trunk/src/mess/video/apple3.c
r22508r22509
9393   const UINT8 *char_data;
9494   pen_t fg, bg, temp;
9595   UINT16 *dest;
96   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
97   UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
96   UINT8 *ram = m_ram->pointer();
97   UINT32 ram_size = m_ram->size();
9898
9999   for (y = 0; y < 24; y++)
100100   {
r22508r22509
150150   const UINT8 *char_data;
151151   pen_t fg, bg;
152152   UINT16 *dest;
153   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
154   UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
153   UINT8 *ram = m_ram->pointer();
154   UINT32 ram_size = m_ram->size();
155155
156156   for (y = 0; y < 24; y++)
157157   {
r22508r22509
201201   const UINT8 *pix_info;
202202   UINT16 *ptr;
203203   UINT8 b;
204   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
204   UINT8 *ram = m_ram->pointer();
205205
206206   for (y = 0; y < 192; y++)
207207   {
r22508r22509
246246   UINT16 *ptr;
247247   UINT8 b;
248248   UINT16 fgcolor, bgcolor;
249   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
249   UINT8 *ram = m_ram->pointer();
250250
251251   for (y = 0; y < 192; y++)
252252   {
r22508r22509
291291   const UINT8 *pix_info2;
292292   UINT16 *ptr;
293293   UINT8 b1, b2;
294   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
294   UINT8 *ram = m_ram->pointer();
295295
296296   for (y = 0; y < 192; y++)
297297   {
r22508r22509
330330   UINT16 *pen;
331331   PAIR pix;
332332   int y, i;
333   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
333   UINT8 *ram = m_ram->pointer();
334334
335335   for (y = 0; y < 192; y++)
336336   {
trunk/src/mess/video/vector06.c
r22508r22509
1919   UINT8 code1,code2,code3,code4;
2020   UINT8 col;
2121   int y, x, b,draw_y;
22   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
22   UINT8 *ram = m_ram->pointer();
2323
2424   int width = (m_video_mode==0x00) ? 256 : 512;
2525   rectangle screen_area(0,width+64-1,0,256+64-1);
trunk/src/mess/video/epnick.c
r22508r22509
10151015{
10161016   nick = auto_alloc_clear(machine(), NICK_STATE);
10171017
1018   nick->videoram = machine().device<ram_device>(RAM_TAG)->pointer();
1018   nick->videoram = m_ram->pointer();
10191019   Nick_Init();
10201020   machine().primary_screen->register_screen_bitmap(m_bitmap);
10211021}
trunk/src/mess/video/mac.c
r22508r22509
8686   UINT16 *line;
8787   int y, x, b;
8888
89   video_base = machine().device<ram_device>(RAM_TAG)->size() - (m_screen_buffer ? MAC_MAIN_SCREEN_BUF_OFFSET : MAC_ALT_SCREEN_BUF_OFFSET);
90   video_ram = (const UINT16 *) (machine().device<ram_device>(RAM_TAG)->pointer() + video_base);
89   video_base = m_ram->size() - (m_screen_buffer ? MAC_MAIN_SCREEN_BUF_OFFSET : MAC_ALT_SCREEN_BUF_OFFSET);
90   video_ram = (const UINT16 *) (m_ram->pointer() + video_base);
9191
9292   for (y = 0; y < MAC_V_VIS; y++)
9393   {
r22508r22509
381381{
382382   UINT32 *scanline;
383383   int x, y, hres, vres;
384   UINT8 *vram8 = (UINT8 *)machine().device<ram_device>(RAM_TAG)->pointer();
384   UINT8 *vram8 = (UINT8 *)m_ram->pointer();
385385
386386   switch (m_rbv_montype)
387387   {
trunk/src/mess/drivers/pc8801.c
r22508r22509
303303         m_fdccpu(*this, "fdccpu"),
304304         m_pic(*this, I8214_TAG),
305305         m_rtc(*this, UPD1990A_TAG),
306         m_cassette(*this, "cassette")
306         m_cassette(*this, "cassette"),
307         m_beeper(*this, "beeper")
307308   { }
308309
309310   required_device<cpu_device> m_maincpu;
r22508r22509
311312   optional_device<i8214_device> m_pic;
312313   required_device<upd1990a_device> m_rtc;
313314   required_device<cassette_image_device> m_cassette;
315   required_device<beep_device> m_beeper;
314316   UINT8 *m_work_ram;
315317   UINT8 *m_hi_work_ram;
316318   UINT8 *m_ext_work_ram;
r22508r22509
11851187   m_rtc->clk_w((data & 4) >> 2);
11861188
11871189   if(((m_device_ctrl_data & 0x20) == 0x00) && ((data & 0x20) == 0x20))
1188      machine().device<beep_device>(BEEPER_TAG)->set_state(1);
1190      m_beeper->set_state(1);
11891191
11901192   if(((m_device_ctrl_data & 0x20) == 0x20) && ((data & 0x20) == 0x00))
1191      machine().device<beep_device>(BEEPER_TAG)->set_state(0);
1193      m_beeper->set_state(0);
11921194
11931195   if((m_device_ctrl_data & 0x40) != (data & 0x40))
11941196   {
r22508r22509
12151217
12161218   /* TODO: is SING a buzzer mask? Bastard Special relies on this ... */
12171219   if(m_device_ctrl_data & 0x80)
1218      machine().device<beep_device>(BEEPER_TAG)->set_state(0);
1220      m_beeper->set_state(0);
12191221
12201222   m_device_ctrl_data = data;
12211223}
r22508r22509
24732475      m_crtc.status = 0;
24742476   }
24752477
2476   machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
2477   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
2478   m_beeper->set_frequency(2400);
2479   m_beeper->set_state(0);
24782480
24792481   #ifdef USE_PROPER_I8214
24802482   {
r22508r22509
27082710   MCFG_SOUND_CONFIG(pc88_ym2608_intf)
27092711   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
27102712
2711   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
2713   MCFG_SOUND_ADD("beeper", BEEP, 0)
27122714   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
27132715
27142716   MCFG_TIMER_DRIVER_ADD_PERIODIC("rtc_timer", pc8801_state, pc8801_rtc_irq, attotime::from_hz(600))
trunk/src/mess/drivers/enterp.c
r22508r22509
7070   case 0xfa:
7171   case 0xfb:
7272      /* additional 64k ram */
73      if (space.machine().device<ram_device>(RAM_TAG)->size() == 128*1024)
73      if (m_ram->size() == 128*1024)
7474      {
7575         space.install_readwrite_bank(start, end, page_num);
76         membank(page_num)->set_base(space.machine().device<ram_device>(RAM_TAG)->pointer() + (index - 0xf4) * 0x4000);
76         membank(page_num)->set_base(m_ram->pointer() + (index - 0xf4) * 0x4000);
7777      }
7878      else
7979      {
r22508r22509
8787   case 0xff:
8888      /* basic 64k ram */
8989      space.install_readwrite_bank(start, end, page_num);
90      membank(page_num)->set_base(space.machine().device<ram_device>(RAM_TAG)->pointer() + (index - 0xfc) * 0x4000);
90      membank(page_num)->set_base(m_ram->pointer() + (index - 0xfc) * 0x4000);
9191      break;
9292
9393   default:
trunk/src/mess/drivers/ti990_4.c
r22508r22509
280280#if VIDEO_911
281281   /* 911 VDT has a beep tone generator */
282282   MCFG_SPEAKER_STANDARD_MONO("mono")
283   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
283   MCFG_SOUND_ADD("beeper", BEEP, 0)
284284   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
285285#endif
286286   MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti990_4_floppy_interface)
trunk/src/mess/drivers/ms0515.c
r22508r22509
1919public:
2020   ms0515_state(const machine_config &mconfig, device_type type, const char *tag)
2121      : driver_device(mconfig, type, tag),
22         m_maincpu(*this, "maincpu")
22         m_maincpu(*this, "maincpu"),
23         m_ram(*this, RAM_TAG)
2324   { }
2425
2526   required_device<cpu_device> m_maincpu;
27   required_device<ram_device> m_ram;
2628
2729   DECLARE_WRITE16_MEMBER(ms0515_bank_w);
2830   DECLARE_WRITE8_MEMBER(ms0515_sys_w);
r22508r22509
8385
8486WRITE16_MEMBER(ms0515_state::ms0515_bank_w)
8587{
86   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
88   UINT8 *ram = m_ram->pointer();
8789   membank("bank0")->set_base(ram + 0000000 + BIT(data,0) * 0160000);
8890   membank("bank1")->set_base(ram + 0020000 + BIT(data,1) * 0160000);
8991   membank("bank2")->set_base(ram + 0040000 + BIT(data,2) * 0160000);
r22508r22509
118120
119121void ms0515_state::machine_reset()
120122{
121   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
123   UINT8 *ram = m_ram->pointer();
122124   ms0515_bank_w(machine().driver_data()->generic_space(),0,0);
123125
124126   m_video_ram = ram + 0000000 + 0340000;
trunk/src/mess/drivers/osi.c
r22508r22509
852852   MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
853853   MCFG_SOUND_CONFIG_DISCRETE(osi600c_discrete_interface)
854854   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
855   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
855   MCFG_SOUND_ADD("beeper", BEEP, 0)
856856   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
857857
858858   MCFG_PIA6821_ADD( "pia_1", pia_dummy_intf )
r22508r22509
933933
934934TIMER_CALLBACK_MEMBER(sb2m600_state::setup_beep)
935935{
936   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
937   speaker->set_state(0);
938   speaker->set_frequency(300);
936   m_beeper->set_state(0);
937   m_beeper->set_frequency(300);
939938}
940939
941940DRIVER_INIT_MEMBER(c1p_state,c1p)
trunk/src/mess/drivers/pyl601.c
r22508r22509
498498
499499DRIVER_INIT_MEMBER(pyl601_state,pyl601)
500500{
501   memset(machine().device<ram_device>(RAM_TAG)->pointer(), 0, 64 * 1024);
501   memset(m_ram->pointer(), 0, 64 * 1024);
502502}
503503
504504INTERRUPT_GEN_MEMBER(pyl601_state::pyl601_interrupt)
trunk/src/mess/drivers/pc100.c
r22508r22509
6767   pc100_state(const machine_config &mconfig, device_type type, const char *tag)
6868      : driver_device(mconfig, type, tag),
6969      m_rtc(*this, "rtc"),
70      m_palram(*this, "palram")
71      ,
72      m_maincpu(*this, "maincpu") { }
70      m_palram(*this, "palram"),
71      m_maincpu(*this, "maincpu"),
72      m_beeper(*this, "beeper") { }
7373
7474   required_device<msm58321_device> m_rtc;
7575   required_shared_ptr<UINT16> m_palram;
r22508r22509
118118   TIMER_DEVICE_CALLBACK_MEMBER(pc100_10hz_irq);
119119   IRQ_CALLBACK_MEMBER(pc100_irq_callback);
120120   required_device<cpu_device> m_maincpu;
121   required_device<beep_device> m_beeper;
121122};
122123
123124void pc100_state::video_start()
r22508r22509
219220   if(offset == 0)
220221   {
221222      m_timer_mode = (data & 0x18) >> 3;
222      machine().device<beep_device>(BEEPER_TAG)->set_state(((data & 0x40) >> 6) ^ 1);
223      m_beeper->set_state(((data & 0x40) >> 6) ^ 1);
223224      printf("%02x\n",data & 0xc0);
224225   }
225226}
r22508r22509
429430
430431void pc100_state::machine_reset()
431432{
432   machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
433   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
433   m_beeper->set_frequency(2400);
434   m_beeper->set_state(0);
434435}
435436
436437INTERRUPT_GEN_MEMBER(pc100_state::pc100_vblank_irq)
r22508r22509
517518
518519   MCFG_SPEAKER_STANDARD_MONO("mono")
519520
520   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
521   MCFG_SOUND_ADD("beeper", BEEP, 0)
521522   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
522523MACHINE_CONFIG_END
523524
trunk/src/mess/drivers/mmodular.c
r22508r22509
129129public:
130130   polgar_state(const machine_config &mconfig, device_type type, const char *tag)
131131      : mboard_state(mconfig, type, tag),
132         m_lcdc(*this, "hd44780")
132         m_lcdc(*this, "hd44780"),
133         m_beeper(*this, "beeper")
133134      { }
134135
135136   optional_device<hd44780_device> m_lcdc;
137   optional_device<beep_device> m_beeper;
136138
137139   UINT8 led_status;
138140   UINT8 lcd_char;
r22508r22509
244246   }
245247
246248   if (BIT(data,2) || BIT(data,3))
247         machine().device<beep_device>("beep")->set_state(1);
249         m_beeper->set_state(1);
248250      else
249         machine().device<beep_device>("beep")->set_state(0);
251         m_beeper->set_state(0);
250252
251253   if (BIT(data,7) && BIT(data, 4)) {
252254      for (i = 0;i < 8;i++)
r22508r22509
412414WRITE8_MEMBER(polgar_state::megaiv_write_LED)
413415{
414416   if (BIT(data,7))
415      machine().device<beep_device>("beep")->set_state(1);
417      m_beeper->set_state(1);
416418   else
417      machine().device<beep_device>("beep")->set_state(0);
419      m_beeper->set_state(0);
418420   output_set_led_value(102,BIT(data,1)?1:0);
419421   output_set_led_value(107,BIT(data,6)?1:0);
420422
r22508r22509
475477}
476478
477479if (BIT(data,7))
478   machine().device<beep_device>("beep")->set_state(1);
480   m_beeper->set_state(1);
479481else
480   machine().device<beep_device>("beep")->set_state(0);
482   m_beeper->set_state(0);
481483if (BIT(data,1))
482   machine().device<beep_device>("beep")->set_state(1);
484   m_beeper->set_state(1);
483485else
484   machine().device<beep_device>("beep")->set_state(0);
486   m_beeper->set_state(0);
485487//  logerror("LEDs  FUNC = %02x found = %d\n",data,found);
486488   if (!found) {
487489      logerror("unknown LED mask %d\n",data);
r22508r22509
724726WRITE8_MEMBER(polgar_state::beep_academy)
725727{
726728   if (!BIT(data,7))
727         machine().device<beep_device>("beep")->set_state(1);
729         m_beeper->set_state(1);
728730      else
729         machine().device<beep_device>("beep")->set_state(0);
731         m_beeper->set_state(0);
730732}
731733
732734WRITE8_MEMBER(polgar_state::megaiv_IO)
r22508r22509
878880void polgar_state::write_IOenable(unsigned char data,address_space &space)
879881{
880882   hd44780_device * hd44780 = space.machine().device<hd44780_device>("hd44780");
881   beep_device *speaker = machine().device<beep_device>("beep");
882883
883884   if (BIT(data,5) && BIT(data,4)) {
884885      if (BIT(data,1)) {
r22508r22509
904905   logerror("Write to IOENBL data: %08x\n",data);
905906
906907      if (BIT(data,2) || BIT(data,3))
907               speaker->set_state(1);
908               m_beeper->set_state(1);
908909            else
909               speaker->set_state(0);
910               m_beeper->set_state(0);
910911   }
911912
912913}
r22508r22509
15321533
15331534   /* sound hardware */
15341535   MCFG_SPEAKER_STANDARD_MONO("mono")
1535   MCFG_SOUND_ADD("beep", BEEP, 0)
1536   MCFG_SOUND_ADD("beeper", BEEP, 0)
15361537   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
15371538
15381539MACHINE_CONFIG_END
trunk/src/mess/drivers/pc9801.c
r22508r22509
365365      m_hgdc2(*this, "upd7220_btm"),
366366      m_sasibus(*this, SASIBUS_TAG ":host"),
367367      m_video_ram_1(*this, "video_ram_1"),
368      m_video_ram_2(*this, "video_ram_2"){ }
368      m_video_ram_2(*this, "video_ram_2"),
369      m_beeper(*this, "beeper"),
370      m_ram(*this, RAM_TAG) { }
369371
370372   required_device<cpu_device> m_maincpu;
371373   required_device<am9517a_device> m_dmac;
r22508r22509
379381   optional_device<scsicb_device> m_sasibus;
380382   required_shared_ptr<UINT8> m_video_ram_1;
381383   required_shared_ptr<UINT8> m_video_ram_2;
384   required_device<beep_device> m_beeper;
385   optional_device<ram_device> m_ram;   
382386
383387   virtual void video_start();
384388   UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
r22508r22509
31093113
31103114WRITE8_MEMBER(pc9801_state::ppi_sys_portc_w)
31113115{
3112   machine().device<beep_device>(BEEPER_TAG)->set_state(!(data & 0x08));
3116   m_beeper->set_state(!(data & 0x08));
31133117}
31143118
31153119static I8255A_INTERFACE( ppi_system_intf )
r22508r22509
33883392   state_save_register_global_pointer(machine(), m_work_ram, 0xa0000);
33893393   state_save_register_global_pointer(machine(), m_ext_work_ram, 0x700000);
33903394
3391   m_ram_size = machine().device<ram_device>(RAM_TAG)->size() - 0xa0000;
3395   m_ram_size = m_ram->size() - 0xa0000;
33923396
33933397   upd765a_device *fdc;
33943398   fdc = machine().device<upd765a_device>(":upd765_2hd");
r22508r22509
34273431         m_tvram[(0x3fe0)+i*2] = default_memsw_data[i];
34283432   }
34293433
3430   machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
3431   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
3434   m_beeper->set_frequency(2400);
3435   m_beeper->set_state(0);
34323436
34333437   m_nmi_ff = 0;
34343438   m_mouse.control = 0xff;
r22508r22509
36123616
36133617   MCFG_SPEAKER_STANDARD_MONO("mono")
36143618
3615   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
3619   MCFG_SOUND_ADD("beeper", BEEP, 0)
36163620   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
36173621MACHINE_CONFIG_END
36183622
r22508r22509
36773681//  MCFG_SOUND_CONFIG(pc98_ym2608_intf)
36783682//  MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
36793683
3680   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
3684   MCFG_SOUND_ADD("beeper", BEEP, 0)
36813685   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
36823686MACHINE_CONFIG_END
36833687
r22508r22509
37433747//  MCFG_SOUND_CONFIG(pc98_ym2608_intf)
37443748//  MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
37453749
3746   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
3750   MCFG_SOUND_ADD("beeper", BEEP, 0)
37473751   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
37483752MACHINE_CONFIG_END
37493753
trunk/src/mess/drivers/fidelz80.c
r22508r22509
12961296
12971297   /* sound hardware */
12981298   MCFG_SPEAKER_STANDARD_MONO( "mono" )
1299   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
1299   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
13001300   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
13011301MACHINE_CONFIG_END
13021302
trunk/src/mess/drivers/fm7.c
r22508r22509
229229
230230TIMER_CALLBACK_MEMBER(fm7_state::fm7_beeper_off)
231231{
232   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
232   m_beeper->set_state(0);
233233   logerror("timed beeper off\n");
234234}
235235
r22508r22509
239239
240240   if(!m_speaker_active)  // speaker not active, disable all beeper sound
241241   {
242      machine().device<beep_device>(BEEPER_TAG)->set_state(0);
242      m_beeper->set_state(0);
243243      return;
244244   }
245245
246246   if(data & 0x80)
247247   {
248248      if(m_speaker_active)
249         machine().device<beep_device>(BEEPER_TAG)->set_state(1);
249         m_beeper->set_state(1);
250250   }
251251   else
252      machine().device<beep_device>(BEEPER_TAG)->set_state(0);
252      m_beeper->set_state(0);
253253
254254   if(data & 0x40)
255255   {
256256      if(m_speaker_active)
257257      {
258         machine().device<beep_device>(BEEPER_TAG)->set_state(1);
258         m_beeper->set_state(1);
259259         logerror("timed beeper on\n");
260260         machine().scheduler().timer_set(attotime::from_msec(205), timer_expired_delegate(FUNC(fm7_state::fm7_beeper_off),this));
261261      }
r22508r22509
272272{
273273   if(m_speaker_active)
274274   {
275      machine().device<beep_device>(BEEPER_TAG)->set_state(1);
275      m_beeper->set_state(1);
276276      logerror("timed beeper on\n");
277277      machine().scheduler().timer_set(attotime::from_msec(205), timer_expired_delegate(FUNC(fm7_state::fm7_beeper_off),this));
278278   }
r22508r22509
18361836   memset(m_shared_ram,0xff,0x80);
18371837   m_type = SYS_FM7;
18381838
1839   machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
1840   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
1839   m_beeper->set_frequency(1200);
1840   m_beeper->set_state(0);
18411841}
18421842
18431843MACHINE_START_MEMBER(fm7_state,fm77av)
r22508r22509
18571857   membank("bank21")->set_base(RAM+0x800);
18581858
18591859   m_type = SYS_FM77AV;
1860   machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
1861   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
1860   m_beeper->set_frequency(1200);
1861   m_beeper->set_state(0);
18621862}
18631863
18641864MACHINE_START_MEMBER(fm7_state,fm11)
r22508r22509
18681868
18691869   memset(m_shared_ram,0xff,0x80);
18701870   m_type = SYS_FM11;
1871   machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
1872   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
1871   m_beeper->set_frequency(1200);
1872   m_beeper->set_state(0);
18731873   // last part of Initiate ROM is visible at the end of RAM too (interrupt vectors)
18741874   memcpy(RAM+0x3fff0,ROM+0x0ff0,16);
18751875}
r22508r22509
18771877MACHINE_START_MEMBER(fm7_state,fm16)
18781878{
18791879   m_type = SYS_FM16;
1880   machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
1881   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
1880   m_beeper->set_frequency(1200);
1881   m_beeper->set_state(0);
18821882}
18831883
18841884void fm7_state::machine_reset()
r22508r22509
20222022   MCFG_SOUND_ADD("psg", AY8910, XTAL_4_9152MHz / 4)
20232023   MCFG_SOUND_CONFIG(fm7_psg_intf)
20242024   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 1.00)
2025   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
2025   MCFG_SOUND_ADD("beeper", BEEP, 0)
20262026   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.50)
20272027   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
20282028   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.25)
r22508r22509
20642064   MCFG_QUANTUM_PERFECT_CPU("sub")
20652065
20662066   MCFG_SPEAKER_STANDARD_MONO("mono")
2067   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
2067   MCFG_SOUND_ADD("beeper", BEEP, 0)
20682068   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
20692069   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
20702070   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
r22508r22509
21072107   MCFG_SOUND_ADD("ym", YM2203, XTAL_4_9152MHz / 4)
21082108   MCFG_SOUND_CONFIG(fm7_ym_intf)
21092109   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",1.0)
2110   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
2110   MCFG_SOUND_ADD("beeper", BEEP, 0)
21112111   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
21122112   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
21132113   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
r22508r22509
21532153   MCFG_CPU_IO_MAP(fm11_x86_io)
21542154
21552155   MCFG_SPEAKER_STANDARD_MONO("mono")
2156   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
2156   MCFG_SOUND_ADD("beeper", BEEP, 0)
21572157   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
21582158   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
21592159   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
r22508r22509
21942194   MCFG_QUANTUM_PERFECT_CPU("sub")
21952195
21962196   MCFG_SPEAKER_STANDARD_MONO("mono")
2197   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
2197   MCFG_SOUND_ADD("beeper", BEEP, 0)
21982198   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
21992199   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
22002200   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
trunk/src/mess/drivers/ex800.c
r22508r22509
137137public:
138138   ex800_state(const machine_config &mconfig, device_type type, const char *tag)
139139      : driver_device(mconfig, type, tag) ,
140      m_maincpu(*this, "maincpu") { }
140      m_maincpu(*this, "maincpu"),
141      m_beeper(*this, "beeper") { }
141142
142143   int m_irq_state;
143144   DECLARE_READ8_MEMBER(ex800_porta_r);
r22508r22509
157158   virtual void machine_start();
158159   DECLARE_INPUT_CHANGED_MEMBER(online_switch);
159160   required_device<cpu_device> m_maincpu;
161   required_device<beep_device> m_beeper;
160162};
161163
162164
r22508r22509
208210void ex800_state::machine_start()
209211{
210212   m_irq_state = ASSERT_LINE;
211   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
212213   /* Setup beep */
213   speaker->set_state(0);
214   speaker->set_frequency(4000); /* measured at 4000 Hz */
214   m_beeper->set_state(0);
215   m_beeper->set_frequency(4000); /* measured at 4000 Hz */
215216}
216217
217218
r22508r22509
267268
268269WRITE8_MEMBER(ex800_state::ex800_portc_w)
269270{
270   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
271271   if (data & 0x80)
272      speaker->set_state(0);
272      m_beeper->set_state(0);
273273   else
274      speaker->set_state(1);
274      m_beeper->set_state(1);
275275
276276   logerror("PC W %x @%x\n", data, space.device().safe_pc());
277277}
r22508r22509
458458
459459   /* audio hardware */
460460   MCFG_SPEAKER_STANDARD_MONO("mono")
461   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
461   MCFG_SOUND_ADD("beeper", BEEP, 0)
462462   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
463463MACHINE_CONFIG_END
464464
trunk/src/mess/drivers/vt220.c
r22508r22509
1616public:
1717   vt220_state(const machine_config &mconfig, device_type type, const char *tag)
1818      : driver_device(mconfig, type, tag) ,
19      m_maincpu(*this, "maincpu") { }
19      m_maincpu(*this, "maincpu"),
20      m_ram(*this, RAM_TAG) { }
2021
2122   virtual void machine_reset();
2223   virtual void video_start();
2324   UINT32 screen_update_vt220(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
2425   required_device<cpu_device> m_maincpu;
26   required_device<ram_device> m_ram;
2527};
2628
2729
r22508r22509
3840
3941void vt220_state::machine_reset()
4042{
41   memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,16*1024);
43   memset(m_ram->pointer(),0,16*1024);
4244}
4345
4446void vt220_state::video_start()
trunk/src/mess/drivers/smc777.c
r22508r22509
5252   m_maincpu(*this, "maincpu"),
5353   m_crtc(*this, "crtc"),
5454   m_fdc(*this, "fdc"),
55   m_sn(*this, "sn1")
55   m_sn(*this, "sn1"),
56   m_beeper(*this, "beeper")
5657   { }
5758
5859   required_device<cpu_device> m_maincpu;
5960   required_device<mc6845_device> m_crtc;
6061   required_device<mb8876_device> m_fdc;
6162   optional_device<sn76489a_device> m_sn;
63   required_device<beep_device> m_beeper;
6264
6365   UINT8 *m_ipl_rom;
6466   UINT8 *m_work_ram;
r22508r22509
528530         m_raminh_prefetch = (UINT8)(space.device().state().state_int(Z80_R)) & 0x7f;
529531         break;
530532      case 0x02: printf("Interlace %s\n",data & 0x10 ? "on" : "off"); break;
531      case 0x05: machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x10); break;
533      case 0x05: m_beeper->set_state(data & 0x10); break;
532534      default: printf("System FF W %02x\n",data); break;
533535   }
534536}
r22508r22509
990992   m_raminh_prefetch = 0xff;
991993   m_pal_mode = 0x10;
992994
993   machine().device<beep_device>(BEEPER_TAG)->set_frequency(300); //TODO: correct frequency
994   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
995   m_beeper->set_frequency(300); //TODO: correct frequency
996   m_beeper->set_state(0);
995997}
996998
997999
r22508r22509
11141116   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
11151117   MCFG_SOUND_CONFIG(psg_intf)
11161118
1117   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
1119   MCFG_SOUND_ADD("beeper", BEEP, 0)
11181120   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
11191121
11201122   MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", smc777_state, keyboard_callback, attotime::from_hz(240/32))
trunk/src/mess/drivers/xerox820.c
r22508r22509
714714static MACHINE_CONFIG_DERIVED_CLASS( bigboard, xerox820, bigboard_state )
715715   /* sound hardware */
716716   MCFG_SPEAKER_STANDARD_MONO("mono")
717   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
717   MCFG_SOUND_ADD("beeper", BEEP, 0)
718718   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* bigboard only */
719719MACHINE_CONFIG_END
720720
trunk/src/mess/drivers/micronic.c
r22508r22509
384384
385385   /* sound hardware */
386386   MCFG_SPEAKER_STANDARD_MONO( "mono" )
387   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
387   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
388388   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
389389
390390   /* ram banks */
trunk/src/mess/drivers/spc1000.c
r22508r22509
2222   spc1000_state(const machine_config &mconfig, device_type type, const char *tag)
2323      : driver_device(mconfig, type, tag),
2424         m_vdg(*this, "mc6847") ,
25      m_maincpu(*this, "maincpu") {}
25         m_maincpu(*this, "maincpu"),
26         m_ram(*this, RAM_TAG) {}
2627
2728   required_device<mc6847_base_device> m_vdg;
2829   UINT8 m_IPLK;
r22508r22509
4445   DECLARE_READ8_MEMBER(spc1000_gmode_r);
4546   DECLARE_READ8_MEMBER(spc1000_mc6847_videoram_r);
4647   required_device<cpu_device> m_maincpu;
48   required_device<ram_device> m_ram;
4749};
4850
4951
r22508r22509
6264      membank("bank1")->set_base(mem);
6365      membank("bank3")->set_base(mem);
6466   } else {
65      UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
67      UINT8 *ram = m_ram->pointer();
6668      membank("bank1")->set_base(ram);
6769      membank("bank3")->set_base(ram + 0x8000);
6870   }
r22508r22509
7678      membank("bank1")->set_base(mem);
7779      membank("bank3")->set_base(mem);
7880   } else {
79      UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
81      UINT8 *ram = m_ram->pointer();
8082      membank("bank1")->set_base(ram);
8183      membank("bank3")->set_base(ram + 0x8000);
8284   }
r22508r22509
229231{
230232   address_space &space = m_maincpu->space(AS_PROGRAM);
231233   UINT8 *mem = memregion("maincpu")->base();
232   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
234   UINT8 *ram = m_ram->pointer();
233235
234236   space.install_read_bank(0x0000, 0x7fff, "bank1");
235237   space.install_read_bank(0x8000, 0xffff, "bank3");
trunk/src/mess/drivers/mz2500.c
r22508r22509
6565   mz2500_state(const machine_config &mconfig, device_type type, const char *tag)
6666      : driver_device(mconfig, type, tag),
6767      m_maincpu(*this, "maincpu"),
68      m_rtc(*this, RP5C15_TAG)
68      m_rtc(*this, RP5C15_TAG),
69      m_beeper(*this, "beeper")
6970   { }
7071
7172   required_device<cpu_device> m_maincpu;
7273   required_device<rp5c15_device> m_rtc;
74   required_device<beep_device> m_beeper;
7375
7476   UINT8 *m_main_ram;
7577   UINT8 *m_ipl_rom;
r22508r22509
18061808
18071809   m_cg_clear_flag = 0;
18081810
1809   machine().device<beep_device>(BEEPER_TAG)->set_frequency(4096);
1810   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
1811   m_beeper->set_frequency(4096);
1812   m_beeper->set_state(0);
18111813
18121814//  m_monitor_type = ioport("DSW1")->read() & 0x40 ? 1 : 0;
18131815}
r22508r22509
19211923
19221924   m_old_portc = data;
19231925
1924   machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x04);
1926   m_beeper->set_state(data & 0x04);
19251927
19261928   m_screen_enable = data & 1;
19271929
r22508r22509
21572159   MCFG_SOUND_ROUTE(2, "mono", 0.50)
21582160   MCFG_SOUND_ROUTE(3, "mono", 0.50)
21592161
2160   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
2162   MCFG_SOUND_ADD("beeper", BEEP, 0)
21612163   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
21622164MACHINE_CONFIG_END
21632165
trunk/src/mess/drivers/multi8.c
r22508r22509
2828   m_maincpu(*this, "maincpu"),
2929   m_ppi(*this, "ppi8255_0"),
3030   m_crtc(*this, "crtc"),
31   m_beep(*this, BEEPER_TAG)
31   m_beeper(*this, "beeper")
3232   { }
3333
3434   required_device<cpu_device> m_maincpu;
3535   required_device<i8255_device> m_ppi;
3636   required_device<mc6845_device> m_crtc;
37   required_device<beep_device> m_beep;
37   required_device<beep_device> m_beeper;
3838   DECLARE_WRITE8_MEMBER(multi8_6845_w);
3939   DECLARE_READ8_MEMBER(key_input_r);
4040   DECLARE_READ8_MEMBER(key_status_r);
r22508r22509
629629
630630WRITE8_MEMBER( multi8_state::ym2203_porta_w )
631631{
632   m_beep->set_state((data & 0x08));
632   m_beeper->set_state((data & 0x08));
633633}
634634
635635static const ym2203_interface ym2203_config =
r22508r22509
655655
656656void multi8_state::machine_reset()
657657{
658   machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200); //guesswork
659   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
658   m_beeper->set_frequency(1200); //guesswork
659   m_beeper->set_state(0);
660660   m_mcu_init = 0;
661661}
662662
r22508r22509
682682   MCFG_SOUND_ADD("aysnd", AY8912, 1500000) //unknown clock / divider
683683   MCFG_SOUND_CONFIG(ym2203_config)
684684   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
685   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
685   MCFG_SOUND_ADD("beeper", BEEP, 0)
686686   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
687687
688688   /* Devices */
trunk/src/mess/drivers/z9001.c
r22508r22509
4545      : driver_device(mconfig, type, tag),
4646   m_maincpu(*this, "maincpu"),
4747   m_framecnt(0),
48   m_beeper(*this, BEEPER_TAG),
48   m_beeper(*this, "beeper"),
4949   m_cass(*this, "cassette"),
5050   m_p_colorram(*this, "colorram"),
5151   m_p_videoram(*this, "videoram"){ }
r22508r22509
252252   MCFG_SPEAKER_STANDARD_MONO("mono")
253253   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
254254   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
255   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
255   MCFG_SOUND_ADD("beeper", BEEP, 0)
256256   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
257257
258258   /* Devices */
trunk/src/mess/drivers/pc4.c
r22508r22509
233233
234234   /* sound hardware */
235235   MCFG_SPEAKER_STANDARD_MONO( "mono" )
236   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
236   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
237237   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
238238
239239   MCFG_RP5C01_ADD("rtc", XTAL_32_768kHz, rtc_intf)
trunk/src/mess/drivers/vtech1.c
r22508r22509
161161         m_speaker(*this, "speaker"),
162162         m_cassette(*this, "cassette"),
163163         m_videoram(*this, "videoram"),
164      m_maincpu(*this, "maincpu") { }
164      m_maincpu(*this, "maincpu"),
165      m_ram(*this, RAM_TAG) { }
165166
166167   /* devices */
167168   required_device<mc6847_base_device> m_mc6847;
168169   optional_device<speaker_sound_device> m_speaker;
169170   optional_device<cassette_image_device> m_cassette;
170171
171   UINT8 *m_ram;
172   UINT8 *m_ram_pointer;
172173   UINT32 m_ram_size;
173174   required_shared_ptr<UINT8> m_videoram;
174175
r22508r22509
204205   void vtech1_get_track();
205206   void vtech1_put_track();
206207   required_device<cpu_device> m_maincpu;
208   required_device<ram_device> m_ram;
207209};
208210
209211
r22508r22509
239241   }
240242
241243   /* write it to ram */
242   image.fread( &m_ram[start - 0x7800], size);
244   image.fread( &m_ram_pointer[start - 0x7800], size);
243245
244246   /* patch variables depending on snapshot type */
245247   switch (header[21])
r22508r22509
629631   int id;
630632
631633   /* ram */
632   m_ram = machine().device<ram_device>(RAM_TAG)->pointer();
633   m_ram_size = machine().device<ram_device>(RAM_TAG)->size();
634   m_ram_pointer = m_ram->pointer();
635   m_ram_size = m_ram->size();
634636
635637   /* setup memory banking */
636   membank("bank1")->set_base(m_ram);
638   membank("bank1")->set_base(m_ram_pointer);
637639
638640   /* 16k memory expansion? */
639641   if (m_ram_size == 18*1024 || m_ram_size == 22*1024 || m_ram_size == 32*1024)
640642   {
641643      offs_t base = 0x7800 + (m_ram_size - 0x4000);
642644      prg.install_readwrite_bank(base, base + 0x3fff, "bank2");
643      membank("bank2")->set_base(m_ram + base - 0x7800);
645      membank("bank2")->set_base(m_ram_pointer + base - 0x7800);
644646   }
645647
646648   /* 64k expansion? */
r22508r22509
648650   {
649651      /* install fixed first bank */
650652      prg.install_readwrite_bank(0x8000, 0xbfff, "bank2");
651      membank("bank2")->set_base(m_ram + 0x800);
653      membank("bank2")->set_base(m_ram_pointer + 0x800);
652654
653655      /* install the others, dynamically banked in */
654656      prg.install_readwrite_bank(0xc000, 0xffff, "bank3");
655      membank("bank3")->configure_entries(0, (m_ram_size - 0x4800) / 0x4000, m_ram + 0x4800, 0x4000);
657      membank("bank3")->configure_entries(0, (m_ram_size - 0x4800) / 0x4000, m_ram_pointer + 0x4800, 0x4000);
656658      membank("bank3")->set_entry(0);
657659   }
658660
trunk/src/mess/drivers/jr100.c
r22508r22509
3131      m_vram(*this, "vram"),
3232      m_via(*this, "via"),
3333      m_cassette(*this, "cassette"),
34      m_beeper(*this, BEEPER_TAG),
34      m_beeper(*this, "beeper"),
3535      m_speaker(*this, "speaker"),
3636      m_region_maincpu(*this, "maincpu"),
3737      m_line0(*this, "LINE0"),
r22508r22509
413413   MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
414414   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
415415
416   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
416   MCFG_SOUND_ADD("beeper", BEEP, 0)
417417   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
418418
419419   MCFG_CASSETTE_ADD( "cassette", jr100_cassette_interface )
trunk/src/mess/drivers/rex6000.c
r22508r22509
6161      : driver_device(mconfig, type, tag),
6262         m_maincpu(*this, "maincpu"),
6363         m_ram(*this, RAM_TAG),
64         m_beep(*this, BEEPER_TAG)
64         m_beep(*this, "beeper")
6565      { }
6666
6767   required_device<cpu_device> m_maincpu;
r22508r22509
684684
685685   /* sound hardware */
686686   MCFG_SPEAKER_STANDARD_MONO( "mono" )
687   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
687   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
688688   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
689689MACHINE_CONFIG_END
690690
trunk/src/mess/drivers/vt320.c
r22508r22509
1616public:
1717   vt320_state(const machine_config &mconfig, device_type type, const char *tag)
1818      : driver_device(mconfig, type, tag) ,
19      m_maincpu(*this, "maincpu") { }
19      m_maincpu(*this, "maincpu"),
20      m_ram(*this, RAM_TAG) { }
2021
2122   virtual void machine_reset();
2223   virtual void video_start();
2324   UINT32 screen_update_vt320(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
2425   required_device<cpu_device> m_maincpu;
26   required_device<ram_device> m_ram;
2527};
2628
2729/*
r22508r22509
6466
6567void vt320_state::machine_reset()
6668{
67   memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,16*1024);
69   memset(m_ram->pointer(),0,16*1024);
6870}
6971
7072void vt320_state::video_start()
trunk/src/mess/drivers/comx35.c
r22508r22509
3737    image_fread_memory - read image to memory
3838-------------------------------------------------*/
3939
40static void image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count)
40void comx35_state::image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count)
4141{
42   UINT8 *ram = image.device().machine().device<ram_device>(RAM_TAG)->pointer() + (addr - 0x4000);
42   UINT8 *ram = m_ram->pointer() + (addr - 0x4000);
4343
4444   image.fread(ram, count);
4545}
r22508r22509
5555   UINT8 header[16] = {0};
5656   int size = image.length();
5757
58   if (size > machine().device<ram_device>(RAM_TAG)->size())
58   if (size > m_ram->size())
5959   {
6060      return IMAGE_INIT_FAIL;
6161   }
trunk/src/mess/drivers/a5105.c
r22508r22509
4040         m_maincpu(*this, "maincpu"),
4141         m_hgdc(*this, "upd7220"),
4242         m_cass(*this, "cassette"),
43         m_beep(*this, BEEPER_TAG),
43         m_beep(*this, "beeper"),
4444         m_fdc(*this, "upd765a"),
4545         m_floppy0(*this, "upd765a:0"),
4646         m_floppy1(*this, "upd765a:1"),
4747         m_floppy2(*this, "upd765a:2"),
4848         m_floppy3(*this, "upd765a:3"),
49         m_video_ram(*this, "video_ram")
49         m_video_ram(*this, "video_ram"),
50         m_ram(*this, RAM_TAG)
5051      { }
5152
5253   required_device<cpu_device> m_maincpu;
r22508r22509
8081   virtual void video_start();
8182   virtual void palette_init();
8283   DECLARE_FLOPPY_FORMATS( floppy_formats );
84   required_device<ram_device> m_ram;
8385};
8486
8587/* TODO */
r22508r22509
484486   a5105_ab_w(space, 0, 9); // turn motor off
485487   m_beep->set_frequency(500);
486488
487   m_ram_base = (UINT8*)machine().device<ram_device>(RAM_TAG)->pointer();
489   m_ram_base = (UINT8*)m_ram->pointer();
488490   m_rom_base = (UINT8*)memregion("maincpu")->base();
489491
490492   membank("bank1")->set_base(m_rom_base);
r22508r22509
601603   MCFG_SPEAKER_STANDARD_MONO("mono")
602604   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
603605   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
604   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
606   MCFG_SOUND_ADD("beeper", BEEP, 0)
605607   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
606608
607609   /* Devices */
trunk/src/mess/drivers/fmtowns.c
r22508r22509
25962596   m_towns_cd.read_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(towns_state::towns_cdrom_read_byte),this), (void*)machine().device("dma_1"));
25972597
25982598   m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(towns_state::towns_irq_callback),this));
2599   m_maincpu->space(AS_PROGRAM).install_ram(0x100000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,NULL);
2599   m_maincpu->space(AS_PROGRAM).install_ram(0x100000,m_ram->size()-1,0xffffffff,0,NULL);
26002600
26012601}
26022602
r22508r22509
26162616   m_pic_master = machine().device("pic8259_master");
26172617   m_pic_slave = machine().device("pic8259_slave");
26182618   m_pit = machine().device("pit");
2619   m_messram = machine().device<ram_device>(RAM_TAG);
2619   m_messram = m_ram;
26202620   m_cdrom = machine().device<cdrom_image_device>("cdrom");
26212621   m_cdda = machine().device("cdda");
26222622   m_scsi = machine().device<fmscsi_device>("scsi:fm");
2623   m_ram = machine().device<ram_device>(RAM_TAG);
2623   m_ram = m_ram;
26242624   m_ftimer = 0x00;
26252625   m_freerun_timer = 0x00;
26262626   m_nmi_mask = 0x00;
trunk/src/mess/drivers/h8.c
r22508r22509
2828      : driver_device(mconfig, type, tag),
2929   m_maincpu(*this, "maincpu"),
3030   //m_cass(*this, "cassette"),
31   m_beep(*this, BEEPER_TAG)
31   m_beep(*this, "beeper")
3232   { }
3333
3434   required_device<cpu_device> m_maincpu;
r22508r22509
232232
233233   /* sound hardware */
234234   MCFG_SPEAKER_STANDARD_MONO("mono")
235   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
235   MCFG_SOUND_ADD("beeper", BEEP, 0)
236236   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
237237MACHINE_CONFIG_END
238238
trunk/src/mess/drivers/pcw16.c
r22508r22509
842842      /* bleeper on */
843843      case 0x0b:
844844      {
845         m_speaker->set_state(1);
845         m_beeper->set_state(1);
846846      }
847847      break;
848848
849849      /* bleeper off */
850850      case 0x0c:
851851      {
852         m_speaker->set_state(0);
852         m_beeper->set_state(0);
853853      }
854854      break;
855855
r22508r22509
10051005
10061006void pcw16_state::machine_start()
10071007{
1008   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
10091008   m_system_status = 0;
10101009   m_interrupt_counter = 0;
10111010
r22508r22509
10151014   at_keyboard_init(machine(), AT_KEYBOARD_TYPE_AT);
10161015   at_keyboard_set_scan_code_set(3);
10171016
1018   speaker->set_state(0);
1019   speaker->set_frequency(3750);
1017   m_beeper->set_state(0);
1018   m_beeper->set_frequency(3750);
10201019}
10211020
10221021static INPUT_PORTS_START(pcw16)
r22508r22509
10621061
10631062   /* sound hardware */
10641063   MCFG_SPEAKER_STANDARD_MONO("mono")
1065   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
1064   MCFG_SOUND_ADD("beeper", BEEP, 0)
10661065   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
10671066
10681067   /* printer */
trunk/src/mess/drivers/vg5k.c
r22508r22509
6666         m_ef9345(*this, "ef9345"),
6767         m_dac(*this, "dac"),
6868         m_printer(*this, "printer"),
69         m_cassette(*this, "cassette")
69         m_cassette(*this, "cassette"),
70         m_ram(*this, RAM_TAG)
7071      { }
7172
7273   required_device<cpu_device> m_maincpu;
r22508r22509
7475   required_device<dac_device> m_dac;
7576   required_device<printer_image_device> m_printer;
7677   required_device<cassette_image_device> m_cassette;
78   required_device<ram_device> m_ram;
7779
7880   offs_t m_ef9345_offset;
7981
r22508r22509
339341
340342   /* install expansion memory*/
341343   address_space &program = m_maincpu->space(AS_PROGRAM);
342   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
343   UINT16 ram_size = machine().device<ram_device>(RAM_TAG)->size();
344   UINT8 *ram = m_ram->pointer();
345   UINT16 ram_size = m_ram->size();
344346
345347   if (ram_size > 0x4000)
346348      program.install_ram(0x8000, 0x3fff + ram_size, ram);
trunk/src/mess/drivers/osborne1.c
r22508r22509
246246   MCFG_PALETTE_LENGTH( 3 )
247247
248248   MCFG_SPEAKER_STANDARD_MONO( "mono" )
249   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
249   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
250250   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
251251
252252   MCFG_PIA6821_ADD( "pia_0", osborne1_ieee_pia_config )
trunk/src/mess/drivers/pce220.c
r22508r22509
4242      : driver_device(mconfig, type, tag),
4343         m_maincpu(*this, "maincpu"),
4444         m_ram(*this, RAM_TAG),
45         m_beep(*this, BEEPER_TAG),
45         m_beep(*this, "beeper"),
4646         m_serial(*this, PCE220SERIAL_TAG)
4747      { }
4848
r22508r22509
939939
940940   /* sound hardware */
941941   MCFG_SPEAKER_STANDARD_MONO("mono")
942   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
942   MCFG_SOUND_ADD("beeper", BEEP, 0)
943943   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
944944
945945   MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))
r22508r22509
974974
975975   /* sound hardware */
976976   MCFG_SPEAKER_STANDARD_MONO("mono")
977   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
977   MCFG_SOUND_ADD("beeper", BEEP, 0)
978978   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
979979
980980   MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))
trunk/src/mess/drivers/jr200.c
r22508r22509
2929      m_cram(*this, "cram"),
3030      m_mn1271_ram(*this, "mn1271_ram"),
3131      m_maincpu(*this, "maincpu"),
32      m_beeper(*this, BEEPER_TAG),
32      m_beeper(*this, "beeper"),
3333      m_pcg(*this, "pcg"),
3434      m_gfx_rom(*this, "gfx_rom"),
3535      m_gfx_ram(*this, "gfx_ram"),
r22508r22509
559559
560560   // AY-8910 ?
561561
562   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
562   MCFG_SOUND_ADD("beeper", BEEP, 0)
563563   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
564564MACHINE_CONFIG_END
565565
trunk/src/mess/drivers/mz3500.c
r22508r22509
4646         m_hgdc1(*this, "upd7220_chr"),
4747         m_hgdc2(*this, "upd7220_gfx"),
4848         m_fdc(*this, "upd765a"),
49         m_video_ram(*this, "video_ram")
49         m_video_ram(*this, "video_ram"),
50         m_beeper(*this, "beeper")
5051   { }
5152
5253   // devices
r22508r22509
5657   required_device<upd7220_device> m_hgdc2;
5758   required_device<upd765a_device> m_fdc;
5859   required_shared_ptr<UINT8> m_video_ram;
60   required_device<beep_device> m_beeper;
61   
5962   UINT8 *m_ipl_rom;
6063   UINT8 *m_basic_rom;
6164   UINT8 *m_work_ram;
r22508r22509
661664   */
662665   //printf("%02x PC\n",data);
663666
664   machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x10);
667   m_beeper->set_state(data & 0x10);
665668
666669}
667670
r22508r22509
815818      }
816819   }
817820
818   machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
819   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
821   m_beeper->set_frequency(2400);
822   m_beeper->set_state(0);
820823}
821824
822825
r22508r22509
883886   /* sound hardware */
884887   MCFG_SPEAKER_STANDARD_MONO("mono")
885888
886   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
889   MCFG_SOUND_ADD("beeper", BEEP, 0)
887890   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
888891MACHINE_CONFIG_END
889892
trunk/src/mess/drivers/vk100.c
r22508r22509
159159      m_maincpu(*this, "maincpu"),
160160      m_screen(*this, "screen"),
161161      m_crtc(*this, "crtc"),
162      m_speaker(*this, BEEPER_TAG),
162      m_speaker(*this, "beeper"),
163163      m_uart(*this, "i8251"),
164164      //m_i8251_rx_timer(NULL),
165165      //m_i8251_tx_timer(NULL),
r22508r22509
10251025   MCFG_DEFAULT_LAYOUT( layout_vk100 )
10261026
10271027   MCFG_SPEAKER_STANDARD_MONO( "mono" )
1028   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
1028   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
10291029   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.25 )
10301030MACHINE_CONFIG_END
10311031
trunk/src/mess/drivers/bmjr.c
r22508r22509
2626      : driver_device(mconfig, type, tag),
2727   m_maincpu(*this, "maincpu"),
2828   m_cass(*this, "cassette"),
29   m_beep(*this, BEEPER_TAG)
29   m_beep(*this, "beeper")
3030   ,
3131      m_p_wram(*this, "p_wram"){ }
3232
r22508r22509
362362
363363   /* Audio */
364364   MCFG_SPEAKER_STANDARD_MONO("mono")
365   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
365   MCFG_SOUND_ADD("beeper", BEEP, 0)
366366   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
367367   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
368368   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
trunk/src/mess/drivers/lx800.c
r22508r22509
3131   lx800_state(const machine_config &mconfig, device_type type, const char *tag)
3232      : driver_device(mconfig, type, tag),
3333   m_maincpu(*this, "maincpu"),
34   m_beep(*this, BEEPER_TAG)
34   m_beep(*this, "beeper")
3535   { }
3636
3737   required_device<cpu_device> m_maincpu;
r22508r22509
268268
269269   /* audio hardware */
270270   MCFG_SPEAKER_STANDARD_MONO("mono")
271   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
271   MCFG_SOUND_ADD("beeper", BEEP, 0)
272272   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
273273
274274   /* gate array */
trunk/src/mess/drivers/zrt80.c
r22508r22509
3030   m_maincpu(*this, "maincpu"),
3131   m_crtc(*this, "crtc"),
3232   m_8250(*this, "ins8250"),
33   m_beep(*this, BEEPER_TAG),
33   m_beep(*this, "beeper"),
3434   m_p_videoram(*this, "videoram"){ }
3535
3636   required_device<cpu_device> m_maincpu;
r22508r22509
301301
302302   /* sound hardware */
303303   MCFG_SPEAKER_STANDARD_MONO("mono")
304   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
304   MCFG_SOUND_ADD("beeper", BEEP, 0)
305305   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
306306
307307   /* Devices */
trunk/src/mess/drivers/ace.c
r22508r22509
7676   unsigned char ace_repeat, ace_byte, loop;
7777   int done=0, ace_index=0x2000;
7878
79   if (machine().device<ram_device>(RAM_TAG)->size() < 16*1024)
79   if (m_ram->size() < 16*1024)
8080   {
8181      image.seterror(IMAGE_ERROR_INVALIDIMAGE, "At least 16KB RAM expansion required");
8282      image.message("At least 16KB RAM expansion required");
trunk/src/mess/drivers/sc2.c
r22508r22509
2020public:
2121   sc2_state(const machine_config &mconfig, device_type type, const char *tag)
2222      : driver_device(mconfig, type, tag),
23   m_beep(*this, BEEPER_TAG)
23   m_beep(*this, "beeper")
2424   ,
2525      m_maincpu(*this, "maincpu") { }
2626
r22508r22509
219219
220220   /* sound hardware */
221221   MCFG_SPEAKER_STANDARD_MONO( "mono" )
222   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
222   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
223223   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.50 )
224224MACHINE_CONFIG_END
225225
trunk/src/mess/drivers/psion.c
r22508r22509
490490
491491   /* sound hardware */
492492   MCFG_SPEAKER_STANDARD_MONO( "mono" )
493   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
493   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
494494   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
495495
496496   MCFG_NVRAM_HANDLER(psion)
trunk/src/mess/drivers/pcw.c
r22508r22509
239239      space.install_read_bank(block * 0x04000 + 0x0000, block * 0x04000 + 0x3fff,block_name);
240240//      LOG(("MEM: read block %i -> bank %i\n",block,bank));
241241   }
242   membank(block_name)->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + ((bank * 0x4000) % machine().device<ram_device>(RAM_TAG)->size()));
242   membank(block_name)->set_base(m_ram->pointer() + ((bank * 0x4000) % m_ram->size()));
243243}
244244
245245
r22508r22509
249249   char block_name[10];
250250
251251   sprintf(block_name,"bank%d",block+5);
252   membank(block_name)->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + ((bank * 0x4000) % machine().device<ram_device>(RAM_TAG)->size()));
252   membank(block_name)->set_base(m_ram->pointer() + ((bank * 0x4000) % m_ram->size()));
253253//  LOG(("MEM: write block %i -> bank %i\n",block,bank));
254254}
255255
r22508r22509
407407WRITE8_MEMBER(pcw_state::pcw_system_control_w)
408408{
409409   upd765a_device *fdc = machine().device<upd765a_device>("upd765");
410   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
411410   LOG(("SYSTEM CONTROL: %d\n",data));
412411
413412   switch (data)
r22508r22509
545544      /* beep on */
546545      case 11:
547546      {
548         speaker->set_state(1);
547         m_beeper->set_state(1);
549548      }
550549      break;
551550
552551      /* beep off */
553552      case 12:
554553      {
555         speaker->set_state(0);
554         m_beeper->set_state(0);
556555      }
557556      break;
558557
r22508r22509
995994
996995TIMER_CALLBACK_MEMBER(pcw_state::setup_beep)
997996{
998   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
999   speaker->set_state(0);
1000   speaker->set_frequency(3750);
997   m_beeper->set_state(0);
998   m_beeper->set_frequency(3750);
1001999}
10021000
10031001
r22508r22509
10281026   m_boot = 0;   // System starts up in bootstrap mode, disabled until it's possible to emulate it.
10291027
10301028   /* copy boot code into RAM - yes, it's skipping a step */
1031   memset(machine().device<ram_device>(RAM_TAG)->pointer(),0x00,machine().device<ram_device>(RAM_TAG)->size());
1029   memset(m_ram->pointer(),0x00,m_ram->size());
10321030   for(x=0;x<256;x++)
1033      machine().device<ram_device>(RAM_TAG)->pointer()[x+2] = code[x+0x300];
1031      m_ram->pointer()[x+2] = code[x+0x300];
10341032
10351033   /* and hack our way past the MCU side of the boot process */
10361034   code[0x01] = 0x40;
r22508r22509
12911289
12921290   /* sound hardware */
12931291   MCFG_SPEAKER_STANDARD_MONO("mono")
1294   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
1292   MCFG_SOUND_ADD("beeper", BEEP, 0)
12951293   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
12961294
12971295   MCFG_UPD765A_ADD("upd765", true, true)
trunk/src/mess/drivers/aquarius.c
r22508r22509
187187   {
188188      address_space &space = m_maincpu->space(AS_PROGRAM);
189189
190      space.install_readwrite_bank(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 0x1000 - 1, "bank1");
191      membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
190      space.install_readwrite_bank(0x4000, 0x4000 + m_ram->size() - 0x1000 - 1, "bank1");
191      membank("bank1")->set_base(m_ram->pointer());
192192   }
193193}
194194
trunk/src/mess/drivers/tvc.c
r22508r22509
621621   if (first_byte == 0x11)
622622   {
623623      image.fseek(0x90, SEEK_SET);
624      image.fread(machine().device<ram_device>(RAM_TAG)->pointer() + 0x19ef, image.length() - 0x90);
624      image.fread(m_ram->pointer() + 0x19ef, image.length() - 0x90);
625625      return IMAGE_INIT_PASS;
626626   }
627627   else
trunk/src/mess/drivers/fk1.c
r22508r22509
1919public:
2020   fk1_state(const machine_config &mconfig, device_type type, const char *tag)
2121      : driver_device(mconfig, type, tag),
22   m_maincpu(*this, "maincpu")
22      m_maincpu(*this, "maincpu"),
23      m_ram(*this, RAM_TAG)
2324   { }
2425
2526   required_device<cpu_device> m_maincpu;
27   required_device<ram_device> m_ram;
28   
2629   DECLARE_WRITE8_MEMBER(fk1_ppi_1_a_w);
2730   DECLARE_WRITE8_MEMBER(fk1_ppi_1_b_w);
2831   DECLARE_WRITE8_MEMBER(fk1_ppi_1_c_w);
r22508r22509
297300READ8_MEMBER( fk1_state::fk1_bank_ram_r )
298301{
299302   address_space &space_mem = m_maincpu->space(AS_PROGRAM);
300   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
303   UINT8 *ram = m_ram->pointer();
301304
302305   space_mem.install_write_bank(0x0000, 0x3fff, "bank1");
303306   membank("bank1")->set_base(ram);
r22508r22509
310313   address_space &space_mem = m_maincpu->space(AS_PROGRAM);
311314   space_mem.unmap_write(0x0000, 0x3fff);
312315   membank("bank1")->set_base(memregion("maincpu")->base());
313   membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x10000);
316   membank("bank2")->set_base(m_ram->pointer() + 0x10000);
314317   return 0;
315318}
316319
r22508r22509
421424void fk1_state::machine_reset()
422425{
423426   address_space &space = m_maincpu->space(AS_PROGRAM);
424   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
427   UINT8 *ram = m_ram->pointer();
425428
426429   space.unmap_write(0x0000, 0x3fff);
427430   membank("bank1")->set_base(memregion("maincpu")->base()); // ROM
r22508r22509
436439{
437440   UINT8 code;
438441   int y, x, b;
439   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
442   UINT8 *ram = m_ram->pointer();
440443
441444   for (x = 0; x < 64; x++)
442445   {
trunk/src/mess/drivers/portfoli.c
r22508r22509
762762   m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(portfolio_state::portfolio_int_ack),this));
763763
764764   /* memory expansions */
765   switch (machine().device<ram_device>(RAM_TAG)->size())
765   switch (m_ram->size())
766766   {
767767   case 128 * 1024:
768768      program.unmap_readwrite(0x1f000, 0x9efff);
trunk/src/mess/drivers/pb1000.c
r22508r22509
3131   pb1000_state(const machine_config &mconfig, device_type type, const char *tag)
3232      : driver_device(mconfig, type, tag),
3333         m_maincpu(*this, "maincpu"),
34         m_beep(*this, BEEPER_TAG),
34         m_beeper(*this, "beeper"),
3535         m_hd44352(*this, "hd44352")
3636      { }
3737
3838   required_device<hd61700_cpu_device> m_maincpu;
39   required_device<beep_device> m_beep;
39   required_device<beep_device> m_beeper;
4040   required_device<hd44352_device> m_hd44352;
4141
4242   emu_timer *m_kb_timer;
r22508r22509
443443
444444static void port_w(hd61700_cpu_device &device, UINT8 data)
445445{
446   device.machine().device<beep_device>(BEEPER_TAG)->set_state((BIT(data,7) ^ BIT(data,6)));
446   pb1000_state *state = device.machine().driver_data<pb1000_state>();
447   state->m_beeper->set_state((BIT(data,7) ^ BIT(data,6)));
447448   //printf("%x\n", data);
448449}
449450
r22508r22509
526527
527528   /* sound hardware */
528529   MCFG_SPEAKER_STANDARD_MONO( "mono" )
529   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
530   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
530531   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
531532MACHINE_CONFIG_END
532533
trunk/src/mess/drivers/mz2000.c
r22508r22509
4343      m_maincpu(*this, "maincpu"),
4444      m_mb8877a(*this, "mb8877a"),
4545      m_pit8253(*this, "pit"),
46      m_beeper(*this, BEEPER_TAG),
46      m_beeper(*this, "beeper"),
4747      m_region_tvram(*this, "tvram"),
4848      m_region_gvram(*this, "gvram"),
4949      m_region_chargen(*this, "chargen"),
r22508r22509
892892   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
893893   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
894894
895   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
895   MCFG_SOUND_ADD("beeper", BEEP, 0)
896896   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
897897MACHINE_CONFIG_END
898898
trunk/src/mess/drivers/qx10.c
r22508r22509
6464   m_fdc(*this, "upd765"),
6565   m_hgdc(*this, "upd7220"),
6666   m_rtc(*this, "rtc"),
67   m_vram_bank(0)
68   ,
69      m_maincpu(*this, "maincpu") { }
67   m_vram_bank(0),
68   m_maincpu(*this, "maincpu"),
69   m_ram(*this, RAM_TAG) { }
7070
7171   required_device<pit8253_device> m_pit_1;
7272   required_device<pit8253_device> m_pit_2;
r22508r22509
149149   DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed);
150150   IRQ_CALLBACK_MEMBER(irq_callback);
151151   required_device<cpu_device> m_maincpu;
152   required_device<ram_device> m_ram;
152153};
153154
154155static UPD7220_DISPLAY_PIXELS( hgdc_display_pixels )
r22508r22509
274275   }
275276   else
276277   {
277      membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + drambank*64*1024);
278      membank("bank1")->set_base(m_ram->pointer() + drambank*64*1024);
278279   }
279280   if (m_memcmos)
280281   {
r22508r22509
282283   }
283284   else
284285   {
285      membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + drambank*64*1024 + 32*1024);
286      membank("bank2")->set_base(m_ram->pointer() + drambank*64*1024 + 32*1024);
286287   }
287288}
288289
trunk/src/mess/drivers/nc.c
r22508r22509
347347
348348         mem_bank = mem_bank & m_membank_internal_ram_mask;
349349
350         addr = machine().device<ram_device>(RAM_TAG)->pointer() + (mem_bank<<14);
350         addr = m_ram->pointer() + (mem_bank<<14);
351351
352352         membank(bank1)->set_base(addr);
353353         membank(bank5)->set_base(addr);
r22508r22509
420420   if (m_file->read(&stored_size, sizeof(UINT32)) != sizeof(UINT32))
421421      stored_size = 0;
422422
423   if (stored_size > machine().device<ram_device>(RAM_TAG)->size())
424      restore_size = machine().device<ram_device>(RAM_TAG)->size();
423   if (stored_size > m_ram->size())
424      restore_size = m_ram->size();
425425   else
426426      restore_size = stored_size;
427427
428428   /* read as much as will fit into memory */
429   m_file->read(machine().device<ram_device>(RAM_TAG)->pointer(), restore_size);
429   m_file->read(m_ram->pointer(), restore_size);
430430   /* seek over remaining data */
431431   m_file->seek(SEEK_CUR,stored_size - restore_size);
432432}
r22508r22509
434434/* store a block of memory to the nvram file */
435435void nc_state::nc_common_store_memory_to_stream()
436436{
437   UINT32 size = machine().device<ram_device>(RAM_TAG)->size();
437   UINT32 size = m_ram->size();
438438   if (!m_file)
439439      return;
440440
r22508r22509
443443   m_file->write(&size, sizeof(UINT32));
444444
445445   /* write data block */
446   m_file->write(machine().device<ram_device>(RAM_TAG)->pointer(), size);
446   m_file->write(m_ram->pointer(), size);
447447}
448448
449449void nc_state::nc_common_open_stream_for_reading()
r22508r22509
660660   int on;
661661   int frequency;
662662   int period;
663   const char *beeper_device = NULL;
663   beep_device *beeper_device = NULL;
664664
665665   switch(channel)
666666   {
667667      case 0:
668         beeper_device = "beep.1";
668         beeper_device = m_beeper1;
669669         break;
670670      case 1:
671         beeper_device = "beep.2";
671         beeper_device = m_beeper2;
672672         break;
673673   }
674674
r22508r22509
681681   frequency = (int)(1000000.0f/((float)((period & 0x07fff)<<1) * 1.6276f));
682682
683683   /* set state */
684   machine().device<beep_device>(beeper_device)->set_state(on);
684   beeper_device->set_state(on);
685685   /* set frequency */
686   machine().device<beep_device>(beeper_device)->set_frequency(frequency);
686   beeper_device->set_frequency(frequency);
687687}
688688
689689WRITE8_MEMBER(nc_state::nc_sound_w)
trunk/src/mess/drivers/x07.c
r22508r22509
15091509
15101510   /* sound hardware */
15111511   MCFG_SPEAKER_STANDARD_MONO( "mono" )
1512   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
1512   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
15131513   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.50 )
15141514   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
15151515   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
trunk/src/mess/drivers/mephisto.c
r22508r22509
7474   mephisto_state(const machine_config &mconfig, device_type type, const char *tag)
7575      : mboard_state(mconfig, type, tag)
7676      , m_maincpu(*this, "maincpu")
77      , m_beep(*this, BEEPER_TAG)
77      , m_beep(*this, "beeper")
7878      , m_key1_0(*this, "KEY1_0")
7979      , m_key1_1(*this, "KEY1_1")
8080      , m_key1_2(*this, "KEY1_2")
r22508r22509
459459
460460   /* sound hardware */
461461   MCFG_SPEAKER_STANDARD_MONO("mono")
462   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
462   MCFG_SOUND_ADD("beeper", BEEP, 0)
463463   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
464464
465465   MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", mephisto_state, update_nmi, attotime::from_hz(600))
trunk/src/mess/drivers/bml3.c
r22508r22509
4949   m_maincpu(*this, "maincpu"),
5050   m_crtc(*this, "crtc"),
5151   //m_cass(*this, "cassette"),
52   m_beep(*this, BEEPER_TAG)
52   m_beep(*this, "beeper")
5353   { }
5454
5555   required_device<cpu_device> m_maincpu;
r22508r22509
918918
919919   /* Audio */
920920   MCFG_SPEAKER_STANDARD_MONO("mono")
921   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
921   MCFG_SOUND_ADD("beeper", BEEP, 0)
922922   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
923923
924924   MCFG_SOUND_ADD("ym2203", YM2203, 2000000) //unknown clock / divider
trunk/src/mess/drivers/mstation.c
r22508r22509
3636public:
3737   mstation_state(const machine_config &mconfig, device_type type, const char *tag)
3838      : driver_device(mconfig, type, tag),
39         m_maincpu(*this, "maincpu")
39         m_maincpu(*this, "maincpu"),
40         m_ram(*this, RAM_TAG)
4041      { }
4142
4243   required_device<cpu_device> m_maincpu;
44   required_device<ram_device> m_ram;
4345
4446   intelfsh8_device *m_flashes[2];
4547   UINT8 m_bank1[2];
r22508r22509
454456
455457   // allocate the videoram
456458   m_vram = (UINT8*)machine().memory().region_alloc( "vram", 9600, 1, ENDIANNESS_LITTLE )->base();
457   m_ram_base = (UINT8*)machine().device<ram_device>(RAM_TAG)->pointer();
459   m_ram_base = (UINT8*)m_ram->pointer();
458460
459461   // map firsh RAM bank at 0xc000-0xffff
460462   membank("sysram")->set_base(m_ram_base);
trunk/src/mess/drivers/supercon.c
r22508r22509
2929   supercon_state(const machine_config &mconfig, device_type type, const char *tag)
3030      : driver_device(mconfig, type, tag),
3131      m_maincpu(*this, "maincpu"),
32      m_beep(*this, BEEPER_TAG),
32      m_beep(*this, "beeper"),
3333      m_b_white(*this, "B_WHITE"),
3434      m_b_black(*this, "B_BLACK"),
3535      m_b_clr(*this, "B_CLR"),
r22508r22509
793793
794794   /* sound hardware */
795795   MCFG_SPEAKER_STANDARD_MONO("mono")
796   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
796   MCFG_SOUND_ADD("beeper", BEEP, 0)
797797   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
798798
799799   MCFG_TIMER_DRIVER_ADD_PERIODIC("artwork_timer", supercon_state, update_artwork, attotime::from_hz(20))
trunk/src/mess/drivers/v1050.c
r22508r22509
10121012   m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(v1050_state::v1050_int_ack),this));
10131013
10141014   // setup memory banking
1015   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
1015   UINT8 *ram = m_ram->pointer();
10161016
10171017   membank("bank1")->configure_entries(0, 2, ram, 0x10000);
10181018   membank("bank1")->configure_entry(2, ram + 0x1c000);
trunk/src/mess/drivers/p8k.c
r22508r22509
792792   /* sound hardware */
793793   MCFG_SPEAKER_STANDARD_MONO("mono")
794794
795   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
795   MCFG_SOUND_ADD("beeper", BEEP, 0)
796796   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
797797
798798   /* video hardware */
r22508r22509
819819
820820   /* sound hardware */
821821   MCFG_SPEAKER_STANDARD_MONO("mono")
822   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
822   MCFG_SOUND_ADD("beeper", BEEP, 0)
823823   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
824824
825825   /* video hardware */
trunk/src/mess/drivers/alphatro.c
r22508r22509
4040   m_crtc(*this, "crtc"),
4141   m_usart(*this, "usart"),
4242   m_cass(*this, "cassette"),
43   m_beep(*this, BEEPER_TAG),
43   m_beep(*this, "beeper"),
4444   m_p_ram(*this, "p_ram"),
4545   m_p_videoram(*this, "p_videoram"){ }
4646
r22508r22509
437437
438438   /* sound hardware */
439439   MCFG_SPEAKER_STANDARD_MONO("mono")
440   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
440   MCFG_SOUND_ADD("beeper", BEEP, 0)
441441   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
442442   MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
443443   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
trunk/src/mess/drivers/rt1715.c
r22508r22509
2727public:
2828   rt1715_state(const machine_config &mconfig, device_type type, const char *tag)
2929      : driver_device(mconfig, type, tag) ,
30      m_maincpu(*this, "maincpu") { }
30      m_maincpu(*this, "maincpu"),
31      m_ram(*this, RAM_TAG) { }
3132
3233   int m_led1_val;
3334   int m_led2_val;
r22508r22509
4142   virtual void machine_reset();
4243   virtual void palette_init();
4344   required_device<cpu_device> m_maincpu;
45   required_device<ram_device> m_ram;
4446};
4547
4648
r22508r22509
109111
110112void rt1715_state::machine_start()
111113{
112   membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x0800);
113   membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
114   membank("bank2")->set_base(m_ram->pointer() + 0x0800);
115   membank("bank3")->set_base(m_ram->pointer());
114116}
115117
116118void rt1715_state::machine_reset()
r22508r22509
124126   logerror("%s: rt1715_set_bank %02x\n", machine().describe_context(), data);
125127
126128   /* disable ROM, enable RAM */
127   membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
129   membank("bank1")->set_base(m_ram->pointer());
128130}
129131
130132/***************************************************************************
trunk/src/mess/drivers/glasgow.c
r22508r22509
5959   glasgow_state(const machine_config &mconfig, device_type type, const char *tag)
6060      : mboard_state(mconfig, type, tag),
6161   m_maincpu(*this, "maincpu"),
62   m_beep(*this, BEEPER_TAG)
62   m_beep(*this, "beeper")
6363   { }
6464
6565   required_device<cpu_device> m_maincpu;
r22508r22509
511511   MCFG_CPU_ADD("maincpu", M68000, 12000000)
512512   MCFG_CPU_PROGRAM_MAP(glasgow_mem)
513513   MCFG_SPEAKER_STANDARD_MONO("mono")
514   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
514   MCFG_SOUND_ADD("beeper", BEEP, 0)
515515   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
516516
517517   MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", glasgow_state, update_nmi, attotime::from_hz(50))
trunk/src/mess/drivers/thomson.c
r22508r22509
317317/* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */
318318/* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
319319
320/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
320/* RAM mapping:
321321   0x0000 - 0x3fff: 16 KB video RAM (actually 8 K x 8 bits + 8 K x 6 bits)
322322   0x4000 - 0x5fff:  8 KB base RAM
323323   0x6000 - 0x9fff: 16 KB extended RAM
r22508r22509
784784/* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */
785785/* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
786786
787/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
787/* RAM mapping:
788788   0x00000 - 0x03fff: 16 KB video RAM
789789   0x04000 - 0x07fff: 16 KB unbanked base RAM
790790   0x08000 - 0x1ffff: 6 * 16 KB banked extended RAM
r22508r22509
975975/* 0x10000 - 0x1ffff: 16 KB integrated BASIC / 64 KB external cartridge */
976976/* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
977977
978/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
978/* RAM mapping:
979979   0x00000 - 0x03fff: 16 KB video RAM
980980   0x04000 - 0x0bfff: 32 KB unbanked base RAM
981981   0x0c000 - 0x1bfff: 4 * 16 KB bank extended RAM
r22508r22509
11821182/* 0x20000 - 0x3ffff: 128 KB internal software ROM */
11831183/* 0x40000 - 0x447ff: 18  KB external floppy / network ROM controllers */
11841184
1185/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
1185/* RAM mapping:
11861186   0x00000 - 0x03fff: 16 KB video RAM
11871187   0x04000 - 0x07fff: 16 KB unbanked base RAM
11881188   0x08000 - 0x2ffff: 10 * 16 KB banked extended RAM
r22508r22509
15071507/* 0x30000 - 0x33fff: 16 KB BIOS ROM */
15081508/* 0x34000 - 0x387ff: 18 KB external floppy / network ROM controllers */
15091509
1510/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 512 KB flat (including video) */
1510/* RAM mapping: 512 KB flat (including video) */
15111511
15121512ADDRESS_MAP_END
15131513
r22508r22509
17031703/* 0x30000 - 0x33fff: 16 KB BIOS ROM */
17041704/* 0x34000 - 0x387ff: 18 KB external floppy / network ROM controllers */
17051705
1706/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 512 KB flat (including video) */
1706/* RAM mapping: 512 KB flat (including video) */
17071707
17081708ADDRESS_MAP_END
17091709
r22508r22509
18631863/* 0x20000 - 0x2ffff: 64 KB BIOS ROM */
18641864/* 0x30000 - 0x347ff: 16 KB floppy / network ROM controllers */
18651865
1866/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 128 KB flat (including video) */
1866/* RAM mapping: 128 KB flat (including video) */
18671867
18681868ADDRESS_MAP_END
18691869
r22508r22509
21782178/* 0x20000 - 0x2ffff: 64 KB BIOS ROM */
21792179/* 0x30000 - 0x347ff: 16 KB floppy / network ROM controllers */
21802180
2181/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 128 KB flat (including video) */
2181/* RAM mapping: 128 KB flat (including video) */
21822182
21832183ADDRESS_MAP_END
21842184
trunk/src/mess/drivers/studio2.c
r22508r22509
446446
447447WRITE_LINE_MEMBER( studio2_state::q_w )
448448{
449   m_speaker->set_state(state);
449   m_beeper->set_state(state);
450450}
451451
452452static COSMAC_INTERFACE( studio2_cosmac_intf )
r22508r22509
550550
551551   /* sound hardware */
552552   MCFG_SPEAKER_STANDARD_MONO("mono")
553   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
553   MCFG_SOUND_ADD("beeper", BEEP, 0)
554554   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
555555
556556   MCFG_FRAGMENT_ADD( studio2_cartslot )
r22508r22509
569569
570570   /* sound hardware */
571571   MCFG_SPEAKER_STANDARD_MONO("mono")
572   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
572   MCFG_SOUND_ADD("beeper", BEEP, 0)
573573   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
574574
575575   MCFG_FRAGMENT_ADD( studio2_cartslot )
r22508r22509
588588
589589   /* sound hardware */
590590   MCFG_SPEAKER_STANDARD_MONO("mono")
591   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
591   MCFG_SOUND_ADD("beeper", BEEP, 0)
592592   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
593593
594594   MCFG_CDP1864_ADD(CDP1864_TAG, CDP1864_CLOCK, mpt02_cdp1864_intf)
r22508r22509
629629
630630TIMER_CALLBACK_MEMBER(studio2_state::setup_beep)
631631{
632   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
633   speaker->set_state(0);
634   speaker->set_frequency(300);
632   m_beeper->set_state(0);
633   m_beeper->set_frequency(300);
635634}
636635
637636DRIVER_INIT_MEMBER(studio2_state,studio2)
trunk/src/mess/drivers/tmc1800.c
r22508r22509
794794   // sound hardware
795795   MCFG_SPEAKER_STANDARD_MONO("mono")
796796
797   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
797   MCFG_SOUND_ADD("beeper", BEEP, 0)
798798   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
799799
800800   // devices
r22508r22509
820820   // sound hardware
821821   MCFG_SPEAKER_STANDARD_MONO("mono")
822822
823   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
823   MCFG_SOUND_ADD("beeper", BEEP, 0)
824824   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
825825
826826   // devices
r22508r22509
907907
908908TIMER_CALLBACK_MEMBER(tmc1800_state::setup_beep)
909909{
910   beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
911   speaker->set_state(0);
912   speaker->set_frequency(0);
910   m_beeper->set_state(0);
911   m_beeper->set_frequency(0);
913912}
914913
915914DRIVER_INIT_MEMBER(tmc1800_state,tmc1800)
trunk/src/mess/drivers/x68k.c
r22508r22509
14661466//  if(offset == 0x5a/2)  // 0x5a should be 0 if no SASI HDs are present.
14671467//      return 0x0000;
14681468   if(offset == 0x08/2)
1469      return machine().device<ram_device>(RAM_TAG)->size() >> 16;  // RAM size
1469      return m_ram->size() >> 16;  // RAM size
14701470#if 0
14711471   if(offset == 0x46/2)
14721472      return 0x0024;
r22508r22509
14811481READ32_MEMBER(x68k_state::x68k_sram32_r)
14821482{
14831483   if(offset == 0x08/4)
1484      return (machine().device<ram_device>(RAM_TAG)->size() & 0xffff0000);  // RAM size
1484      return (m_ram->size() & 0xffff0000);  // RAM size
14851485#if 0
14861486   if(offset == 0x46/2)
14871487      return 0x0024;
r22508r22509
16001600{
16011601   int val = param;
16021602   int v;
1603   UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
1603   UINT8 *ram = m_ram->pointer();
16041604
16051605   if(strcmp(machine().system().name,"x68030") == 0)
16061606      v = 0x0b;
r22508r22509
24102410   UINT8* romdata = memregion("user2")->base();
24112411   attotime irq_time;
24122412
2413   memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,machine().device<ram_device>(RAM_TAG)->size());
2414   memcpy(machine().device<ram_device>(RAM_TAG)->pointer(),romdata,8);
2413   memset(m_ram->pointer(),0,m_ram->size());
2414   memcpy(m_ram->pointer(),romdata,8);
24152415
24162416   // init keyboard
24172417   m_keyboard.delay = 500;  // 3*100+200
r22508r22509
24682468   m_spriteram = (UINT16*)(*memregion("user1"));
24692469   space.install_read_handler(0x000000,0xbffffb,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_emptyram_r),this));
24702470   space.install_write_handler(0x000000,0xbffffb,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_emptyram_w),this));
2471   space.install_readwrite_bank(0x000000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,"bank1");
2472   membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
2471   space.install_readwrite_bank(0x000000,m_ram->size()-1,0xffffffff,0,"bank1");
2472   membank("bank1")->set_base(m_ram->pointer());
24732473   space.install_read_handler(0xc00000,0xdfffff,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_gvram_r),this));
24742474   space.install_write_handler(0xc00000,0xdfffff,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_gvram_w),this));
24752475   membank("bank2")->set_base(m_gvram16);  // so that code in VRAM is executable - needed for Terra Cresta
r22508r22509
25152515   m_spriteram = (UINT16*)(*memregion("user1"));
25162516   space.install_read_handler(0x000000,0xbffffb,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_rom0_r),this),0xffffffff);
25172517   space.install_write_handler(0x000000,0xbffffb,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_rom0_w),this),0xffffffff);
2518   space.install_readwrite_bank(0x000000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,"bank1");
2519   membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
2518   space.install_readwrite_bank(0x000000,m_ram->size()-1,0xffffffff,0,"bank1");
2519   membank("bank1")->set_base(m_ram->pointer());
25202520   space.install_read_handler(0xc00000,0xdfffff,0xffffffff,0,read32_delegate(FUNC(x68k_state::x68k_gvram32_r),this));
25212521   space.install_write_handler(0xc00000,0xdfffff,0xffffffff,0,write32_delegate(FUNC(x68k_state::x68k_gvram32_w),this));
25222522   membank("bank2")->set_base(m_gvram32);  // so that code in VRAM is executable - needed for Terra Cresta
trunk/src/mess/drivers/h19.c
r22508r22509
4949         m_maincpu(*this, "maincpu"),
5050         m_crtc(*this, "crtc"),
5151         m_ace(*this, "ins8250"),
52         m_beep(*this, BEEPER_TAG),
52         m_beep(*this, "beeper"),
5353         m_p_videoram(*this, "p_videoram")
5454   { }
5555
r22508r22509
419419
420420   /* sound hardware */
421421   MCFG_SPEAKER_STANDARD_MONO("mono")
422   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
422   MCFG_SOUND_ADD("beeper", BEEP, 0)
423423   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
424424MACHINE_CONFIG_END
425425
trunk/src/mess/drivers/rx78.c
r22508r22509
5252public:
5353   rx78_state(const machine_config &mconfig, device_type type, const char *tag)
5454      : driver_device(mconfig, type, tag),
55   m_maincpu(*this, "maincpu"),
56   m_cass(*this, "cassette")
55      m_maincpu(*this, "maincpu"),
56      m_cass(*this, "cassette"),
57      m_ram(*this, RAM_TAG)
5758   { }
5859
5960   DECLARE_READ8_MEMBER( key_r );
r22508r22509
7879   DECLARE_DRIVER_INIT(rx78);
7980   required_device<cpu_device> m_maincpu;
8081   required_device<cassette_image_device> m_cass;
82   required_device<ram_device> m_ram;
8183   DECLARE_DEVICE_IMAGE_LOAD_MEMBER( rx78_cart );
8284};
8385
r22508r22509
514516
515517DRIVER_INIT_MEMBER(rx78_state,rx78)
516518{
517   UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
519   UINT32 ram_size = m_ram->size();
518520   address_space &prg = m_maincpu->space(AS_PROGRAM);
519521
520522   if(ram_size == 0x4000)
trunk/src/mess/drivers/vt100.c
r22508r22509
3333      : driver_device(mconfig, type, tag),
3434      m_maincpu(*this, "maincpu"),
3535      m_crtc(*this, "vt100_video"),
36      m_speaker(*this, BEEPER_TAG),
36      m_speaker(*this, "beeper"),
3737      m_uart(*this, "i8251"),
3838      m_p_ram(*this, "p_ram")
3939      { }
r22508r22509
454454
455455   /* audio hardware */
456456   MCFG_SPEAKER_STANDARD_MONO("mono")
457   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
457   MCFG_SOUND_ADD("beeper", BEEP, 0)
458458   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
459459
460460   MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", vt100_state, keyboard_callback, attotime::from_hz(800))
trunk/src/mess/drivers/electron.c
r22508r22509
192192   MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
193193
194194   MCFG_SPEAKER_STANDARD_MONO( "mono" )
195   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
195   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
196196   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
197197
198198   MCFG_CASSETTE_ADD( "cassette", electron_cassette_interface )
trunk/src/mess/drivers/ti990_10.c
r22508r22509
238238
239239   /* 911 VDT has a beep tone generator */
240240   MCFG_SPEAKER_STANDARD_MONO("mono")
241   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
241   MCFG_SOUND_ADD("beeper", BEEP, 0)
242242   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
243243
244244   MCFG_FRAGMENT_ADD( ti990_hdc )
trunk/src/mess/drivers/bigbord2.c
r22508r22509
9898   m_floppy1(*this, FLOPPY_1),
9999   m_floppy2(*this, FLOPPY_2),
100100   m_floppy3(*this, FLOPPY_3),
101   m_beeper(*this, BEEPER_TAG)
101   m_beeper(*this, "beeper")
102102   { }
103103
104104   virtual void machine_start();
r22508r22509
712712
713713   /* sound hardware */
714714   MCFG_SPEAKER_STANDARD_MONO("mono")
715   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
715   MCFG_SOUND_ADD("beeper", BEEP, 0)
716716   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
717717MACHINE_CONFIG_END
718718
trunk/src/mess/drivers/pc2000.c
r22508r22509
2828      : driver_device(mconfig, type, tag),
2929         m_maincpu(*this, "maincpu"),
3030         m_lcdc(*this, "hd44780"),
31         m_beep(*this, BEEPER_TAG),
31         m_beep(*this, "beeper"),
3232         m_bank1(*this, "bank1"),
3333         m_bank2(*this, "bank2")
3434      { }
r22508r22509
560560
561561   /* sound hardware */
562562   MCFG_SPEAKER_STANDARD_MONO( "mono" )
563   MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
563   MCFG_SOUND_ADD( "beeper", BEEP, 0 )
564564   MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
565565
566566   MCFG_CARTSLOT_ADD("cart")
trunk/src/mess/drivers/kaypro.c
r22508r22509
263263
264264   /* sound hardware */
265265   MCFG_SPEAKER_STANDARD_MONO("mono")
266   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
266   MCFG_SOUND_ADD("beeper", BEEP, 0)
267267   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
268268
269269   /* devices */
r22508r22509
308308
309309   /* sound hardware */
310310   MCFG_SPEAKER_STANDARD_MONO("mono")
311   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
311   MCFG_SOUND_ADD("beeper", BEEP, 0)
312312   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
313313
314314   /* devices */
trunk/src/mame/drivers/deshoros.c
r22508r22509
3636public:
3737   destiny_state(const machine_config &mconfig, device_type type, const char *tag)
3838      : driver_device(mconfig, type, tag),
39      m_maincpu(*this, "maincpu")
39      m_maincpu(*this, "maincpu"),
40      m_beeper(*this, "beeper")
4041   { }
4142
4243   required_device<cpu_device> m_maincpu;
44   required_device<beep_device> m_beeper;
4345
4446   char m_led_array[21];
4547
r22508r22509
158160WRITE8_MEMBER(destiny_state::sound_w)
159161{
160162   // a0: sound on/off
161   machine().device<beep_device>(BEEPER_TAG)->set_state(~offset & 1);
163   m_beeper->set_state(~offset & 1);
162164}
163165
164166static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, destiny_state )
r22508r22509
247249
248250void destiny_state::machine_start()
249251{
250   machine().device<beep_device>(BEEPER_TAG)->set_frequency(800); // TODO: determine exact frequency thru schematics
251   machine().device<beep_device>(BEEPER_TAG)->set_state(0);
252   m_beeper->set_frequency(800); // TODO: determine exact frequency thru schematics
253   m_beeper->set_state(0);
252254}
253255
254256void destiny_state::machine_reset()
r22508r22509
275277
276278   /* sound hardware */
277279   MCFG_SPEAKER_STANDARD_MONO("mono")
278   MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
280   MCFG_SOUND_ADD("beeper", BEEP, 0)
279281   MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
280282MACHINE_CONFIG_END
281283
trunk/src/mame/drivers/dlair.c
r22508r22509
5454         m_pr7820(*this, "ld_pr7820"),
5555         m_22vp932(*this, "ld_22vp932") ,
5656      m_videoram(*this, "videoram"),
57      m_maincpu(*this, "maincpu") { }
57      m_maincpu(*this, "maincpu"),
58      m_beeper(*this, "beeper")    { }
5859
5960   void laserdisc_data_w(UINT8 data)
6061   {
r22508r22509
120121   DECLARE_WRITE16_MEMBER(serial_transmit);
121122   DECLARE_READ16_MEMBER(serial_receive);
122123   required_device<cpu_device> m_maincpu;
124   optional_device<beep_device> m_beeper;
123125};
124126
125127
r22508r22509
284286INTERRUPT_GEN_MEMBER(dlair_state::vblank_callback)
285287{
286288   /* also update the speaker on the European version */
287   beep_device *beep = machine().device<beep_device>("beep");
288   if (beep != NULL)
289   if (m_beeper != NULL)
289290   {
290291      z80ctc_device *ctc = machine().device<z80ctc_device>("ctc");
291      beep->set_state(1);
292      beep->set_frequency(ATTOSECONDS_TO_HZ(ctc->period(0).attoseconds));
292      m_beeper->set_state(1);
293      m_beeper->set_frequency(ATTOSECONDS_TO_HZ(ctc->period(0).attoseconds));
293294   }
294295}
295296
r22508r22509
789790   /* sound hardware */
790791   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
791792
792   MCFG_SOUND_ADD("beep", BEEP, 0)
793   MCFG_SOUND_ADD("beeper", BEEP, 0)
793794   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
794795   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
795796

Previous 199869 Revisions Next


© 1997-2024 The MAME Team