diff options
Diffstat (limited to 'src/mame/machine')
-rw-r--r-- | src/mame/machine/hal2.cpp | 10 | ||||
-rw-r--r-- | src/mame/machine/hpc1.cpp | 32 | ||||
-rw-r--r-- | src/mame/machine/hpc1.h | 38 | ||||
-rw-r--r-- | src/mame/machine/hpc3.cpp | 20 | ||||
-rw-r--r-- | src/mame/machine/ioc2.cpp | 30 | ||||
-rw-r--r-- | src/mame/machine/ioc2.h | 4 | ||||
-rw-r--r-- | src/mame/machine/mace.cpp | 78 | ||||
-rw-r--r-- | src/mame/machine/mace.h | 6 | ||||
-rw-r--r-- | src/mame/machine/sgi.cpp | 20 | ||||
-rw-r--r-- | src/mame/machine/xavix.cpp | 16 | ||||
-rw-r--r-- | src/mame/machine/xavix_madfb_ball.cpp | 14 |
11 files changed, 134 insertions, 134 deletions
diff --git a/src/mame/machine/hal2.cpp b/src/mame/machine/hal2.cpp index 7bb6286ab12..4993b6d9a1d 100644 --- a/src/mame/machine/hal2.cpp +++ b/src/mame/machine/hal2.cpp @@ -9,12 +9,12 @@ #include "emu.h" #include "machine/hal2.h" -#define LOG_UNKNOWN (1 << 0U) -#define LOG_READS (1 << 1U) -#define LOG_WRITES (1 << 2U) -#define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) +#define LOG_UNKNOWN (1 << 0U) +#define LOG_READS (1 << 1U) +#define LOG_WRITES (1 << 2U) +#define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_HAL2, hal2_device, "hal2", "SGI HAL2") diff --git a/src/mame/machine/hpc1.cpp b/src/mame/machine/hpc1.cpp index 9dce211eac4..9bce71552bb 100644 --- a/src/mame/machine/hpc1.cpp +++ b/src/mame/machine/hpc1.cpp @@ -17,22 +17,22 @@ #include "machine/hpc1.h" #include "speaker.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_INT (1 << 3) -#define LOG_EEPROM (1 << 4) -#define LOG_SCSI (1 << 5) -#define LOG_SCSI_DMA (1 << 6) -#define LOG_DUART0 (1 << 7) -#define LOG_DUART1 (1 << 8) -#define LOG_DUART2 (1 << 9) -#define LOG_PIT (1 << 10) -#define LOG_REGS (LOG_UNKNOWN | LOG_READS | LOG_WRITES) -#define LOG_DUART (LOG_DUART0 | LOG_DUART1 | LOG_DUART2) -#define LOG_ALL (LOG_REGS | LOG_INT | LOG_EEPROM | LOG_SCSI | LOG_SCSI_DMA | LOG_DUART | LOG_PIT) - -#define VERBOSE (LOG_UNKNOWN) +#define LOG_UNKNOWN (1 << 0) +#define LOG_READS (1 << 1) +#define LOG_WRITES (1 << 2) +#define LOG_INT (1 << 3) +#define LOG_EEPROM (1 << 4) +#define LOG_SCSI (1 << 5) +#define LOG_SCSI_DMA (1 << 6) +#define LOG_DUART0 (1 << 7) +#define LOG_DUART1 (1 << 8) +#define LOG_DUART2 (1 << 9) +#define LOG_PIT (1 << 10) +#define LOG_REGS (LOG_UNKNOWN | LOG_READS | LOG_WRITES) +#define LOG_DUART (LOG_DUART0 | LOG_DUART1 | LOG_DUART2) +#define LOG_ALL (LOG_REGS | LOG_INT | LOG_EEPROM | LOG_SCSI | LOG_SCSI_DMA | LOG_DUART | LOG_PIT) + +#define VERBOSE (LOG_UNKNOWN) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_HPC1, hpc1_device, "hpc1", "SGI HPC1") diff --git a/src/mame/machine/hpc1.h b/src/mame/machine/hpc1.h index beee8affc06..efde8747f9d 100644 --- a/src/mame/machine/hpc1.h +++ b/src/mame/machine/hpc1.h @@ -66,29 +66,29 @@ protected: enum { - LOCAL0_FIFO_GIO0 = 0x01, - LOCAL0_PARALLEL = 0x02, - LOCAL0_SCSI = 0x04, - LOCAL0_ETHERNET = 0x08, - LOCAL0_GFX_DMA = 0x10, - LOCAL0_DUART = 0x20, - LOCAL0_GIO1 = 0x40, - LOCAL0_VME0 = 0x80, - - LOCAL1_GR1_CASE = 0x02, - LOCAL1_VME1 = 0x08, - LOCAL1_DSP = 0x10, - LOCAL1_ACFAIL = 0x20, - LOCAL1_VIDEO = 0x40, - LOCAL1_RETRACE_GIO2 = 0x80 + LOCAL0_FIFO_GIO0 = 0x01, + LOCAL0_PARALLEL = 0x02, + LOCAL0_SCSI = 0x04, + LOCAL0_ETHERNET = 0x08, + LOCAL0_GFX_DMA = 0x10, + LOCAL0_DUART = 0x20, + LOCAL0_GIO1 = 0x40, + LOCAL0_VME0 = 0x80, + + LOCAL1_GR1_CASE = 0x02, + LOCAL1_VME1 = 0x08, + LOCAL1_DSP = 0x10, + LOCAL1_ACFAIL = 0x20, + LOCAL1_VIDEO = 0x40, + LOCAL1_RETRACE_GIO2 = 0x80 }; enum { - HPC_DMACTRL_RESET = 0x01, - HPC_DMACTRL_FLUSH = 0x02, - HPC_DMACTRL_TO_MEM = 0x10, - HPC_DMACTRL_ENABLE = 0x80 + HPC_DMACTRL_RESET = 0x01, + HPC_DMACTRL_FLUSH = 0x02, + HPC_DMACTRL_TO_MEM = 0x10, + HPC_DMACTRL_ENABLE = 0x80 }; struct scsi_dma_t diff --git a/src/mame/machine/hpc3.cpp b/src/mame/machine/hpc3.cpp index 860a28b54a9..3728be15dc7 100644 --- a/src/mame/machine/hpc3.cpp +++ b/src/mame/machine/hpc3.cpp @@ -9,16 +9,16 @@ #include "emu.h" #include "machine/hpc3.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_PBUS_DMA (1 << 1) -#define LOG_SCSI (1 << 2) -#define LOG_SCSI_DMA (1 << 3) -#define LOG_ETHERNET (1 << 4) -#define LOG_PBUS4 (1 << 5) -#define LOG_CHAIN (1 << 6) -#define LOG_ALL (LOG_UNKNOWN | LOG_PBUS_DMA | LOG_SCSI | LOG_SCSI_DMA | LOG_ETHERNET | LOG_PBUS4 | LOG_CHAIN) - -#define VERBOSE (0) +#define LOG_UNKNOWN (1 << 0) +#define LOG_PBUS_DMA (1 << 1) +#define LOG_SCSI (1 << 2) +#define LOG_SCSI_DMA (1 << 3) +#define LOG_ETHERNET (1 << 4) +#define LOG_PBUS4 (1 << 5) +#define LOG_CHAIN (1 << 6) +#define LOG_ALL (LOG_UNKNOWN | LOG_PBUS_DMA | LOG_SCSI | LOG_SCSI_DMA | LOG_ETHERNET | LOG_PBUS4 | LOG_CHAIN) + +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_HPC3, hpc3_device, "hpc3", "SGI HPC3") diff --git a/src/mame/machine/ioc2.cpp b/src/mame/machine/ioc2.cpp index 4387f2a7ea2..120d6cadc93 100644 --- a/src/mame/machine/ioc2.cpp +++ b/src/mame/machine/ioc2.cpp @@ -10,21 +10,21 @@ #include "bus/rs232/rs232.h" #include "machine/ioc2.h" -#define LOG_PI1 (1 << 0) -#define LOG_SERIAL (1 << 1) -#define LOG_MOUSEKBD (1 << 2) -#define LOG_PANEL (1 << 3) -#define LOG_SYSID (1 << 4) -#define LOG_READ (1 << 5) -#define LOG_DMA_SEL (1 << 6) -#define LOG_RESET (1 << 7) -#define LOG_WRITE (1 << 8) -#define LOG_INT3 (1 << 9) -#define LOG_PIT (1 << 10) -#define LOG_ALL (LOG_PI1 | LOG_SERIAL | LOG_MOUSEKBD | LOG_PANEL | LOG_SYSID | LOG_READ | LOG_DMA_SEL | LOG_RESET | LOG_WRITE | LOG_INT3 | LOG_PIT) -#define LOG_DEFAULT (LOG_ALL & ~(LOG_SYSID | LOG_MOUSEKBD)) - -#define VERBOSE (0) +#define LOG_PI1 (1 << 0) +#define LOG_SERIAL (1 << 1) +#define LOG_MOUSEKBD (1 << 2) +#define LOG_PANEL (1 << 3) +#define LOG_SYSID (1 << 4) +#define LOG_READ (1 << 5) +#define LOG_DMA_SEL (1 << 6) +#define LOG_RESET (1 << 7) +#define LOG_WRITE (1 << 8) +#define LOG_INT3 (1 << 9) +#define LOG_PIT (1 << 10) +#define LOG_ALL (LOG_PI1 | LOG_SERIAL | LOG_MOUSEKBD | LOG_PANEL | LOG_SYSID | LOG_READ | LOG_DMA_SEL | LOG_RESET | LOG_WRITE | LOG_INT3 | LOG_PIT) +#define LOG_DEFAULT (LOG_ALL & ~(LOG_SYSID | LOG_MOUSEKBD)) + +#define VERBOSE (0) #include "logmacro.h" /*static*/ char const *const ioc2_device::SCC_TAG = "scc"; diff --git a/src/mame/machine/ioc2.h b/src/mame/machine/ioc2.h index fe2b1bc3fc7..a90011ae919 100644 --- a/src/mame/machine/ioc2.h +++ b/src/mame/machine/ioc2.h @@ -142,8 +142,8 @@ protected: FRONT_PANEL_VOL_UP_HOLD = 0x80, FRONT_PANEL_INT_MASK = FRONT_PANEL_POWER_BUTTON_INT | - FRONT_PANEL_VOL_DOWN_INT | - FRONT_PANEL_VOL_UP_INT + FRONT_PANEL_VOL_DOWN_INT | + FRONT_PANEL_VOL_UP_INT }; enum diff --git a/src/mame/machine/mace.cpp b/src/mame/machine/mace.cpp index 9767b86b31d..7cc34ef497c 100644 --- a/src/mame/machine/mace.cpp +++ b/src/mame/machine/mace.cpp @@ -9,45 +9,45 @@ #include "emu.h" #include "machine/mace.h" -#define LOG_READ_PCI (1 << 0U) -#define LOG_READ_VIN1 (1 << 1U) -#define LOG_READ_VIN2 (1 << 2U) -#define LOG_READ_VOUT (1 << 3U) -#define LOG_READ_ENET (1 << 4U) -#define LOG_READ_AUDIO (1 << 5U) -#define LOG_READ_ISA (1 << 6U) -#define LOG_READ_KBDMS (1 << 7U) -#define LOG_READ_I2C (1 << 8U) -#define LOG_READ_UST_MSC (1 << 9U) -#define LOG_READ_ISA_EXT (1 << 10U) -#define LOG_READ_RTC (1 << 11U) -#define LOG_WRITE_PCI (1 << 12U) -#define LOG_WRITE_VIN1 (1 << 13U) -#define LOG_WRITE_VIN2 (1 << 14U) -#define LOG_WRITE_VOUT (1 << 15U) -#define LOG_WRITE_ENET (1 << 16U) -#define LOG_WRITE_AUDIO (1 << 17U) -#define LOG_WRITE_ISA (1 << 18U) -#define LOG_WRITE_KBDMS (1 << 19U) -#define LOG_WRITE_I2C (1 << 20U) -#define LOG_WRITE_UST_MSC (1 << 21U) -#define LOG_WRITE_ISA_EXT (1 << 22U) -#define LOG_WRITE_RTC (1 << 23U) -#define LOG_HIFREQ (1 << 24U) -#define LOG_PCI (LOG_READ_PCI | LOG_WRITE_PCI) -#define LOG_VIN1 (LOG_READ_VIN1 | LOG_WRITE_VIN1) -#define LOG_VIN2 (LOG_READ_VIN2 | LOG_WRITE_VIN2) -#define LOG_VOUT (LOG_READ_VOUT | LOG_WRITE_VOUT) -#define LOG_ENET (LOG_READ_ENET | LOG_WRITE_ENET) -#define LOG_AUDIO (LOG_READ_AUDIO | LOG_WRITE_AUDIO) -#define LOG_ISA (LOG_READ_ISA | LOG_WRITE_ISA) -#define LOG_KBDMS (LOG_READ_KBDMS | LOG_WRITE_KBDMS) -#define LOG_UST_MSC (LOG_READ_UST_MSC | LOG_WRITE_UST_MSC) -#define LOG_ISA_EXT (LOG_READ_ISA_EXT | LOG_WRITE_ISA_EXT) -#define LOG_RTC (LOG_READ_RTC | LOG_WRITE_RTC) -#define LOG_ALL (LOG_PCI | LOG_VIN1 | LOG_VIN2 | LOG_VOUT | LOG_ENET | LOG_AUDIO | LOG_ISA | LOG_KBDMS | LOG_UST_MSC | LOG_ISA_EXT | LOG_RTC) - -#define VERBOSE (LOG_ALL) +#define LOG_READ_PCI (1 << 0U) +#define LOG_READ_VIN1 (1 << 1U) +#define LOG_READ_VIN2 (1 << 2U) +#define LOG_READ_VOUT (1 << 3U) +#define LOG_READ_ENET (1 << 4U) +#define LOG_READ_AUDIO (1 << 5U) +#define LOG_READ_ISA (1 << 6U) +#define LOG_READ_KBDMS (1 << 7U) +#define LOG_READ_I2C (1 << 8U) +#define LOG_READ_UST_MSC (1 << 9U) +#define LOG_READ_ISA_EXT (1 << 10U) +#define LOG_READ_RTC (1 << 11U) +#define LOG_WRITE_PCI (1 << 12U) +#define LOG_WRITE_VIN1 (1 << 13U) +#define LOG_WRITE_VIN2 (1 << 14U) +#define LOG_WRITE_VOUT (1 << 15U) +#define LOG_WRITE_ENET (1 << 16U) +#define LOG_WRITE_AUDIO (1 << 17U) +#define LOG_WRITE_ISA (1 << 18U) +#define LOG_WRITE_KBDMS (1 << 19U) +#define LOG_WRITE_I2C (1 << 20U) +#define LOG_WRITE_UST_MSC (1 << 21U) +#define LOG_WRITE_ISA_EXT (1 << 22U) +#define LOG_WRITE_RTC (1 << 23U) +#define LOG_HIFREQ (1 << 24U) +#define LOG_PCI (LOG_READ_PCI | LOG_WRITE_PCI) +#define LOG_VIN1 (LOG_READ_VIN1 | LOG_WRITE_VIN1) +#define LOG_VIN2 (LOG_READ_VIN2 | LOG_WRITE_VIN2) +#define LOG_VOUT (LOG_READ_VOUT | LOG_WRITE_VOUT) +#define LOG_ENET (LOG_READ_ENET | LOG_WRITE_ENET) +#define LOG_AUDIO (LOG_READ_AUDIO | LOG_WRITE_AUDIO) +#define LOG_ISA (LOG_READ_ISA | LOG_WRITE_ISA) +#define LOG_KBDMS (LOG_READ_KBDMS | LOG_WRITE_KBDMS) +#define LOG_UST_MSC (LOG_READ_UST_MSC | LOG_WRITE_UST_MSC) +#define LOG_ISA_EXT (LOG_READ_ISA_EXT | LOG_WRITE_ISA_EXT) +#define LOG_RTC (LOG_READ_RTC | LOG_WRITE_RTC) +#define LOG_ALL (LOG_PCI | LOG_VIN1 | LOG_VIN2 | LOG_VOUT | LOG_ENET | LOG_AUDIO | LOG_ISA | LOG_KBDMS | LOG_UST_MSC | LOG_ISA_EXT | LOG_RTC) + +#define VERBOSE (LOG_ALL) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_MACE, mace_device, "sgimace", "SGI MACE") diff --git a/src/mame/machine/mace.h b/src/mame/machine/mace.h index 9c18042d562..0a46f03e676 100644 --- a/src/mame/machine/mace.h +++ b/src/mame/machine/mace.h @@ -69,9 +69,9 @@ protected: enum { - ISA_INT_COMPARE1 = 0x2000, - ISA_INT_COMPARE2 = 0x4000, - ISA_INT_COMPARE3 = 0x8000, + ISA_INT_COMPARE1 = 0x2000, + ISA_INT_COMPARE2 = 0x4000, + ISA_INT_COMPARE3 = 0x8000, }; struct isa_t diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp index 942f734cbfe..2172f9b5969 100644 --- a/src/mame/machine/sgi.cpp +++ b/src/mame/machine/sgi.cpp @@ -12,17 +12,17 @@ #include "sgi.h" #include "cpu/mips/mips3.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_RPSS (1 << 3) -#define LOG_WATCHDOG (1 << 4) -#define LOG_MEMCFG (1 << 5) -#define LOG_MEMCFG_EXT (1 << 6) -#define LOG_EEPROM (1 << 7) -#define LOG_DEFAULT (LOG_READS | LOG_WRITES | LOG_RPSS | LOG_WATCHDOG | LOG_UNKNOWN) +#define LOG_UNKNOWN (1 << 0) +#define LOG_READS (1 << 1) +#define LOG_WRITES (1 << 2) +#define LOG_RPSS (1 << 3) +#define LOG_WATCHDOG (1 << 4) +#define LOG_MEMCFG (1 << 5) +#define LOG_MEMCFG_EXT (1 << 6) +#define LOG_EEPROM (1 << 7) +#define LOG_DEFAULT (LOG_READS | LOG_WRITES | LOG_RPSS | LOG_WATCHDOG | LOG_UNKNOWN) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_MC, sgi_mc_device, "sgi_mc", "SGI Memory Controller") diff --git a/src/mame/machine/xavix.cpp b/src/mame/machine/xavix.cpp index c45e8c89574..a63e0ec7444 100644 --- a/src/mame/machine/xavix.cpp +++ b/src/mame/machine/xavix.cpp @@ -241,13 +241,13 @@ WRITE8_MEMBER(xavix_state::adc_7b80_w) WRITE8_MEMBER(xavix_state::adc_7b81_w) { -// m_irqsource &= ~0x04; -// update_irqs(); +// m_irqsource &= ~0x04; +// update_irqs(); LOG("%s: adc_7b81_w %02x\n", machine().describe_context(), data); m_adc_control = data; -// m_adc_timer->adjust(attotime::from_usec(200)); +// m_adc_timer->adjust(attotime::from_usec(200)); } @@ -425,13 +425,13 @@ void xavix_i2c_state::write_io1(uint8_t data, uint8_t direction) if (direction & 0x10) { m_i2cmem->write_scl((data & 0x10) >> 4); - } + } } uint8_t xavix_i2c_lotr_state::read_io1(uint8_t direction) { uint8_t ret = m_in1->read(); - + // some kind of comms with the IR sensor? ret ^= (machine().rand() & 0x02); ret ^= (machine().rand() & 0x04); @@ -621,7 +621,7 @@ WRITE8_MEMBER(xavix_state::timer_control_w) { /* timer is actively used by ttv_lotr, ttv_sw, drgqst, has_wamg, rad_rh, eka_*, epo_efdx, rad_bass, rad_bb2 - + gets turned on briefly during the bootup of rad_crdn, but then off again runs during rad_fb / rad_madf, but with IRQs turned off @@ -651,7 +651,7 @@ WRITE8_MEMBER(xavix_state::timer_control_w) // uint32_t freq = m_maincpu->unscaled_clock()/2; // m_freq_timer->adjust(attotime::from_hz(freq / divide) * m_timer_baseval*20); //m_freq_timer->adjust(attotime::from_usec(1000)); - m_freq_timer->adjust(attotime::from_usec(50)); + m_freq_timer->adjust(attotime::from_usec(50)); } else { @@ -719,7 +719,7 @@ TIMER_CALLBACK_MEMBER(xavix_state::freq_timer_done) m_timer_control |= 0x80; update_irqs(); } - + //logerror("freq_timer_done\n"); // reload //m_freq_timer->adjust(attotime::from_usec(50000)); diff --git a/src/mame/machine/xavix_madfb_ball.cpp b/src/mame/machine/xavix_madfb_ball.cpp index 11c419dab51..1f254840576 100644 --- a/src/mame/machine/xavix_madfb_ball.cpp +++ b/src/mame/machine/xavix_madfb_ball.cpp @@ -2,15 +2,15 @@ // copyright-holders:David Haywood /* - Motion Football simulation for XaviX based games - EA Sports Madden Football - Play TV Football + Motion Football simulation for XaviX based games + EA Sports Madden Football + Play TV Football - seems to register a pulse when you move it, and another when it stops moving - game uses current timer register (without interrupt) to measure time between pulses - to get 'throw' value + seems to register a pulse when you move it, and another when it stops moving + game uses current timer register (without interrupt) to measure time between pulses + to get 'throw' value - need to verify with code and work out how best to handle this + need to verify with code and work out how best to handle this */ #include "emu.h" |