Previous 199869 Revisions Next

r29294 Saturday 5th April, 2014 at 11:01:54 UTC by Nathan Woods
Merge branch 'master' of ssh://mess.org/mame into new_menus
[/shelves/new_menus/src/emu/bus/isa]cga.c
[/shelves/new_menus/src/emu/cpu/h8]h8_adc.c h8_sci.c h8_sci.h
[/shelves/new_menus/src/mess/drivers]amust.c bcs3.c c65.c fm7.c v1050.c
[/shelves/new_menus/src/mess/includes]c65.h fm7.h v1050.h
[/shelves/new_menus/src/mess/machine]c65.c
[/shelves/new_menus/src/osd/windows]vconv.c

shelves/new_menus/src/osd/windows/vconv.c
r29293r29294
6868   { 0,        "-fomit-frame-pointer",     "" },
6969   { 0,        "-Werror",                  "/WX" },
7070   //{ VS7,        "-Wall",                    "/Wall /W3 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826" },
71   { VS7,      "-Wall",                    "/Wall /W4 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826 /wd4820 /wd4514 /wd4668 /wd4127 /wd4625 /wd4626 /wd4512 /wd4100 /wd4310 /wd4571 /wd4061 /wd4131 /wd4255 /wd4510 /wd4610 /wd4505 /wd4324 /wd4611 /wd4201 /wd4189 /wd4296 /wd4986 /wd4347 /wd4987 /wd4250 /wd4435 /wd4150" },
71   { VS7,      "-Wall",                    "/Wall /W4 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826 /wd4820 /wd4514 /wd4668 /wd4127 /wd4625 /wd4626 /wd4512 /wd4100 /wd4310 /wd4571 /wd4061 /wd4131 /wd4255 /wd4510 /wd4610 /wd4505 /wd4324 /wd4611 /wd4201 /wd4189 /wd4296 /wd4986 /wd4347 /wd4987 /wd4250 /wd4435 /wd4150 /wd4805" },
7272   { 0,        "-Wall",                    "/W0" },
7373   { VS7,      "-Wno-unused",              "/wd4100 /wd4101 /wd4102 /wd4505" },
7474   { 0,        "-Wno-sign-compare",        "/wd4365 /wd4389 /wd4245 /wd4388" },
shelves/new_menus/src/emu/bus/isa/cga.c
r29293r29294
254254   m_chr_gen_offset[1] = m_chr_gen_offset[3] = 0x1000;
255255   m_font_selection_mask = 0x01;
256256   m_start_offset = 0;
257   m_superimpose = false;
257258}
258259
259260isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
shelves/new_menus/src/emu/cpu/h8/h8_sci.c
r29293r29294
279279
280280WRITE_LINE_MEMBER(h8_sci_device::clk_w)
281281{
282   if(ext_clock_value != (bool)state) {
283      ext_clock_value = (bool)state;
282   if(ext_clock_value != state) {
283      ext_clock_value = state;
284284      if(clock_state) {
285285         switch(clock_mode) {
286286         case CLKM_EXTERNAL_ASYNC:
shelves/new_menus/src/emu/cpu/h8/h8_sci.h
r29293r29294
146146
147147   int eri_int, rxi_int, txi_int, tei_int;
148148
149   int tx_state, rx_state, tx_bit, rx_bit, clock_state, clock_mode, tx_parity, ext_clock_counter;
150   bool clock_value, ext_clock_value, rx_value, rx_parity;
149   int tx_state, rx_state, tx_bit, rx_bit, clock_state, clock_mode, tx_parity, rx_parity, ext_clock_counter;
150   bool clock_value, ext_clock_value, rx_value;
151151
152152   UINT8 rdr, tdr, smr, scr, ssr, brr, rsr, tsr;
153153   UINT64 clock_base, divider;
shelves/new_menus/src/emu/cpu/h8/h8_adc.c
r29293r29294
7676
7777WRITE_LINE_MEMBER(h8_adc_device::adtrg_w)
7878{
79   if((bool)state != adtrg) {
79   if(state != adtrg) {
8080      adtrg = state;
8181      if(!adtrg && (trigger & T_EXT) && !(adcsr & F_ADST)) {
8282         adcsr |= F_ADST;
shelves/new_menus/src/mess/drivers/c65.c
r29293r29294
5252
5353#include "emu.h"
5454#include "cpu/m6502/m4510.h"
55#include "sound/mos6581.h"
5655#include "machine/mos6526.h"
57#include "video/vic4567.h"
5856#include "machine/cbm_snqk.h"
5957#include "includes/c65.h"
6058#include "bus/cbmiec/cbmiec.h"
r29293r29294
466464
467465READ8_MEMBER( c65_state::sid_potx_r )
468466{
469   device_t *sid = machine().device("sid_r");
470
471   return c64_paddle_read(sid, space, 0);
467   return c64_paddle_read(m_sid_r, space, 0);
472468}
473469
474470READ8_MEMBER( c65_state::sid_poty_r )
475471{
476   device_t *sid = machine().device("sid_r");
477
478   return c64_paddle_read(sid, space, 1);
472   return c64_paddle_read(m_sid_r, space, 1);
479473}
480474
481475
r29293r29294
487481
488482UINT32 c65_state::screen_update_c65(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
489483{
490   machine().device<vic3_device>("vic3")->video_update(bitmap, cliprect);
484   m_vic->video_update(bitmap, cliprect);
491485   return 0;
492486}
493487
r29293r29294
539533
540534INTERRUPT_GEN_MEMBER(c65_state::vic3_raster_irq)
541535{
542   machine().device<vic3_device>("vic3")->raster_interrupt_gen();
536   m_vic->raster_interrupt_gen();
543537}
544538
545539/*************************************
shelves/new_menus/src/mess/drivers/bcs3.c
r29293r29294
2525   bcs3_state(const machine_config &mconfig, device_type type, const char *tag)
2626      : driver_device(mconfig, type, tag),
2727   m_maincpu(*this, "maincpu"),
28   m_p_videoram(*this, "videoram"){ }
28   m_p_chargen(*this, "chargen"),
29   m_p_videoram(*this, "videoram"),
30   m_io_line0(*this, "LINE0"),
31   m_io_line1(*this, "LINE1"),
32   m_io_line2(*this, "LINE2"),
33   m_io_line3(*this, "LINE3"),
34   m_io_line4(*this, "LINE4"),
35   m_io_line5(*this, "LINE5"),
36   m_io_line6(*this, "LINE6"),
37   m_io_line7(*this, "LINE7"),
38   m_io_line8(*this, "LINE8")
39   { }
2940
3041   required_device<cpu_device> m_maincpu;
31   const UINT8 *m_p_chargen;
42   required_memory_region m_p_chargen;
3243   required_shared_ptr<UINT8> m_p_videoram;
44   required_ioport m_io_line0;
45   required_ioport m_io_line1;
46   required_ioport m_io_line2;
47   required_ioport m_io_line3;
48   required_ioport m_io_line4;
49   required_ioport m_io_line5;
50   required_ioport m_io_line6;
51   required_ioport m_io_line7;
52   required_ioport m_io_line8;
3353   DECLARE_READ8_MEMBER(bcs3_keyboard_r);
3454   virtual void machine_reset();
3555   virtual void video_start();
r29293r29294
4464   UINT8 data = 0;
4565
4666   if (~offset & 0x01)
47      data |= ioport("LINE0")->read();
67      data |= m_io_line0->read();
4868   if (~offset & 0x02)
49      data |= ioport("LINE1")->read();
69      data |= m_io_line1->read();
5070   if (~offset & 0x04)
51      data |= ioport("LINE2")->read();
71      data |= m_io_line2->read();
5272   if (~offset & 0x08)
53      data |= ioport("LINE3")->read();
73      data |= m_io_line3->read();
5474   if (~offset & 0x10)
55      data |= ioport("LINE4")->read();
75      data |= m_io_line4->read();
5676   if (~offset & 0x20)
57      data |= ioport("LINE5")->read();
77      data |= m_io_line5->read();
5878   if (~offset & 0x40)
59      data |= ioport("LINE6")->read();
79      data |= m_io_line6->read();
6080   if (~offset & 0x80)
61      data |= ioport("LINE7")->read();
81      data |= m_io_line7->read();
6282   if (~offset & 0x100)
63      data |= ioport("LINE8")->read();
83      data |= m_io_line8->read();
6484
6585   return data;
6686}
r29293r29294
219239
220240void bcs3_state::video_start()
221241{
222   m_p_chargen = memregion("chargen")->base();
223242}
224243
225244UINT32 bcs3_state::screen_update_bcs3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
r29293r29294
241260               chr = m_p_videoram[x] & 0x7f;
242261
243262               /* get pattern of pixels for that character scanline */
244               gfx = m_p_chargen[(chr<<3) | rat ] ^ 0xff;
263               gfx = m_p_chargen->base()[(chr<<3) | rat ] ^ 0xff;
245264            }
246265            else
247266               gfx = 0xff;
r29293r29294
286305               chr = m_p_videoram[x] & 0x7f;
287306
288307               /* get pattern of pixels for that character scanline */
289               gfx = m_p_chargen[(chr<<3) | rat ] ^ 0xff;
308               gfx = m_p_chargen->base()[(chr<<3) | rat ] ^ 0xff;
290309            }
291310            else
292311               gfx = 0xff;
r29293r29294
329348               chr = m_p_videoram[x] & 0x7f;
330349
331350               /* get pattern of pixels for that character scanline */
332               gfx = m_p_chargen[(chr<<3) | rat ] ^ 0xff;
351               gfx = m_p_chargen->base()[(chr<<3) | rat ] ^ 0xff;
333352            }
334353            else
335354               gfx = 0xff;
r29293r29294
372391               chr = m_p_videoram[x] & 0x7f;
373392
374393               /* get pattern of pixels for that character scanline */
375               gfx = m_p_chargen[(chr<<3) | rat ] ^ 0xff;
394               gfx = m_p_chargen->base()[(chr<<3) | rat ] ^ 0xff;
376395            }
377396            else
378397               gfx = 0xff;
shelves/new_menus/src/mess/drivers/v1050.c
r29293r29294
670670
671671WRITE8_MEMBER(v1050_state::disp_ppi_pc_w)
672672{
673   device_t *device = machine().device(I8255A_M6502_TAG);
674   i8255_device *ppi = static_cast<i8255_device*>(device);
675
676   ppi->pc2_w(BIT(data, 6));
677   ppi->pc4_w(BIT(data, 7));
673   m_ppi_6502->pc2_w(BIT(data, 6));
674   m_ppi_6502->pc4_w(BIT(data, 7));
678675}
679676
680677static I8255A_INTERFACE( disp_ppi_intf )
r29293r29294
689686
690687WRITE8_MEMBER(v1050_state::m6502_ppi_pc_w)
691688{
692   device_t *device = machine().device(I8255A_DISP_TAG);
693   i8255_device *ppi = static_cast<i8255_device*>(device);
694
695   ppi->pc2_w(BIT(data, 7));
696   ppi->pc4_w(BIT(data, 6));
689   m_ppi_disp->pc2_w(BIT(data, 7));
690   m_ppi_disp->pc4_w(BIT(data, 6));
697691}
698692
699693static I8255A_INTERFACE( m6502_ppi_intf )
shelves/new_menus/src/mess/drivers/amust.c
r29293r29294
4343- Everything
4444- Need software
4545- If booting straight to CP/M, the load message should be in the middle of the screen.
46- Beeper is a low pulse on bit 0 of port 0b - enable a pit event?
4647
4748****************************************************************************/
4849
r29293r29294
5152#include "video/mc6845.h"
5253#include "machine/upd765.h"
5354#include "machine/keyboard.h"
55//#include "machine/pit8253.h"
56//#include "machine/i8255.h"
57//#include "machine/i8251.h"
5458
5559
5660class amust_state : public driver_device
r29293r29294
116120   AM_RANGE(0x0e, 0x0e) AM_DEVREADWRITE("crtc", mc6845_device, status_r, address_w)
117121   AM_RANGE(0x0f, 0x0f) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
118122   AM_RANGE(0x10, 0x11) AM_DEVICE("fdc", upd765a_device, map)
123   //AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("uart1", i8251_device, data_r, data_w)
124   //AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("uart1", i8251_device, status_r, control_w)
125   //AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("uart2", i8251_device, data_r, data_w)
126   //AM_RANGE(0x03, 0x03) AM_DEVREADWRITE("uart2", i8251_device, status_r, control_w)
127   //AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi1", i8255_device, read, write)
128   //AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi2", i8255_device, read, write)
129   //AM_RANGE(0x14, 0x17) AM_DEVREADWRITE("pit", pit8253_device, read, write)
119130ADDRESS_MAP_END
120131
121132static SLOT_INTERFACE_START( amust_floppies )
r29293r29294
166177   m_maincpu->set_input_line_and_vector(INPUT_LINE_IRQ0, ASSERT_LINE, 0xcf);
167178}
168179
180//static I8255_INTERFACE( ppi1_intf )
181//{
182//   DEVCB_DRIVER_MEMBER(amust_state, ppi1_pa_r),   // Port A read
183//   DEVCB_DRIVER_MEMBER(amust_state, ppi1_pa_w),   // Port A write
184//   DEVCB_DRIVER_MEMBER(amust_state, ppi1_pb_r),   // Port B read
185//   DEVCB_DRIVER_MEMBER(amust_state, ppi1_pb_w),   // Port B write
186//   DEVCB_DRIVER_MEMBER(amust_state, ppi1_pc_r),   // Port C read
187//   DEVCB_DRIVER_MEMBER(amust_state, ppi1_pc_w),   // Port C write
188//};
189
190//static I8255_INTERFACE( ppi2_intf )
191//{
192//   DEVCB_DRIVER_MEMBER(amust_state, ppi2_pa_r),   // Port A read
193//   DEVCB_DRIVER_MEMBER(amust_state, ppi2_pa_w),   // Port A write
194//   DEVCB_DRIVER_MEMBER(amust_state, ppi2_pb_r),   // Port B read
195//   DEVCB_DRIVER_MEMBER(amust_state, ppi2_pb_w),   // Port B write
196//   DEVCB_DRIVER_MEMBER(amust_state, ppi2_pc_r),   // Port C read
197//   DEVCB_DRIVER_MEMBER(amust_state, ppi2_pc_w),   // Port C write
198//};
199
169200WRITE8_MEMBER( amust_state::kbd_put )
170201{
171202   m_term_data = data;
r29293r29294
284315   MCFG_UPD765A_ADD("fdc", false, true)
285316   MCFG_FLOPPY_DRIVE_ADD("fdc:0", amust_floppies, "525dd", floppy_image_device::default_floppy_formats)
286317   MCFG_FLOPPY_DRIVE_ADD("fdc:1", amust_floppies, "525dd", floppy_image_device::default_floppy_formats)
318
319   //MCFG_DEVICE_ADD("uart1", I8251, 0)
320   //MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
321   //MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
322   //MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
323
324   //MCFG_DEVICE_ADD("uart2", I8251, 0)
325   //MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
326   //MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
327   //MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
328
329   //MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "serial_terminal")
330   //MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_rxd))
331   //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_cts))
332   //MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_dsr))
333
334   //MCFG_DEVICE_ADD("pit", PIT8253, 0)
335
336   //MCFG_I8255A_ADD("ppi1", ppi1_intf)
337   //MCFG_I8255A_ADD("ppi2", ppi2_intf)
287338MACHINE_CONFIG_END
288339
289340/* ROM definition */
shelves/new_menus/src/mess/drivers/fm7.c
r29293r29294
4646
4747#include "imagedev/cassette.h"
4848#include "formats/fm7_cas.h"
49#include "machine/wd17xx.h"
5049#include "imagedev/flopdrv.h"
5150#include "bus/centronics/dsjoy.h"
5251
r29293r29294
432431
433432READ8_MEMBER(fm7_state::fm7_fdc_r)
434433{
435   mb8877_device *fdc = machine().device<mb8877_device>("fdc");
436434   UINT8 ret = 0;
437435
438436   switch(offset)
439437   {
440438      case 0:
441         return fdc->status_r(space, offset);
439         return m_fdc->status_r(space, offset);
442440      case 1:
443         return fdc->track_r(space, offset);
441         return m_fdc->track_r(space, offset);
444442      case 2:
445         return fdc->sector_r(space, offset);
443         return m_fdc->sector_r(space, offset);
446444      case 3:
447         return fdc->data_r(space, offset);
445         return m_fdc->data_r(space, offset);
448446      case 4:
449447         return m_fdc_side | 0xfe;
450448      case 5:
r29293r29294
466464
467465WRITE8_MEMBER(fm7_state::fm7_fdc_w)
468466{
469   mb8877_device *fdc = machine().device<mb8877_device>("fdc");
470467   switch(offset)
471468   {
472469      case 0:
473         fdc->command_w(space, offset,data);
470         m_fdc->command_w(space, offset,data);
474471         break;
475472      case 1:
476         fdc->track_w(space, offset,data);
473         m_fdc->track_w(space, offset,data);
477474         break;
478475      case 2:
479         fdc->sector_w(space, offset,data);
476         m_fdc->sector_w(space, offset,data);
480477         break;
481478      case 3:
482         fdc->data_w(space, offset,data);
479         m_fdc->data_w(space, offset,data);
483480         break;
484481      case 4:
485482         m_fdc_side = data & 0x01;
486         fdc->set_side(data & 0x01);
483         m_fdc->set_side(data & 0x01);
487484         logerror("FDC: wrote %02x to 0x%04x (side)\n",data,offset+0xfd18);
488485         break;
489486      case 5:
r29293r29294
494491         }
495492         else
496493         {
497            fdc->set_drive(data & 0x03);
494            m_fdc->set_drive(data & 0x03);
498495            floppy_mon_w(floppy_get_device(machine(), data & 0x03), !BIT(data, 7));
499496            floppy_drive_set_ready_state(floppy_get_device(machine(), data & 0x03), data & 0x80,0);
500497            logerror("FDC: wrote %02x to 0x%04x (drive)\n",data,offset+0xfd18);
shelves/new_menus/src/mess/machine/c65.c
r29293r29294
423423
424424READ8_MEMBER(c65_state::c65_cia0_port_a_r)
425425{
426   UINT8 cia0portb = machine().device<mos6526_device>("cia_0")->pb_r(space, 0);
426   UINT8 cia0portb = m_cia0->pb_r(space, 0);
427427
428   return cbm_common_cia0_port_a_r(machine().device("cia_0"), cia0portb);
428   return cbm_common_cia0_port_a_r(m_cia0, cia0portb);
429429}
430430
431431READ8_MEMBER(c65_state::c65_cia0_port_b_r)
432432{
433433   UINT8 value = 0xff;
434   UINT8 cia0porta = machine().device<mos6526_device>("cia_0")->pa_r(space, 0);
434   UINT8 cia0porta = m_cia0->pa_r(space, 0);
435435
436   value &= cbm_common_cia0_port_b_r(machine().device("cia_0"), cia0porta);
436   value &= cbm_common_cia0_port_b_r(m_cia0, cia0porta);
437437
438438   if (!(m_6511_port & 0x02))
439439      value &= m_keyline;
shelves/new_menus/src/mess/includes/v1050.h
r29293r29294
6767      m_maincpu(*this, Z80_TAG),
6868      m_subcpu(*this, M6502_TAG),
6969      m_pic(*this, UPB8214_TAG),
70      m_ppi_disp(*this, I8255A_DISP_TAG),
71      m_ppi_6502(*this, I8255A_M6502_TAG),
7072      m_rtc(*this, MSM58321RS_TAG),
7173      m_uart_kb(*this, I8251A_KB_TAG),
7274      m_uart_sio(*this, I8251A_SIO_TAG),
r29293r29294
163165   required_device<cpu_device> m_maincpu;
164166   required_device<cpu_device> m_subcpu;
165167   required_device<i8214_device> m_pic;
168   required_device<i8255_device> m_ppi_disp;
169   required_device<i8255_device> m_ppi_6502;
166170   required_device<msm58321_device> m_rtc;
167171   required_device<i8251_device> m_uart_kb;
168172   required_device<i8251_device> m_uart_sio;
shelves/new_menus/src/mess/includes/fm7.h
r29293r29294
33#include "imagedev/cassette.h"
44#include "sound/beep.h"
55#include "sound/2203intf.h"
6#include "machine/wd17xx.h"
67
78/*
89 *
r29293r29294
131132      m_psg(*this, "psg"),
132133      m_centronics(*this, "centronics"),
133134      m_cent_data_out(*this, "cent_data_out"),
135      m_fdc(*this, "fdc"),
134136      m_kanji(*this, "kanji1"),
135137      m_key1(*this, "key1"),
136138      m_key2(*this, "key2"),
r29293r29294
298300   optional_device<ay8910_device> m_psg;
299301   required_device<centronics_device> m_centronics;
300302   required_device<output_latch_device> m_cent_data_out;
303   required_device<mb8877_device> m_fdc;
301304
302305   void fm7_alu_mask_write(UINT32 offset, int bank, UINT8 dat);
303306   void fm7_alu_function_compare(UINT32 offset);
shelves/new_menus/src/mess/includes/c65.h
r29293r29294
1212#include "imagedev/cartslot.h"
1313#include "imagedev/snapquik.h"
1414#include "machine/ram.h"
15#include "sound/mos6581.h"
16#include "video/vic4567.h"
1517
1618#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'.
1719
r29293r29294
6163      : driver_device(mconfig, type, tag),
6264         m_cia0(*this, "cia_0"),
6365         m_cia1(*this, "cia_1"),
66         m_sid_r(*this, "sid_r"),
67         m_vic(*this, "vic3"),
6468         m_iec(*this, CBM_IEC_TAG),
6569         m_colorram(*this, "colorram"),
6670         m_basic(*this, "basic"),
r29293r29294
7478
7579   required_device<mos6526_device> m_cia0;
7680   required_device<mos6526_device> m_cia1;
81   required_device<mos6581_device> m_sid_r;
82   required_device<vic3_device> m_vic;
7783   optional_device<cbm_iec_device> m_iec;
7884
7985   required_shared_ptr<UINT8> m_colorram;
Property changes on: shelves/new_menus
Modified: svn:mergeinfo
   Merged /trunk:r29121-29128

Previous 199869 Revisions Next

© 1997-2024 The MAME Team