From be7552fa577ab6704841750f93262d5beb0acef2 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Wed, 25 Jan 2017 10:20:18 +1100 Subject: [PATCH] Fixed numerous compile errors (nw) --- src/devices/cpu/clipper/clipper.h | 8 ++++---- src/mame/drivers/interpro.cpp | 13 +++++++----- src/mame/machine/cammu.cpp | 1 + src/mame/machine/cammu.h | 4 +--- src/mame/machine/interpro_ioga.h | 33 +++++++++++++++---------------- src/mame/mame.lst | 2 +- src/mame/mess.flt | 1 + 7 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/devices/cpu/clipper/clipper.h b/src/devices/cpu/clipper/clipper.h index be2c5e2603f..037b6549195 100644 --- a/src/devices/cpu/clipper/clipper.h +++ b/src/devices/cpu/clipper/clipper.h @@ -261,11 +261,11 @@ private: u32 address; } m_info; - void clipper_device::decode_instruction(u16 insn); - int clipper_device::execute_instruction(); - bool clipper_device::evaluate_branch(); + void decode_instruction(u16 insn); + int execute_instruction(); + bool evaluate_branch(); - uint32_t clipper_device::intrap(u32 vector, u32 pc, u32 cts = CTS_NO_CPU_TRAP, u32 mts = MTS_NO_MEMORY_TRAP); + uint32_t intrap(u32 vector, u32 pc, u32 cts = CTS_NO_CPU_TRAP, u32 mts = MTS_NO_MEMORY_TRAP); }; class clipper_c100_device : public clipper_device diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index 03889931734..9cc9264f608 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -81,7 +81,10 @@ READ32_MEMBER(interpro_state::idprom_r) LOG_IDPROM("idprom read offset 0x%x mask 0x%08x at 0x%08x\n", offset, mem_mask, space.device().safe_pc()); // abitrary fake number for now, not working properly - uint32_t speed = 70000000; + u32 speed = 70000000; + u32 speed1 = speed >> 24; + u32 speed2 = speed >> 16; + u32 speed3 = speed >> 8; static uint8_t idprom[] = { // module type id @@ -97,7 +100,7 @@ READ32_MEMBER(interpro_state::idprom_r) // if they're empty, a default value of 50 000 000 is used // perhaps this is a system speed (50MHz)? 0x2, 0x34, 0x56, 0x78, - (speed >> 24) & 0xff, (speed >> 16) & 0xff, (speed >> 8) & 0xff, (speed >> 0) & 0xff, + (u8)speed1, (u8)speed2, (u8)speed3, (u8)speed, // reserved bytes 0xff, 0xff, @@ -198,7 +201,7 @@ WRITE8_MEMBER(interpro_state::scsi_w) // driver init DRIVER_INIT_MEMBER(interpro_state, ip2800) { - address_space &as = m_mmu->space(AS_1); + //address_space &as = m_mmu->space(AS_1); } // these maps point the cpu virtual addresses to the mmu @@ -341,5 +344,5 @@ ROM_START(ip2800) ROM_LOAD_OPTIONAL("ip2830_eeprom.bin", 0x00000, 0x40000, CRC(a0c0899f) SHA1(dda6fbca81f9885a1a76ca3c25e80463a83a0ef7)) ROM_END -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ -COMP( 1990, ip2800, 0, 0, ip2800, ip2800, interpro_state, ip2800, "Intergraph", "InterPro 2800", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ +COMP( 1990, ip2800, 0, 0, ip2800, ip2800, interpro_state, ip2800, "Intergraph", "InterPro 2800", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp index e43896e1d0f..1ee7cdab38a 100644 --- a/src/mame/machine/cammu.cpp +++ b/src/mame/machine/cammu.cpp @@ -83,6 +83,7 @@ const address_space_config *cammu_device::memory_space_config (address_spacenum case AS_0: return &m_main_space_config; case AS_1: return &m_io_space_config; case AS_2: return &m_boot_space_config; + default: break; } return nullptr; diff --git a/src/mame/machine/cammu.h b/src/mame/machine/cammu.h index dfbc39884b5..a00208efbb5 100644 --- a/src/mame/machine/cammu.h +++ b/src/mame/machine/cammu.h @@ -40,15 +40,13 @@ protected: virtual const address_space_config *memory_space_config (address_spacenum spacenum) const override; private: - devcb_read32 m_ssw_func; - address_space_config m_main_space_config; address_space_config m_io_space_config; address_space_config m_boot_space_config; - address_space *m_main_space; address_space *m_io_space; address_space *m_boot_space; + devcb_read32 m_ssw_func; u32 m_cammu[1024]; diff --git a/src/mame/machine/interpro_ioga.h b/src/mame/machine/interpro_ioga.h index a31f3aba9fc..2809601d98e 100644 --- a/src/mame/machine/interpro_ioga.h +++ b/src/mame/machine/interpro_ioga.h @@ -200,9 +200,24 @@ private: void update_interrupt(int state); void drq(int state, int channel); - devcb_write_line m_out_nmi_func; devcb_write_line m_out_int_func; + address_space *m_memory_space; + + // dma channels + struct dma + { + uint32_t real_address; + uint32_t virtual_address; + uint32_t transfer_count; + uint32_t control; + + bool dma_active; + int drq_state; + devcb_read8 device_r; + devcb_write8 device_w; + } m_dma_channel[IOGA_DMA_CHANNELS]; + uint32_t m_dma_plotter_eosl; devcb_write_line m_fdc_tc_func; @@ -223,24 +238,8 @@ private: emu_timer *m_timer[4]; // dma state - address_space *m_memory_space; emu_timer *m_dma_timer; - // dma channels - struct dma - { - uint32_t real_address; - uint32_t virtual_address; - uint32_t transfer_count; - uint32_t control; - - bool dma_active; - int drq_state; - devcb_read8 device_r; - devcb_write8 device_w; - } m_dma_channel[IOGA_DMA_CHANNELS]; - uint32_t m_dma_plotter_eosl; - uint32_t dma_r(address_space &space, offs_t offset, uint32_t mem_mask, int channel); void dma_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask, int channel); diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 8696f5c93bc..cc3acff1d8a 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -14782,7 +14782,7 @@ hector1 // interact // @source:interpro.cpp -ip2800 // Intergraph InterPro 28xx workstation +//ip2800 // Intergraph InterPro 28xx workstation @source:intrscti.cpp intrscti // ???? diff --git a/src/mame/mess.flt b/src/mame/mess.flt index 7864f2ec890..d9ef0963233 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -268,6 +268,7 @@ indigo.cpp indy_indigo2.cpp instruct.cpp interact.cpp +interpro.cpp intv.cpp ipc.cpp ipds.cpp