diff options
Diffstat (limited to 'src/mame/includes/3do.h')
-rw-r--r-- | src/mame/includes/3do.h | 196 |
1 files changed, 98 insertions, 98 deletions
diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h index c826052faa4..03401b01d2b 100644 --- a/src/mame/includes/3do.h +++ b/src/mame/includes/3do.h @@ -16,124 +16,124 @@ struct SLOW2 { /* 03180000 - 0318003f - configuration group */ /* 03180040 - 0318007f - diagnostic UART */ - UINT8 cg_r_count; - UINT8 cg_w_count; - UINT32 cg_input; - UINT32 cg_output; + uint8_t cg_r_count; + uint8_t cg_w_count; + uint32_t cg_input; + uint32_t cg_output; }; struct MADAM { - UINT32 revision; /* 03300000 */ - UINT32 msysbits; /* 03300004 */ - UINT32 mctl; /* 03300008 */ - UINT32 sltime; /* 0330000c */ - UINT32 abortbits; /* 03300020 */ - UINT32 privbits; /* 03300024 */ - UINT32 statbits; /* 03300028 */ - UINT32 diag; /* 03300040 */ - - UINT32 ccobctl0; /* 03300110 */ - UINT32 ppmpc; /* 03300120 */ - - UINT32 regctl0; /* 03300130 */ - UINT32 regctl1; /* 03300134 */ - UINT32 regctl2; /* 03300138 */ - UINT32 regctl3; /* 0330013c */ - UINT32 xyposh; /* 03300140 */ - UINT32 xyposl; /* 03300144 */ - UINT32 linedxyh; /* 03300148 */ - UINT32 linedxyl; /* 0330014c */ - UINT32 dxyh; /* 03300150 */ - UINT32 dxyl; /* 03300154 */ - UINT32 ddxyh; /* 03300158 */ - UINT32 ddxyl; /* 0330015c */ - - UINT32 pip[16]; /* 03300180-033001bc (W); 03300180-033001fc (R) */ - UINT32 fence[16]; /* 03300200-0330023c (W); 03300200-0330027c (R) */ - UINT32 mmu[64]; /* 03300300-033003fc */ - UINT32 dma[32][4]; /* 03300400-033005fc */ - UINT32 mult[40]; /* 03300600-0330069c */ - UINT32 mult_control; /* 033007f0-033007f4 */ - UINT32 mult_status; /* 033007f8 */ + uint32_t revision; /* 03300000 */ + uint32_t msysbits; /* 03300004 */ + uint32_t mctl; /* 03300008 */ + uint32_t sltime; /* 0330000c */ + uint32_t abortbits; /* 03300020 */ + uint32_t privbits; /* 03300024 */ + uint32_t statbits; /* 03300028 */ + uint32_t diag; /* 03300040 */ + + uint32_t ccobctl0; /* 03300110 */ + uint32_t ppmpc; /* 03300120 */ + + uint32_t regctl0; /* 03300130 */ + uint32_t regctl1; /* 03300134 */ + uint32_t regctl2; /* 03300138 */ + uint32_t regctl3; /* 0330013c */ + uint32_t xyposh; /* 03300140 */ + uint32_t xyposl; /* 03300144 */ + uint32_t linedxyh; /* 03300148 */ + uint32_t linedxyl; /* 0330014c */ + uint32_t dxyh; /* 03300150 */ + uint32_t dxyl; /* 03300154 */ + uint32_t ddxyh; /* 03300158 */ + uint32_t ddxyl; /* 0330015c */ + + uint32_t pip[16]; /* 03300180-033001bc (W); 03300180-033001fc (R) */ + uint32_t fence[16]; /* 03300200-0330023c (W); 03300200-0330027c (R) */ + uint32_t mmu[64]; /* 03300300-033003fc */ + uint32_t dma[32][4]; /* 03300400-033005fc */ + uint32_t mult[40]; /* 03300600-0330069c */ + uint32_t mult_control; /* 033007f0-033007f4 */ + uint32_t mult_status; /* 033007f8 */ }; struct CLIO { screen_device *screen; - UINT32 revision; /* 03400000 */ - UINT32 csysbits; /* 03400004 */ - UINT32 vint0; /* 03400008 */ - UINT32 vint1; /* 0340000c */ - UINT32 audin; /* 03400020 */ - UINT32 audout; /* 03400024 */ - UINT32 cstatbits; /* 03400028 */ - UINT32 wdog; /* 0340002c */ - UINT32 hcnt; /* 03400030 */ - UINT32 vcnt; /* 03400034 */ - UINT32 seed; /* 03400038 */ - UINT32 random; /* 0340004c */ - UINT32 irq0; /* 03400040 / 03400044 */ - UINT32 irq0_enable; /* 03400048 / 0340004c */ - UINT32 mode; /* 03400050 / 03400054 */ - UINT32 badbits; /* 03400058 */ - UINT32 spare; /* 0340005c */ - UINT32 irq1; /* 03400060 / 03400064 */ - UINT32 irq1_enable; /* 03400068 / 0340006c */ - UINT32 hdelay; /* 03400080 */ - UINT32 adbio; /* 03400084 */ - UINT32 adbctl; /* 03400088 */ + uint32_t revision; /* 03400000 */ + uint32_t csysbits; /* 03400004 */ + uint32_t vint0; /* 03400008 */ + uint32_t vint1; /* 0340000c */ + uint32_t audin; /* 03400020 */ + uint32_t audout; /* 03400024 */ + uint32_t cstatbits; /* 03400028 */ + uint32_t wdog; /* 0340002c */ + uint32_t hcnt; /* 03400030 */ + uint32_t vcnt; /* 03400034 */ + uint32_t seed; /* 03400038 */ + uint32_t random; /* 0340004c */ + uint32_t irq0; /* 03400040 / 03400044 */ + uint32_t irq0_enable; /* 03400048 / 0340004c */ + uint32_t mode; /* 03400050 / 03400054 */ + uint32_t badbits; /* 03400058 */ + uint32_t spare; /* 0340005c */ + uint32_t irq1; /* 03400060 / 03400064 */ + uint32_t irq1_enable; /* 03400068 / 0340006c */ + uint32_t hdelay; /* 03400080 */ + uint32_t adbio; /* 03400084 */ + uint32_t adbctl; /* 03400088 */ /* Timers */ - UINT32 timer_count[16];/* 034001** & 8 */ - UINT32 timer_backup[16]; /* 034001**+4 & 8 */ - UINT64 timer_ctrl; /* 03400200 */ - UINT32 slack; /* 03400220 */ + uint32_t timer_count[16];/* 034001** & 8 */ + uint32_t timer_backup[16]; /* 034001**+4 & 8 */ + uint64_t timer_ctrl; /* 03400200 */ + uint32_t slack; /* 03400220 */ /* DMA */ - UINT32 dmareqdis; /* 03400308 */ + uint32_t dmareqdis; /* 03400308 */ /* Expansion bus */ - UINT32 expctl; /* 03400400/03400404 */ - UINT32 type0_4; /* 03400408 */ - UINT32 dipir1; /* 03400410 */ - UINT32 dipir2; /* 03400414 */ + uint32_t expctl; /* 03400400/03400404 */ + uint32_t type0_4; /* 03400408 */ + uint32_t dipir1; /* 03400410 */ + uint32_t dipir2; /* 03400414 */ /* Bus signals */ - UINT32 sel; /* 03400500 - 0340053f */ - UINT32 poll; /* 03400540 - 0340057f */ - UINT32 cmdstat; /* 03400580 - 034005bf */ - UINT32 data; /* 034005c0 - 034005ff */ + uint32_t sel; /* 03400500 - 0340053f */ + uint32_t poll; /* 03400540 - 0340057f */ + uint32_t cmdstat; /* 03400580 - 034005bf */ + uint32_t data; /* 034005c0 - 034005ff */ /* DSPP */ - UINT32 semaphore; /* 034017d0 */ - UINT32 semaack; /* 034017d4 */ - UINT32 dsppdma; /* 034017e0 */ - UINT32 dspprst0; /* 034017e4 */ - UINT32 dspprst1; /* 034017e8 */ - UINT32 dspppc; /* 034017f4 */ - UINT32 dsppnr; /* 034017f8 */ - UINT32 dsppgw; /* 034017fc */ - UINT32 dsppn[0x400]; /* 03401800 - 03401bff DSPP N stack (32bit writes) */ + uint32_t semaphore; /* 034017d0 */ + uint32_t semaack; /* 034017d4 */ + uint32_t dsppdma; /* 034017e0 */ + uint32_t dspprst0; /* 034017e4 */ + uint32_t dspprst1; /* 034017e8 */ + uint32_t dspppc; /* 034017f4 */ + uint32_t dsppnr; /* 034017f8 */ + uint32_t dsppgw; /* 034017fc */ + uint32_t dsppn[0x400]; /* 03401800 - 03401bff DSPP N stack (32bit writes) */ /* 03402000 - 034027ff DSPP N stack (16bit writes) */ - UINT32 dsppei[0x100]; /* 03403000 - 034030ff DSPP EI stack (32bit writes) */ + uint32_t dsppei[0x100]; /* 03403000 - 034030ff DSPP EI stack (32bit writes) */ /* 03403400 - 034035ff DSPP EI stack (16bit writes) */ - UINT32 dsppeo[0x1f]; /* 03403800 - 0340381f DSPP EO stack (32bit reads) */ + uint32_t dsppeo[0x1f]; /* 03403800 - 0340381f DSPP EO stack (32bit reads) */ /* 03403c00 - 03403c3f DSPP EO stack (32bit reads) */ - UINT32 dsppclkreload; /* 034039dc / 03403fbc */ + uint32_t dsppclkreload; /* 034039dc / 03403fbc */ /* UNCLE */ - UINT32 unclerev; /* 0340c000 */ - UINT32 uncle_soft_rev; /* 0340c004 */ - UINT32 uncle_addr; /* 0340c008 */ - UINT32 uncle_rom; /* 0340c00c */ + uint32_t unclerev; /* 0340c000 */ + uint32_t uncle_soft_rev; /* 0340c004 */ + uint32_t uncle_addr; /* 0340c008 */ + uint32_t uncle_rom; /* 0340c00c */ }; struct SVF { - UINT32 sport[512]; - UINT32 color; + uint32_t sport[512]; + uint32_t color; }; struct DSPP { - std::unique_ptr<UINT16[]> N; - std::unique_ptr<UINT16[]> EI; - std::unique_ptr<UINT16[]> EO; + std::unique_ptr<uint16_t[]> N; + std::unique_ptr<uint16_t[]> EI; + std::unique_ptr<uint16_t[]> EO; }; class _3do_state : public driver_device @@ -149,17 +149,17 @@ public: m_bank2(*this, "bank2") { } required_device<cpu_device> m_maincpu; - required_shared_ptr<UINT32> m_dram; - required_shared_ptr<UINT32> m_vram; + required_shared_ptr<uint32_t> m_dram; + required_shared_ptr<uint32_t> m_vram; required_device<nvram_device> m_nvram; SLOW2 m_slow2; MADAM m_madam; CLIO m_clio; SVF m_svf; DSPP m_dspp; - UINT8 m_nvmem[0x8000]; + uint8_t m_nvmem[0x8000]; -// UINT8 m_video_bits[512]; +// uint8_t m_video_bits[512]; DECLARE_READ8_MEMBER(_3do_nvarea_r); DECLARE_WRITE8_MEMBER(_3do_nvarea_w); DECLARE_READ32_MEMBER(_3do_slow2_r); @@ -173,7 +173,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; DECLARE_VIDEO_START(_3do); - UINT32 screen_update__3do(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update__3do(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER( timer_x16_cb ); @@ -186,7 +186,7 @@ private: void m_3do_madam_init( void ); void m_3do_clio_init( screen_device *screen ); - void m_3do_request_fiq(UINT32 irq_req, UINT8 type); + void m_3do_request_fiq(uint32_t irq_req, uint8_t type); }; /*----------- defined in machine/3do.c -----------*/ |