diff options
Diffstat (limited to 'src/mame/includes/model3.h')
-rw-r--r-- | src/mame/includes/model3.h | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index f61cee2c1f9..021583fb9a1 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -15,10 +15,10 @@ typedef float VECTOR3[3]; struct cached_texture { cached_texture *next; - UINT8 width; - UINT8 height; - UINT8 format; - UINT8 alpha; + uint8_t width; + uint8_t height; + uint8_t format; + uint8_t alpha; rgb_t data[1]; }; @@ -81,10 +81,10 @@ public: optional_ioport_array<8> m_adc_ports; - required_shared_ptr<UINT64> m_work_ram; - required_shared_ptr<UINT64> m_paletteram64; + required_shared_ptr<uint64_t> m_work_ram; + required_shared_ptr<uint64_t> m_paletteram64; optional_device<dsbz80_device> m_dsbz80; // Z80-based MPEG Digital Sound Board - required_shared_ptr<UINT16> m_soundram; + required_shared_ptr<uint16_t> m_soundram; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; @@ -96,67 +96,67 @@ public: int m_sound_irq_enable; emu_timer *m_sound_timer; emu_timer *m_real3d_dma_timer; - UINT8 m_irq_enable; - UINT8 m_irq_state; - UINT8 m_scsi_irq_state; + uint8_t m_irq_enable; + uint8_t m_irq_state; + uint8_t m_scsi_irq_state; int m_crom_bank; int m_controls_bank; bool m_step15_with_mpc106; bool m_step20_with_old_real3d; - UINT32 m_real3d_device_id; + uint32_t m_real3d_device_id; int m_pci_bus; int m_pci_device; int m_pci_function; int m_pci_reg; - UINT32 m_mpc105_regs[0x40]; - UINT32 m_mpc105_addr; - UINT32 m_mpc106_regs[0x40]; - UINT32 m_mpc106_addr; - UINT32 m_dma_data; - UINT32 m_dma_status; - UINT32 m_dma_source; - UINT32 m_dma_dest; - UINT32 m_dma_endian; - UINT32 m_dma_irq; - UINT32 m_dma_busy; - UINT64 m_controls_2; - UINT64 m_controls_3; - UINT8 m_serial_fifo1; - UINT8 m_serial_fifo2; + uint32_t m_mpc105_regs[0x40]; + uint32_t m_mpc105_addr; + uint32_t m_mpc106_regs[0x40]; + uint32_t m_mpc106_addr; + uint32_t m_dma_data; + uint32_t m_dma_status; + uint32_t m_dma_source; + uint32_t m_dma_dest; + uint32_t m_dma_endian; + uint32_t m_dma_irq; + uint32_t m_dma_busy; + uint64_t m_controls_2; + uint64_t m_controls_3; + uint8_t m_serial_fifo1; + uint8_t m_serial_fifo2; int m_lightgun_reg_sel; int m_adc_channel; - UINT64 m_real3d_status; + uint64_t m_real3d_status; int m_prot_data_ptr; - std::unique_ptr<UINT32[]> m_vrom; + std::unique_ptr<uint32_t[]> m_vrom; int m_step; int m_m3_step; - INT32 m_tap_state; - UINT64 m_ir; - UINT8 m_id_data[32]; - INT32 m_id_size; + int32_t m_tap_state; + uint64_t m_ir; + uint8_t m_id_data[32]; + int32_t m_id_size; int m_tdo; - UINT16 m_layer_priority; - UINT32 m_layer_modulate_r; - UINT32 m_layer_modulate_g; - UINT32 m_layer_modulate_b; - UINT32 m_layer_modulate1; - UINT32 m_layer_modulate2; - UINT64 m_layer_scroll[2]; - std::unique_ptr<UINT64[]> m_m3_char_ram; - std::unique_ptr<UINT64[]> m_m3_tile_ram; - std::unique_ptr<UINT32[]> m_texture_fifo; + uint16_t m_layer_priority; + uint32_t m_layer_modulate_r; + uint32_t m_layer_modulate_g; + uint32_t m_layer_modulate_b; + uint32_t m_layer_modulate1; + uint32_t m_layer_modulate2; + uint64_t m_layer_scroll[2]; + std::unique_ptr<uint64_t[]> m_m3_char_ram; + std::unique_ptr<uint64_t[]> m_m3_tile_ram; + std::unique_ptr<uint32_t[]> m_texture_fifo; int m_texture_fifo_pos; - std::unique_ptr<UINT16[]> m_texture_ram[2]; - std::unique_ptr<UINT32[]> m_display_list_ram; - std::unique_ptr<UINT32[]> m_culling_ram; - std::unique_ptr<UINT32[]> m_polygon_ram; + std::unique_ptr<uint16_t[]> m_texture_ram[2]; + std::unique_ptr<uint32_t[]> m_display_list_ram; + std::unique_ptr<uint32_t[]> m_culling_ram; + std::unique_ptr<uint32_t[]> m_polygon_ram; int m_real3d_display_list; rectangle m_clip3d; rectangle *m_screen_clip; VECTOR3 m_parallel_light; float m_parallel_light_intensity; float m_ambient_light_intensity; - UINT64 m_vid_reg0; + uint64_t m_vid_reg0; int m_matrix_stack_ptr; int m_list_depth; MATRIX *m_matrix_stack; @@ -168,7 +168,7 @@ public: float m_viewport_height; float m_viewport_near; float m_viewport_far; - UINT32 m_matrix_base_address; + uint32_t m_matrix_base_address; cached_texture *m_texcache[2][1024/32][2048/32]; model3_renderer *m_renderer; @@ -220,8 +220,8 @@ public: DECLARE_WRITE64_MEMBER(daytona2_rombank_w); DECLARE_WRITE16_MEMBER(model3snd_ctrl); - UINT32 pci_device_get_reg(); - void pci_device_set_reg(UINT32 value); + uint32_t pci_device_get_reg(); + void pci_device_set_reg(uint32_t value); DECLARE_DRIVER_INIT(genprot); DECLARE_DRIVER_INIT(lemans24); DECLARE_DRIVER_INIT(vs298); @@ -272,11 +272,11 @@ public: LSI53C810_FETCH_CB(scsi_fetch); LSI53C810_IRQ_CB(scsi_irq_callback); void update_irq_state(); - void set_irq_line(UINT8 bit, int line); + void set_irq_line(uint8_t bit, int line); void model3_init(int step); // video virtual void video_start() override; - UINT32 screen_update_model3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update_model3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(tile_info_layer0_4bit); TILE_GET_INFO_MEMBER(tile_info_layer1_4bit); TILE_GET_INFO_MEMBER(tile_info_layer2_4bit); @@ -290,33 +290,33 @@ public: void draw_layer(bitmap_rgb32 &bitmap, const rectangle &cliprect, int layer, int sx, int sy, int prio); void invalidate_texture(int page, int texx, int texy, int texwidth, int texheight); cached_texture *get_texture(int page, int texx, int texy, int texwidth, int texheight, int format); - inline void write_texture16(int xpos, int ypos, int width, int height, int page, UINT16 *data); - inline void write_texture8(int xpos, int ypos, int width, int height, int page, int upper, int lower, UINT16 *data); - void real3d_upload_texture(UINT32 header, UINT32 *data); + inline void write_texture16(int xpos, int ypos, int width, int height, int page, uint16_t *data); + inline void write_texture8(int xpos, int ypos, int width, int height, int page, int upper, int lower, uint16_t *data); + void real3d_upload_texture(uint32_t header, uint32_t *data); void init_matrix_stack(); void get_top_matrix(MATRIX *out); void push_matrix_stack(); void pop_matrix_stack(); void multiply_matrix_stack(MATRIX matrix); void translate_matrix_stack(float x, float y, float z); - void draw_model(UINT32 addr); - UINT32 *get_memory_pointer(UINT32 address); + void draw_model(uint32_t addr); + uint32_t *get_memory_pointer(uint32_t address); void set_projection(float left, float right, float top, float bottom, float near, float far); void load_matrix(int matrix_num, MATRIX *out); - void traverse_list4(int lod_num, UINT32 address); - void traverse_list(UINT32 address); - inline void process_link(UINT32 address, UINT32 link); - void draw_block(UINT32 address); - void draw_viewport(int pri, UINT32 address); + void traverse_list4(int lod_num, uint32_t address); + void traverse_list(uint32_t address); + inline void process_link(uint32_t address, uint32_t link); + void draw_block(uint32_t address); + void draw_viewport(int pri, uint32_t address); void real3d_traverse_display_list(); void real3d_display_list_end(); - void real3d_display_list1_dma(UINT32 src, UINT32 dst, int length, int byteswap); - void real3d_display_list2_dma(UINT32 src, UINT32 dst, int length, int byteswap); - void real3d_vrom_texture_dma(UINT32 src, UINT32 dst, int length, int byteswap); - void real3d_texture_fifo_dma(UINT32 src, int length, int byteswap); - void real3d_polygon_ram_dma(UINT32 src, UINT32 dst, int length, int byteswap); + void real3d_display_list1_dma(uint32_t src, uint32_t dst, int length, int byteswap); + void real3d_display_list2_dma(uint32_t src, uint32_t dst, int length, int byteswap); + void real3d_vrom_texture_dma(uint32_t src, uint32_t dst, int length, int byteswap); + void real3d_texture_fifo_dma(uint32_t src, int length, int byteswap); + void real3d_polygon_ram_dma(uint32_t src, uint32_t dst, int length, int byteswap); // machine - void insert_id(UINT32 id, INT32 start_bit); + void insert_id(uint32_t id, int32_t start_bit); int tap_read(); void tap_write(int tck, int tms, int tdi, int trst); void tap_reset(); @@ -325,6 +325,6 @@ public: DECLARE_READ64_MEMBER(model3_5881prot_r); DECLARE_WRITE64_MEMBER(model3_5881prot_w); int first_read; - UINT16 crypt_read_callback(UINT32 addr); + uint16_t crypt_read_callback(uint32_t addr); }; |